October 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: ss7 vty: Set default route priority to 5
by pespin 11 Oct '24

11 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38390?usp=email ) Change subject: ss7 vty: Set default route priority to 5 ...................................................................... ss7 vty: Set default route priority to 5 Use a priority != 0 (best prio) as default priority. This allows adding manual routes with higher prio (lower value) more easily. Value 5 is chosen to resemble other systems users may be already used to. Changing the default priority value in routes now shouldn't be much of a problem, since the only way to set up a specific priority (VTY) was broken until now and would return an error, so we know for sure nobody has been setting priorities other than the default value. Hence, with this change even older implementations reading a backward compatible file would still work the same by using all-prio-0 instead of all-prio-5. The "update route" VTY cmd gets a new "default" param value for the "priority" param, hence getting some syntatic sugar which also helps users understand what's the default value through the CMD help string. Change-Id: I4e283cc07b8e9ea2124ec9da18cbce77c3d866ee --- M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/ss7_internal.h M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty 5 files changed, 49 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/38390/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index cc40fe1..bcbe76c 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -696,6 +696,7 @@ * masks to ensure we don't fail duplicate detection with longer mask lengths */ rt->cfg.mask = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, mask); rt->cfg.pc = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, pc); + rt->cfg.priority = OSMO_SS7_ROUTE_PRIO_DEFAULT; return rt; } diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 35a940f..356090c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -74,6 +74,12 @@ QOS_CLASS_RANGE_HELP_STR \ "Default QoS Class (0)\n" +#define ROUTE_PRIO_RANGE_STR "<0-4294967295>" +#define ROUTE_PRIO_RANGE_HELP_STR "Priority\n" +#define ROUTE_PRIO_VAR_STR "(" ROUTE_PRIO_RANGE_STR "|default)" +#define ROUTE_PRIO_VAR_HELP_STR \ + ROUTE_PRIO_RANGE_HELP_STR \ + "Default Priority (5)\n" /* netinet/tcp.h */ static const struct value_string tcp_info_state_values[] = { @@ -349,7 +355,7 @@ } DEFUN_ATTR(cs7_rt_upd, cs7_rt_upd_cmd, - "update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [" QOS_CLASS_VAR_STR "]", + "update route POINT_CODE MASK linkset LS_NAME [priority] [" ROUTE_PRIO_VAR_STR "] [qos-class] [" QOS_CLASS_VAR_STR "]", "Update the Route\n" "Update the Route\n" "Destination Point Code\n" @@ -357,7 +363,7 @@ "Specify Destination Linkset\n" "Linkset Name\n" "Specify Priority\n" - "Priority\n" + ROUTE_PRIO_VAR_HELP_STR "Specify QoS Class\n" QOS_CLASS_VAR_HELP_STR, CMD_ATTR_IMMEDIATE) @@ -412,7 +418,9 @@ argind = 3; if (argc > argind && !strcmp(argv[argind], "priority")) { argind++; - rt->cfg.priority = atoi(argv[argind++]); + if (strcmp(argv[argind], "default") != 0) + rt->cfg.priority = atoi(argv[argind]); + argind++; } if (argc > argind && !strcmp(argv[argind], "qos-class")) { @@ -484,7 +492,7 @@ osmo_ss7_pointcode_print(rtable->inst, rt->cfg.pc), osmo_ss7_pointcode_print2(rtable->inst, rt->cfg.mask), rt->cfg.linkset_name); - if (rt->cfg.priority) + if (rt->cfg.priority != OSMO_SS7_ROUTE_PRIO_DEFAULT) vty_out(vty, " priority %u", rt->cfg.priority); if (rt->cfg.qos_class) vty_out(vty, " qos-class %u", rt->cfg.qos_class); diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 623c607..61fe20e 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -54,6 +54,8 @@ /*********************************************************************** * SS7 Routes ***********************************************************************/ +#define OSMO_SS7_ROUTE_PRIO_DEFAULT 5 + struct osmo_ss7_route * ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask); int ss7_route_set_linkset(struct osmo_ss7_route *rt, const char *linkset_name); diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 6cc862a..10833ea 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -65,17 +65,17 @@ OsmoSTP(config-cs7)# ! ADD 2 ROUTES WITH DECREASING PRIORITIES. THEY SHOULD END UP REORDERED BY PRIORITY: OsmoSTP(config-cs7)# route-table system -OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as1 priority 5 -OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as3 -OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as2 priority 2 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as1 priority 6 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as2 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as3 priority 2 OsmoSTP(config-cs7-rt)# show running-config ... cs7 instance 0 ... route-table system - update route 3.2.1 7.255.7 linkset as3 - update route 3.2.1 7.255.7 linkset as2 priority 2 - update route 3.2.1 7.255.7 linkset as1 priority 5 + update route 3.2.1 7.255.7 linkset as3 priority 2 + update route 3.2.1 7.255.7 linkset as2 + update route 3.2.1 7.255.7 linkset as1 priority 6 ... OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route Routing table = system @@ -83,6 +83,6 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 0 as3 ? ? ? -3.2.1/14 2 as2 ? ? ? -3.2.1/14 5 as1 ? ? ? +3.2.1/14 2 as3 ? ? ? +3.2.1/14 5 as2 ? ? ? +3.2.1/14 6 as1 ? ? ? diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 5253b9a..7967216 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -570,7 +570,7 @@ OsmoSTP(config-cs7)# route-table system OsmoSTP(config-cs7-rt)# list ... - update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(<0-7>|default)] + update route POINT_CODE MASK linkset LS_NAME [priority] [(<0-4294967295>|default)] [qos-class] [(<0-7>|default)] remove route POINT_CODE MASK OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass OsmoSTP(config-cs7-rt)# show running-config @@ -587,13 +587,31 @@ ... route-table system ... !update route 3.2.1 7.255.7 linkset my-ass +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority default +OsmoSTP(config-cs7-rt)# show running-config +... +cs7 instance 0 +... + route-table system + update route 3.2.1 7.255.7 linkset my-ass +... +OsmoSTP(config-cs7-rt)# remove route 3.2.1 7.255.7 OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 5 OsmoSTP(config-cs7-rt)# show running-config ... cs7 instance 0 ... route-table system - update route 3.2.1 7.255.7 linkset my-ass priority 5 + update route 3.2.1 7.255.7 linkset my-ass +... +OsmoSTP(config-cs7-rt)# remove route 3.2.1 7.255.7 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 6 +OsmoSTP(config-cs7-rt)# show running-config +... +cs7 instance 0 +... + route-table system + update route 3.2.1 7.255.7 linkset my-ass priority 6 ... OsmoSTP(config-cs7-rt)# remove route 3.2.1 7.255.7 OsmoSTP(config-cs7-rt)# show running-config @@ -601,25 +619,25 @@ cs7 instance 0 ... route-table system -... !update route 3.2.1 7.255.7 linkset my-ass priority 5 -OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 5 qos-class 1 +... !update route 3.2.1 7.255.7 linkset my-ass priority 6 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority 6 qos-class 1 OsmoSTP(config-cs7-rt)# show running-config ... cs7 instance 0 ... route-table system - update route 3.2.1 7.255.7 linkset my-ass priority 5 qos-class 1 + update route 3.2.1 7.255.7 linkset my-ass priority 6 qos-class 1 ... cs7 instance 1 ... route-table system -... !update route 3.2.1 7.255.7 linkset my-ass priority 5 qos-class 1 +... !update route 3.2.1 7.255.7 linkset my-ass priority 6 qos-class 1 OsmoSTP(config-cs7-rt)# remove route 3.2.1 7.255.7 OsmoSTP(config-cs7-rt)# show running-config ... cs7 instance 0 ... route-table system -... !update route 3.2.1 7.255.7 linkset my-ass priority 5 qos-class 1 +... !update route 3.2.1 7.255.7 linkset my-ass priority 6 qos-class 1 OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority % Incomplete command (missing an argument?) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38390?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4e283cc07b8e9ea2124ec9da18cbce77c3d866ee Gerrit-Change-Number: 38390 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-sgsn[master]: Add Routing Areas
by pespin 11 Oct '24

11 Oct '24

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email ) Change subject: Add Routing Areas ...................................................................... Patch Set 16: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37864?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I2474b19a7471a1dea3c863ddf8372b16180211aa Gerrit-Change-Number: 37864 Gerrit-PatchSet: 16 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 11 Oct 2024 15:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-msc[master]: vlr: fix typo in comment
by lynxis lazus 11 Oct '24

11 Oct '24

lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38355?usp=email ) Change subject: vlr: fix typo in comment ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I06baf0494fde1d0c8eb6aaf72f5ce6e9134f3905 Gerrit-Change-Number: 38355 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Oct 2024 14:55:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[M] Change in osmo-msc[master]: vlr: refactor the reject cause codes
by lynxis lazus 11 Oct '24

11 Oct '24

lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38128?usp=email ) Change subject: vlr: refactor the reject cause codes ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38128?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib269e9f865cd23f9f2c0a1bac0e17c95974c1c9f Gerrit-Change-Number: 38128 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 11 Oct 2024 14:55:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in osmo-ci[master]: jobs/build-kernels-testenv: fix git refspec
by fixeria 11 Oct '24

11 Oct '24

Attention is currently required from: dexter, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38385?usp=email ) Change subject: jobs/build-kernels-testenv: fix git refspec ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38385?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8f6c19984f7dc8e7b28cfafab9384c639945b47c Gerrit-Change-Number: 38385 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Oct 2024 14:53:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo_dia2gsup[master]: diameter: fix wrong 'Vendor-Id' value (should be 3GPP)
by fixeria 11 Oct '24

11 Oct '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38377?usp=email ) Change subject: diameter: fix wrong 'Vendor-Id' value (should be 3GPP) ...................................................................... diameter: fix wrong 'Vendor-Id' value (should be 3GPP) Wireshark decodes VID=10515 as follows: Vendor-Id: Terry Nazon Inc (10515) Looks like a typo, it should be VID=10415: Vendor-Id: 3GPP (10415) At least this is what open5gs is using. Change-Id: I601785a8c71e9c6e6d94018586e2a865ba8b2f11 --- M src/osmo_dia2gsup.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index d1c9fda..7aabc1c 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -58,7 +58,7 @@ -define(CALLBACK_MOD, server_cb). -define(DIAMETER_DICT_HSS, diameter_3gpp_ts29_272). --define(APPID_S6, #'diameter_base_Vendor-Specific-Application-Id'{'Vendor-Id'=10515, 'Auth-Application-Id'=[16777251]}). +-define(APPID_S6, #'diameter_base_Vendor-Specific-Application-Id'{'Vendor-Id'=10415, 'Auth-Application-Id'=[16777251]}). -define(SERVICE(Name), [{'Origin-Host', application:get_env(osmo_dia2gsup, origin_host, "hss.localdomain")}, {'Origin-Realm', application:get_env(osmo_dia2gsup, origin_realm, "localdomain")}, {'Vendor-Id', application:get_env(osmo_dia2gsup, vendor_id, 0)}, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I601785a8c71e9c6e6d94018586e2a865ba8b2f11 Gerrit-Change-Number: 38377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo_dia2gsup[master]: diameter: fix unused macro param in ?SERVICE
by fixeria 11 Oct '24

11 Oct '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38378?usp=email ) Change subject: diameter: fix unused macro param in ?SERVICE ...................................................................... diameter: fix unused macro param in ?SERVICE Change-Id: Ia0e87b19541b3e4064e5095cc5fefa016700d226 --- M src/osmo_dia2gsup.erl 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index 7aabc1c..a2a15b4 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -63,7 +63,7 @@ {'Origin-Realm', application:get_env(osmo_dia2gsup, origin_realm, "localdomain")}, {'Vendor-Id', application:get_env(osmo_dia2gsup, vendor_id, 0)}, {'Origin-State-Id', diameter:origin_state_id()}, - {'Product-Name', "osmo_dia2gsup"}, + {'Product-Name', Name}, {'Auth-Application-Id', []}, {'Vendor-Specific-Application-Id', [?APPID_S6]}, {application, @@ -99,8 +99,7 @@ %% @callback gen_server init(State) -> % DIAMETER side - SvcName = ?MODULE, - diameter:start_service(SvcName, ?SERVICE(SvcName)), + diameter:start_service(?SVC_NAME, ?SERVICE(?MODULE)), Ip = application:get_env(osmo_dia2gsup, diameter_ip, "127.0.0.8"), Port = application:get_env(osmo_dia2gsup, diameter_port, 3868), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Ia0e87b19541b3e4064e5095cc5fefa016700d226 Gerrit-Change-Number: 38378 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo_dia2gsup[master]: diameter: drop unused ?DIA_STATS_* macros
by fixeria 11 Oct '24

11 Oct '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38379?usp=email ) Change subject: diameter: drop unused ?DIA_STATS_* macros ...................................................................... diameter: drop unused ?DIA_STATS_* macros Change-Id: I923c2442cadd39bb6d1c62d2d522ca2a178240a5 --- M src/osmo_dia2gsup.erl 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/osmo_dia2gsup.erl b/src/osmo_dia2gsup.erl index a2a15b4..eab34a3 100644 --- a/src/osmo_dia2gsup.erl +++ b/src/osmo_dia2gsup.erl @@ -50,9 +50,6 @@ % Diameter application definitions --define(DIA_STATS_TAB, iwf_stats). --define(DIA_STATS_COUNTERS, [event_OK, event_ERR]). - -define(SVC_NAME, ?MODULE). -define(APP_ALIAS, ?MODULE). -define(CALLBACK_MOD, server_cb). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/38379?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I923c2442cadd39bb6d1c62d2d522ca2a178240a5 Gerrit-Change-Number: 38379 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: ss7 vty: Limit qos-class range to 0-7
by pespin 11 Oct '24

11 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38389?usp=email ) Change subject: ss7 vty: Limit qos-class range to 0-7 ...................................................................... ss7 vty: Limit qos-class range to 0-7 This matches QoS ranges used by other vendors. Change-Id: I541723e4551977cb2b7afcac01e3bfee070e7bac --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/89/38389/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index b1029ed..35a940f 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -67,7 +67,7 @@ "SCTP (Stream Control Transmission Protocol)\n" \ "TCP (Transmission Control Protocol)\n" -#define QOS_CLASS_RANGE_STR "<0-255>" +#define QOS_CLASS_RANGE_STR "<0-7>" #define QOS_CLASS_RANGE_HELP_STR "QoS Class\n" #define QOS_CLASS_VAR_STR "(" QOS_CLASS_RANGE_STR "|default)" #define QOS_CLASS_VAR_HELP_STR \ diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 33e092b..5253b9a 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -263,7 +263,7 @@ no remote-ip (A.B.C.D|X:X::X:X) local-ip (A.B.C.D|X:X::X:X) [primary] no local-ip (A.B.C.D|X:X::X:X) - qos-class <0-255> + qos-class <0-7> role (sg|asp|ipsp) transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> @@ -347,7 +347,7 @@ traffic-mode (broadcast | loadshare | roundrobin | override) no traffic-mode recovery-timeout <1-2000> - qos-class <0-255> + qos-class <0-7> routing-key RCONTEXT DPC routing-key RCONTEXT DPC si (aal2|bicc|b-isup|h248|isup|sat-isup|sccp|tup) routing-key RCONTEXT DPC ssn SSN @@ -570,7 +570,7 @@ OsmoSTP(config-cs7)# route-table system OsmoSTP(config-cs7-rt)# list ... - update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(<0-255>|default)] + update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(<0-7>|default)] remove route POINT_CODE MASK OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass OsmoSTP(config-cs7-rt)# show running-config -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38389?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I541723e4551977cb2b7afcac01e3bfee070e7bac Gerrit-Change-Number: 38389 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: ss7 vty: Validate qos-class number being passed to 'update route'
by pespin 11 Oct '24

11 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38388?usp=email ) Change subject: ss7 vty: Validate qos-class number being passed to 'update route' ...................................................................... ss7 vty: Validate qos-class number being passed to 'update route' While at it, organize the related strings used in several places in the file. Change-Id: Ib81499d5ac692e1de463efe931381bbb68fd1131 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/88/38388/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 06fa823..b1029ed 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -67,6 +67,14 @@ "SCTP (Stream Control Transmission Protocol)\n" \ "TCP (Transmission Control Protocol)\n" +#define QOS_CLASS_RANGE_STR "<0-255>" +#define QOS_CLASS_RANGE_HELP_STR "QoS Class\n" +#define QOS_CLASS_VAR_STR "(" QOS_CLASS_RANGE_STR "|default)" +#define QOS_CLASS_VAR_HELP_STR \ + QOS_CLASS_RANGE_HELP_STR \ + "Default QoS Class (0)\n" + + /* netinet/tcp.h */ static const struct value_string tcp_info_state_values[] = { { TCP_ESTABLISHED, "ESTABLISHED" }, @@ -341,7 +349,7 @@ } DEFUN_ATTR(cs7_rt_upd, cs7_rt_upd_cmd, - "update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(CLASS|default)]", + "update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [" QOS_CLASS_VAR_STR "]", "Update the Route\n" "Update the Route\n" "Destination Point Code\n" @@ -351,8 +359,7 @@ "Specify Priority\n" "Priority\n" "Specify QoS Class\n" - "QoS Class\n" - "Default QoS Class\n", + QOS_CLASS_VAR_HELP_STR, CMD_ATTR_IMMEDIATE) { struct osmo_ss7_route_table *rtable = vty->index; @@ -1073,9 +1080,9 @@ } DEFUN_ATTR(asp_qos_clas, asp_qos_class_cmd, - "qos-class <0-255>", + "qos-class " QOS_CLASS_RANGE_STR, "Specify QoS Class of ASP\n" - "QoS Class of ASP\n", + QOS_CLASS_RANGE_HELP_STR, CMD_ATTR_NODE_EXIT) { struct osmo_ss7_asp *asp = vty->index; @@ -1934,9 +1941,9 @@ } DEFUN_ATTR(as_qos_clas, as_qos_class_cmd, - "qos-class <0-255>", + "qos-class " QOS_CLASS_RANGE_STR, "Specity QoS Class of AS\n" - "QoS Class of AS\n", + QOS_CLASS_RANGE_HELP_STR, CMD_ATTR_IMMEDIATE) { struct osmo_ss7_as *as = vty->index; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index b2f5270..33e092b 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -570,7 +570,7 @@ OsmoSTP(config-cs7)# route-table system OsmoSTP(config-cs7-rt)# list ... - update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(CLASS|default)] + update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(<0-255>|default)] remove route POINT_CODE MASK OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass OsmoSTP(config-cs7-rt)# show running-config -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ib81499d5ac692e1de463efe931381bbb68fd1131 Gerrit-Change-Number: 38388 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0