From 7590cc4a8ba9d79bc0cf0c91138b2e25709c5d38 Mon Sep 17 00:00:00 2001 From: Hemlata Bhatt Date: Thu, 10 Feb 2022 12:40:41 +0100 Subject: [PATCH] Replace vendor extension for feature codes with PrefixRange and FacilityAction for TR-104 conformance --- dmtree/tr104/common.c | 2 +- dmtree/tr104/servicesvoiceservicecallcontrol.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dmtree/tr104/common.c b/dmtree/tr104/common.c index cc58d226..f2bb017f 100644 --- a/dmtree/tr104/common.c +++ b/dmtree/tr104/common.c @@ -17,7 +17,7 @@ char *RegistrarServerTransport[] = {"UDP", "TCP", "TLS", "SCTP"}; char *DTMFMethod[] = {"InBand", "RFC4733", "SIPInfo"}; char *JitterBufferType[] = {"Static", "Dynamic"}; char *KeyingMethods[] = {"Null", "Static", "SDP", "IKE"}; -char *FacilityAction[] = {"AA_REGISTER", "AA_ERASE", "AA_INTERROGATE", "CA_ACTIVATE", "CCBS_ACTIVATE", "CCBS_DEACTIVATE", "CCBS_INTERROGATE", "CCNR_ACTIVATE", "CCNR_DEACTIVATE", "CCNR_INTERROGATE", "CFB_REGISTER", "CFB_ACTIVATE", "CFB_DEACTIVATE", "CFB_ERASE", "CFB_INTERROGATE", "CFNR_REGISTER", "CFNR_ACTIVATE", "CFNR_DEACTIVATE", "CFNR_ERASE", "CFNR_INTERROGATE", "CFNR_TIMER", "CFT_ACTIVATE", "CFT_DEACTIVATE", "CFT_INTERROGATE", "CFU_REGISTER", "CFU_ACTIVATE", "CFU_DEACTIVATE", "CFU_ERASE", "CFU_INTERROGATE", "CLIR_ACTIVATE", "CLIR_DEACTIVATE", "CLIR_INTERROGATE", "CP_INVOKE", "CW_ACTIVATE", "CW_DEACTIVATE", "CW_INVOKE", "DND_ACTIVATE", "DND_DEACTIVATE", "DND_INTERROGATE", "EXT_INVOKE", "LINE_INVOKE", "MAILBOX_INVOKE", "OCB_ACTIVATE", "OCB_DEACTIVATE", "OCB_INTERROGATE", "PSO_ACTIVATE", "PW_SET", "SCF_ACTIVATE", "SCF_DEACTIVATE", "SCF_INTERROGATE", "SCREJ_ACTIVATE", "SCREJ_DEACTIVATE", "SCREJ_INTERROGATE", "SR_ACTIVATE", "SR_DEACTIVATE", "SR_INTERROGATE", NULL}; +char *FacilityAction[] = {"", "AA_REGISTER", "AA_ERASE", "AA_INTERROGATE", "CA_ACTIVATE", "CCBS_ACTIVATE", "CCBS_DEACTIVATE", "CCBS_INTERROGATE", "CCNR_ACTIVATE", "CCNR_DEACTIVATE", "CCNR_INTERROGATE", "CFB_REGISTER", "CFB_ACTIVATE", "CFB_DEACTIVATE", "CFB_ERASE", "CFB_INTERROGATE", "CFNR_REGISTER", "CFNR_ACTIVATE", "CFNR_DEACTIVATE", "CFNR_ERASE", "CFNR_INTERROGATE", "CFNR_TIMER", "CFT_ACTIVATE", "CFT_DEACTIVATE", "CFT_INTERROGATE", "CFU_REGISTER", "CFU_ACTIVATE", "CFU_DEACTIVATE", "CFU_ERASE", "CFU_INTERROGATE", "CLIR_ACTIVATE", "CLIR_DEACTIVATE", "CLIR_INTERROGATE", "CP_INVOKE", "CW_ACTIVATE", "CW_DEACTIVATE", "CW_INVOKE", "DND_ACTIVATE", "DND_DEACTIVATE", "DND_INTERROGATE", "EXT_INVOKE", "LINE_INVOKE", "MAILBOX_INVOKE", "OCB_ACTIVATE", "OCB_DEACTIVATE", "OCB_INTERROGATE", "PSO_ACTIVATE", "PW_SET", "SCF_ACTIVATE", "SCF_DEACTIVATE", "SCF_INTERROGATE", "SCREJ_ACTIVATE", "SCREJ_DEACTIVATE", "SCREJ_INTERROGATE", "SR_ACTIVATE", "SR_DEACTIVATE", "SR_INTERROGATE", NULL}; struct codec_info supported_codecs[MAX_SUPPORTED_CODECS]; int codecs_num; diff --git a/dmtree/tr104/servicesvoiceservicecallcontrol.c b/dmtree/tr104/servicesvoiceservicecallcontrol.c index ff527b62..727bcf52 100644 --- a/dmtree/tr104/servicesvoiceservicecallcontrol.c +++ b/dmtree/tr104/servicesvoiceservicecallcontrol.c @@ -1222,8 +1222,6 @@ static int set_ServicesVoiceServiceCallControlNumberingPlanPrefixInfo_FacilityAc case VALUECHECK: if (dm_validate_string(value, -1, -1, FacilityAction, NULL)) return FAULT_9007; - if (dm_validate_string(value, -1, 32, NULL, NULL)) - return FAULT_9007; break; case VALUESET: dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "facilityaction", value);