pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43843?usp=email ) Change subject: ss7_as_vty: Add missing MTP SI value strings ...................................................................... ss7_as_vty: Add missing MTP SI value strings Change-Id: Iaeca51082c95a835f01b79b3193896a9fa95d45a --- M src/ss7_as_vty.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 3 files changed, 19 insertions(+), 9 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index 7d5eea0..3805db9 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -318,13 +318,17 @@ } const struct value_string mtp_si_vals[] = { + { MTP_SI_SNM, "snm" }, + { MTP_SI_STM, "stm" }, { MTP_SI_SCCP, "sccp" }, { MTP_SI_TUP, "tup" }, { MTP_SI_ISUP, "isup" }, { MTP_SI_DUP, "dup" }, + { MTP_SI_DUP_FAC, "dup-facility" }, { MTP_SI_TESTING, "testing" }, { MTP_SI_B_ISUP, "b-isup" }, { MTP_SI_SAT_ISUP, "sat-isup" }, + { MTP_SI_SPEECH, "speech" }, { MTP_SI_AAL2_SIG, "aal2" }, { MTP_SI_BICC, "bicc" }, { MTP_SI_GCP, "h248" }, @@ -341,16 +345,22 @@ "Match on Originating Point Code and Mask\n" \ "Originating Point Code\n" \ "Originating Point Code Mask\n" -#define ROUTING_KEY_SI_ARG " si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup)" +#define ROUTING_KEY_SI_ARG " si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup)" #define ROUTING_KEY_SI_ARG_STRS \ "Match on Service Indicator\n" \ "ATM Adaption Layer 2\n" \ "Bearer Independent Call Control\n" \ "Broadband ISDN User Part\n" \ + "Data User Part (Call Related)\n" \ + "Data User Part (Facility Related)\n" \ "H.248\n" \ "ISDN User Part\n" \ "Sattelite ISDN User Part\n" \ "Signalling Connection Control Part\n" \ + "Sig Network Management\n" \ + "Speech Processing Network Element\n" \ + "Sig Testing and Maintenance\n" \ + "MTP Testing User Part\n" \ "Telephony User Part\n" #define ROUTING_KEY_SSN_ARG " ssn SSN" #define ROUTING_KEY_SSN_ARG_STRS \ diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 66273b9..1fe3bab 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -473,10 +473,10 @@ qos-class <0-7> routing-key RCONTEXT DPC routing-key RCONTEXT DPC opc POINT_CODE MASK - routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) - routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN - routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) - routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN + routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) + routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) ssn SSN + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) ssn SSN routing-key RCONTEXT DPC ssn SSN point-code override (opc|dpc) PC no point-code override (opc|dpc) diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index b136883..6edbcec 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -458,10 +458,10 @@ qos-class <0-7> routing-key RCONTEXT DPC routing-key RCONTEXT DPC opc POINT_CODE MASK - routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) - routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN - routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) - routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) ssn SSN + routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) + routing-key RCONTEXT DPC opc POINT_CODE MASK si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) ssn SSN + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) + routing-key RCONTEXT DPC si (aal2|bicc|b-isup|dup|dup-facility|h248|isup|sat-isup|sccp|snm|speech|stm|testing|tup) ssn SSN routing-key RCONTEXT DPC ssn SSN point-code override (opc|dpc) PC no point-code override (opc|dpc) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43843?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Iaeca51082c95a835f01b79b3193896a9fa95d45a Gerrit-Change-Number: 43843 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>