June 2025 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: asp: Support setting TCP_USER_TIMEOUT over VTY

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email ) Change subject: asp: Support setting TCP_USER_TIMEOUT over VTY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If3cbc05a304857be7030c684ffd94d929bc8dc23 Gerrit-Change-Number: 40535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Jun 2025 07:57:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Support setting TCP_USER_TIMEOUT over VTY

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email ) Change subject: asp: Support setting TCP_USER_TIMEOUT over VTY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If3cbc05a304857be7030c684ffd94d929bc8dc23 Gerrit-Change-Number: 40535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Jun 2025 18:59:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: Differentiate between dynamic and static routes

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?usp=email ) Change subject: Differentiate between dynamic and static routes ...................................................................... Differentiate between dynamic and static routes Differentiation is important because for instance * It shall not be possible to delete dynamic routes over VTY "remove route" command. * Dynamic routes should not be stored in config, ie. not appear during "show running-config" or "write running-config". * During VTY "show cs7 instance 0 route", a "dyn" string keyword sohuld be displayed on each dynamic route row. Related: OS#6755 Change-Id: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 --- M src/sccp_user.c M src/ss7_as_vty.c M src/ss7_route.c M src/ss7_route.h M src/ss7_route_table.c M src/ss7_route_table.h M src/ss7_vty.c M src/xua_as_fsm.c M src/xua_rkm.c M tests/ss7/ss7_test.c M tests/vty/osmo_stp_route_prio.vty 11 files changed, 76 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/43/40543/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index 18561c4..bf92c1a 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -618,12 +618,12 @@ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name, as->cfg.name); - /* Create a default route if necessary */ - rt = ss7_route_table_find_route_by_dpc_mask(ss7->rtable_system, 0, 0); + /* Create a default dynamic route if necessary */ + rt = ss7_route_table_find_route_by_dpc_mask(ss7->rtable_system, 0, 0, true); if (!rt) { LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating default route\n", name); rt = ss7_route_create(ss7->rtable_system, 0, 0, - as->cfg.name); + true, as->cfg.name); if (!rt) goto out_as; rt_created = true; @@ -867,7 +867,7 @@ goto out_strings; /* route only selected PC to the client */ - rt = ss7_route_create(ss7->rtable_system, pc, 0xffff, as_name); + rt = ss7_route_create(ss7->rtable_system, pc, 0xffff, true, as_name); if (!rt) goto out_as; diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index c7658d1..c34bbed 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -299,12 +299,14 @@ /* When libosmo-sigtran is used in ASP role, the VTY routing table node * (config-cs7-rt) is not available. However, when we add a routing key - * to an AS we still have to put a matching route into the routing - * table. This is done automatically by first removing the old route + * to an AS we still have to put a matching dynamic route into the routing + * table. This is done automatically by first removing the old dynamic route * (users may change the routing key via VTY during runtime) and then - * putting a new route (see below). */ + * putting a new dynamic route (see below). */ if (cs7_role == CS7_ROLE_ASP) { - rt = ss7_route_table_find_route_by_dpc_mask(as->inst->rtable_system, rkey->pc, 0xffffff); + rt = ss7_route_table_find_route_by_dpc_mask(as->inst->rtable_system, + rkey->pc, 0xffffff, + true); if (rt) ss7_route_destroy(rt); } @@ -315,9 +317,9 @@ rkey->si = si ? get_string_value(mtp_si_vals, si) : 0; /* FIXME: input validation */ rkey->ssn = ssn ? atoi(ssn) : 0; /* FIXME: input validation */ - /* automatically add new route (see also comment above) */ + /* automatically add new dynamic route (see also comment above) */ if (cs7_role == CS7_ROLE_ASP) { - if (!ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, as->cfg.name)) { + if (!ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, true, as->cfg.name)) { vty_out(vty, "Cannot create route (pc=%s, linkset=%s) to AS %s", dpc, as->cfg.name, VTY_NEWLINE); return CMD_WARNING; } diff --git a/src/ss7_route.c b/src/ss7_route.c index 6350f71..cfcbd8a 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -42,6 +42,7 @@ * \param[in] rtbl Routing Table where the route belongs * \param[in] pc Point Code of the destination of the route * \param[in] mask Mask of the destination Point Code \ref pc + * \param[in] dynamic Whether the route is dynamic * \returns Allocated route (not yet inserted into its rtbl), NULL on error * * The returned route has no linkset associated yet, user *must* associate it @@ -58,9 +59,14 @@ * The route entry allocated with this API can be destroyed/freed at any point using API * ss7_route_destroy(), regardless of it being already inserted or not in * its routing table. + * + * Dynamic routes are not configured by the user (VTY), and hence cannot be + * removed by the user. Dynamic routes are not stored in the config and hence + * they don't show up in eg "show running-confing"; they can be listed using + * specific VTY commands like "show cs7 instance 0 route". */ struct osmo_ss7_route * -ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask) +ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask, bool dynamic) { struct osmo_ss7_route *rt; @@ -78,6 +84,7 @@ 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; + rt->cfg.dyn_allocated = dynamic; return rt; } @@ -160,7 +167,8 @@ if (clset) { /* check for duplicates */ struct osmo_ss7_route *prev_rt; llist_for_each_entry(prev_rt, &clset->routes, list) { - if (!strcmp(prev_rt->cfg.linkset_name, rt->cfg.linkset_name)) { + if (strcmp(prev_rt->cfg.linkset_name, rt->cfg.linkset_name) == 0 && + prev_rt->cfg.dyn_allocated == rt->cfg.dyn_allocated) { LOGSS7(rtbl->inst, LOGL_ERROR, "Refusing to create route with existing linkset name: pc=%u=%s mask=0x%x via linkset/AS '%s'\n", rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc), @@ -181,6 +189,7 @@ * \param[in] rtbl Routing Table in which the route is to be created * \param[in] pc Point Code of the destination of the route * \param[in] mask Mask of the destination Point Code \ref pc + * \param[in] dynamic Whether the route is dynamic * \param[in] linkset_name string name of the linkset to be used * \returns callee-allocated + initialized route, NULL on error * @@ -192,12 +201,12 @@ */ struct osmo_ss7_route * ss7_route_create(struct osmo_ss7_route_table *rtbl, uint32_t pc, - uint32_t mask, const char *linkset_name) + uint32_t mask, bool dynamic, const char *linkset_name) { struct osmo_ss7_route *rt; int rc; - rt = ss7_route_alloc(rtbl, pc, mask); + rt = ss7_route_alloc(rtbl, pc, mask, dynamic); if (!rt) return NULL; @@ -210,7 +219,7 @@ /* Keep old behavior, return already existing route: */ if (rc == -EADDRINUSE) { talloc_free(rt); - return ss7_route_table_find_route_by_dpc_mask(rtbl, pc, mask); + return ss7_route_table_find_route_by_dpc_mask(rtbl, pc, mask, dynamic); } return rt; @@ -309,8 +318,11 @@ } while (0) APPEND("pc=%u=%s mask=0x%x=%s", - rt->cfg.pc, osmo_ss7_pointcode_print_buf(pc_str, sizeof(pc_str), inst, rt->cfg.pc), - rt->cfg.mask, osmo_ss7_pointcode_print_buf(mask_str, sizeof(mask_str), inst, rt->cfg.mask)); + rt->cfg.pc, osmo_ss7_pointcode_print_buf(pc_str, sizeof(pc_str), inst, rt->cfg.pc), + rt->cfg.mask, osmo_ss7_pointcode_print_buf(mask_str, sizeof(mask_str), inst, rt->cfg.mask)); + + if (rt->cfg.dyn_allocated) + APPEND(" dyn"); if (rt->dest.as) { struct osmo_ss7_as *as = rt->dest.as; diff --git a/src/ss7_route.h b/src/ss7_route.h index 0dcc34e..4bb7a2b 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -1,6 +1,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <osmocom/core/linuxlist.h> /*********************************************************************** @@ -38,14 +39,15 @@ /*! lower priority is higher */ uint32_t priority; uint8_t qos_class; + bool dyn_allocated; } cfg; }; struct osmo_ss7_route * -ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask); +ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask, bool dynamic); struct osmo_ss7_route * ss7_route_create(struct osmo_ss7_route_table *rtbl, uint32_t dpc, - uint32_t mask, const char *linkset_name); + uint32_t mask, bool dynamic, const char *linkset_name); void ss7_route_destroy(struct osmo_ss7_route *rt); struct osmo_ss7_route * diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index d2f34a6..5d044f3 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -110,7 +110,7 @@ */ struct osmo_ss7_route * ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, - uint32_t mask) + uint32_t mask, bool dynamic) { struct osmo_ss7_combined_linkset *clset; struct osmo_ss7_route *rt; @@ -123,8 +123,12 @@ clset = ss7_route_table_find_combined_linkset_by_dpc_mask(rtbl, dpc, mask); if (!clset) return NULL; - rt = llist_first_entry_or_null(&clset->routes, struct osmo_ss7_route, list); - return rt; + llist_for_each_entry(rt, &clset->routes, list) { + if (rt->cfg.dyn_allocated != dynamic) + continue; + return rt; + } + return NULL; } struct osmo_ss7_combined_linkset * diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index 1de3be5..9f27412 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -39,7 +39,7 @@ struct osmo_ss7_route * ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, - uint32_t mask); + uint32_t mask, bool dynamic); struct osmo_ss7_route * ss7_route_table_lookup_route(struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel); diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 66efc03..a5f5310 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -398,7 +398,7 @@ return CMD_WARNING; } - rt = ss7_route_alloc(rtable, dpc, mask); + rt = ss7_route_alloc(rtable, dpc, mask, false); if (!rt) { vty_out(vty, "%% Cannot allocate new route%s", VTY_NEWLINE); return CMD_WARNING; @@ -464,7 +464,7 @@ return CMD_WARNING; } - rt = ss7_route_table_find_route_by_dpc_mask(rtable, dpc, mask); + rt = ss7_route_table_find_route_by_dpc_mask(rtable, dpc, mask, false); if (!rt) { vty_out(vty, "cannot find route to be deleted%s", VTY_NEWLINE); return CMD_WARNING; @@ -484,6 +484,8 @@ vty_out(vty, " description %s%s", rtable->cfg.description, VTY_NEWLINE); llist_for_each_entry(clset, &rtable->combined_linksets, list) { llist_for_each_entry(rt, &clset->routes, list) { + if (rt->cfg.dyn_allocated) + continue; vty_out(vty, " update route %s %s linkset %s", osmo_ss7_pointcode_print(rtable->inst, rt->cfg.pc), osmo_ss7_pointcode_print2(rtable->inst, rt->cfg.mask), @@ -516,7 +518,7 @@ llist_for_each_entry(rt, &clset->routes, list) { bool rt_avail = ss7_route_is_available(rt); - vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s%s", + vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s%-3s%s", osmo_ss7_route_print(rt), rt_avail ? "acces" : "INACC", ' ', @@ -526,6 +528,7 @@ rt_avail ? "avail" : "UNAVAIL", "?", rt_avail ? "avail" : "UNAVAIL", + rt->cfg.dyn_allocated ? "dyn" : "", VTY_NEWLINE); } } diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 3e117ee..6a8941b 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -277,12 +277,14 @@ struct osmo_ss7_as *as = xafp->as; struct osmo_ss7_instance *inst = as->inst; - if (ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff)) + if (ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, + as->cfg.routing_key.pc, 0xffffff, + true)) return; /* As opposed to M3UA, there is no RKM and we have to implicitly - * automatically add a route once an IPA connection has come up */ - if (ss7_route_create(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff, as->cfg.name)) + * automatically add a dynamic route once an IPA connection has come up */ + if (ss7_route_create(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff, true, as->cfg.name)) xafp->ipa_route_created = true; } @@ -298,7 +300,9 @@ return; /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */ - rt = ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); + rt = ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, + as->cfg.routing_key.pc, 0xffffff, + true); /* no route found, bail out */ if (!rt) { LOGPFSML(fi, LOGL_NOTICE, "Attempting to delete route for this IPA AS, but cannot " diff --git a/src/xua_rkm.c b/src/xua_rkm.c index 1ae5ea6..f03397c 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -279,8 +279,8 @@ as->cfg.routing_key.pc = dpc; as->cfg.routing_key.context = rctx; - /* add route for that routing key */ - rt = ss7_route_create(as->inst->rtable_system, dpc, 0xFFFFFF, namebuf); + /* add dynamic route for that routing key */ + rt = ss7_route_create(as->inst->rtable_system, dpc, 0xFFFFFF, true, namebuf); if (!rt) { LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: Cannot insert route for DPC %s / as %s\n", osmo_ss7_pointcode_print(asp->inst, dpc), namebuf); @@ -393,7 +393,9 @@ return -1; } - rt = ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff); + rt = ss7_route_table_find_route_by_dpc_mask(inst->rtable_system, + as->cfg.routing_key.pc, 0xffffff, + true); if (!rt) { msgb_append_dereg_res(resp, M3UA_RKM_DEREG_ERR_UNKNOWN, 0); return -1; diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index bb96e71..c8e1c67 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -188,7 +188,7 @@ /* route with full mask */ route_label = RT_LABEL(0, 12, 0); OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == NULL); - rt = ss7_route_create(rtbl, 12, 0xffff, "a"); + rt = ss7_route_create(rtbl, 12, 0xffff, false, "a"); printf("route with full mask: %s\n", osmo_ss7_route_print(rt)); OSMO_ASSERT(rt); route_label = RT_LABEL(0, 12, 0); @@ -196,7 +196,7 @@ ss7_route_destroy(rt); /* route with partial mask */ - rt = ss7_route_create(rtbl, 8, 0xfff8, "a"); + rt = ss7_route_create(rtbl, 8, 0xfff8, false, "a"); printf("route with partial mask: %s\n", osmo_ss7_route_print(rt)); route_label = RT_LABEL(0, 8, 0); OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == rt); @@ -210,7 +210,7 @@ OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == NULL); /* insert more specific route for 12, must have higher priority * than existing one */ - rt12 = ss7_route_create(rtbl, 12, 0xffff, "b"); + rt12 = ss7_route_create(rtbl, 12, 0xffff, false, "b"); route_label = RT_LABEL(0, 12, 0); OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == rt12); route_label = RT_LABEL(0, 15, 0); @@ -218,7 +218,7 @@ route_label = RT_LABEL(0, 16, 0); OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == NULL); /* add a default route, which should have lowest precedence */ - rtdef = ss7_route_create(rtbl, 0, 0, "a"); + rtdef = ss7_route_create(rtbl, 0, 0, false, "a"); route_label = RT_LABEL(0, 12, 0); OSMO_ASSERT(ss7_route_table_lookup_route(rtbl, &route_label) == rt12); route_label = RT_LABEL(0, 15, 0); @@ -230,7 +230,7 @@ ss7_route_destroy(rt12); ss7_route_destroy(rt); - rt = ss7_route_create(rtbl, 8, 0xfff9, "a"); + rt = ss7_route_create(rtbl, 8, 0xfff9, false, "a"); printf("route with non-consecutive mask: %s\n", osmo_ss7_route_print(rt)); ss7_route_destroy(rt); diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 1a3b516..1db0a19 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -92,9 +92,9 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL OsmoSTP(config-cs7-rt)# ! NOW ADD MORE GENERIC ROUTES (SMALLER BITMASK LENGTH) OsmoSTP(config-cs7-rt)# update route 3.2.0 7.255.0 linkset as1 priority 1 @@ -118,12 +118,12 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 1 as1 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 1 as2 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 1 as3 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL +3.2.0/11 INACC 0 1 as1 UNAVAIL ? UNAVAIL +3.2.0/11 INACC 0 1 as2 UNAVAIL ? UNAVAIL +3.2.0/11 INACC 0 1 as3 UNAVAIL ? UNAVAIL OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route binding-table 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40543?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: Ic6c6b46084a1e4063ebf1f5d13e0e03386bb4c45 Gerrit-Change-Number: 40543 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[XS] Change in libosmo-sigtran[master]: as_vty: Fix 'traffic-mode loadshare' output in 'show running-config'

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40542?usp=email ) Change subject: as_vty: Fix 'traffic-mode loadshare' output in 'show running-config' ...................................................................... as_vty: Fix 'traffic-mode loadshare' output in 'show running-config' Change-Id: I09ca977885cc4af5caf58f8036285ab321d00b05 --- M src/ss7_as_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/42/40542/1 diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index 9c5f7e2..c7658d1 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -435,15 +435,15 @@ vty_out(vty, " asp %s%s", asp->cfg.name, VTY_NEWLINE); } if (as->cfg.mode_set_by_vty) { - vty_out(vty, " traffic-mode %s%s", osmo_ss7_as_traffic_mode_name(as->cfg.mode), VTY_NEWLINE); + vty_out(vty, " traffic-mode %s", osmo_ss7_as_traffic_mode_name(as->cfg.mode)); if (as->cfg.mode == OSMO_SS7_AS_TMOD_LOADSHARE) { if (as->cfg.loadshare.opc_sls) { vty_out(vty, " bindings sls opc-sls"); if (as->cfg.loadshare.opc_shift != 0) vty_out(vty, " opc-shift %u", as->cfg.loadshare.opc_shift); } - vty_out(vty, "%s", VTY_NEWLINE); } + vty_out(vty, "%s", VTY_NEWLINE); if (as->cfg.loadshare.sls_shift != 0) vty_out(vty, " sls-shift %u%s", as->cfg.loadshare.sls_shift, VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40542?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: I09ca977885cc4af5caf58f8036285ab321d00b05 Gerrit-Change-Number: 40542 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in libosmo-sigtran[master]: osmo_ss7_route_print(): Use osmo_ss7_pointcode_print_buf()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40541?usp=email ) Change subject: osmo_ss7_route_print(): Use osmo_ss7_pointcode_print_buf() ...................................................................... osmo_ss7_route_print(): Use osmo_ss7_pointcode_print_buf() Use the _buf() API here since it's easy and then we can make sure a user calling this function + osmo_ss7_pointcode_print() at the same time won't cause collisions writing in the same static buffer. Change-Id: I6a6104e2cc759e79afa6da57d512e6f8436bbb33 --- M src/ss7_route.c 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/41/40541/1 diff --git a/src/ss7_route.c b/src/ss7_route.c index 7783f85..6350f71 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -263,16 +263,19 @@ const char *osmo_ss7_route_print(const struct osmo_ss7_route *rt) { + static char buf[64]; + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + char buf_pc[MAX_PC_STR_LEN]; const struct osmo_ss7_instance *inst = rt->rtable->inst; unsigned int pc_width = osmo_ss7_pc_width(&inst->cfg.pc_fmt); - static char buf[64]; int rc = u32_masklen(rt->cfg.mask, pc_width); + OSMO_STRBUF_PRINTF(sb, "%s/", osmo_ss7_pointcode_print_buf(buf_pc, sizeof(buf_pc), inst, rt->cfg.pc)); + if (rc < 0) - snprintf(buf, sizeof(buf), "%s/%s", osmo_ss7_pointcode_print(inst, rt->cfg.pc), - osmo_ss7_pointcode_print2(inst, rt->cfg.mask)); + OSMO_STRBUF_PRINTF(sb, "%s", osmo_ss7_pointcode_print_buf(buf_pc, sizeof(buf_pc), inst, rt->cfg.mask)); else - snprintf(buf, sizeof(buf), "%s/%u", osmo_ss7_pointcode_print(inst, rt->cfg.pc), rc); + OSMO_STRBUF_PRINTF(sb, "%u", rc); return buf; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40541?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: I6a6104e2cc759e79afa6da57d512e6f8436bbb33 Gerrit-Change-Number: 40541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Add helper function to build SCCP UDT encoded octetstring

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?usp=email ) Change subject: stp: Add helper function to build SCCP UDT encoded octetstring ...................................................................... stp: Add helper function to build SCCP UDT encoded octetstring Change-Id: I67961807bba4853b58e4b6f87eb3f2b56e9bb027 --- M stp/STP_Tests_Common.ttcn M stp/STP_Tests_IPA.ttcn M stp/STP_Tests_IPA_M3UA.ttcn 3 files changed, 31 insertions(+), 50 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn index 463e935..01e9ab6 100644 --- a/stp/STP_Tests_Common.ttcn +++ b/stp/STP_Tests_Common.ttcn @@ -14,11 +14,31 @@ friend module STP_Tests_IPA; friend module STP_Tests_IPA_M3UA; +import from General_Types all; +import from Osmocom_Types all; + import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; import from IPL4asp_Types all; +import from SCCP_Types all; +import from SCCP_Templates all; +import from SCCPasp_Types all; +import from SCCP_Emulation all; + +function f_SCCP_UDT(template (value) SCCP_PAR_Address called := ts_SccpAddr_GT('1234'H), + template (value) SCCP_PAR_Address calling := ts_SccpAddr_GT('5678'H), + template (omit) octetstring data := omit) return octetstring +{ + if (istemplatekind(data, "omit")) { + data := f_rnd_octstring_rnd_len(100); + } + var PDU_SCCP sccp := valueof(ts_SCCP_UDT(valueof(called), valueof(calling), valueof(data))); + var octetstring sccp_enc := enc_PDU_SCCP(sccp); + return sccp_enc; +} + type component Test_CT { port TELNETasp_PT VTY; timer g_Tguard := 30.0; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index a34fd6d..3fb0ace 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -150,19 +150,10 @@ } } -private function f_rnd_ipa_len() runs on IPA_CT return integer { - var integer rnd_len := f_rnd_int(100); - /* We need at least 1 byte of data, othewise osmocom IPA stack will discard and close the socket */ - if (rnd_len == 0) { - rnd_len := 1; - } - return rnd_len; -} - /* Test if traffic is routed from idx_tx to idx_rx */ private function f_test_traffic(integer idx_tx, integer idx_rx) runs on IPA_CT { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(idx_tx, data); f_IPA_exp(idx_rx, data); } @@ -390,7 +381,7 @@ const integer iter_per_asp := 5; var integer num_rx[2] := { 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(0, data); alt { [] as_count_rx(1, data, num_rx[0]); @@ -472,7 +463,7 @@ sls_num_rx_2 := sls_num_rx_2 & {0}; } for (i := 0; i < iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(0, data); alt { [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); @@ -504,7 +495,7 @@ sls_num_rx_2 := sls_num_rx_2 & {0}; } for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_ipa_len()); + var octetstring data := f_SCCP_UDT(); f_IPA_send(i mod 2, data); alt { [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 5600f6e..1e45372 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -43,24 +43,6 @@ const OCT1 c_M3UA_SI_SCCP := '03'O; -template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address called, SCCP_PAR_Address calling, - template (value) octetstring data, - template (value) BIT4 msg_hdl := '0000'B) := { - unitdata := { - messageType := udt, - protClass := {'0000'B, msg_hdl}, - pointer1 := 0, - pointer2 := 0, - pointer3 := 0, - calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), - callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), - data := { - paramLength := 0, - data := data - } - } -} - /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; @@ -76,11 +58,7 @@ f_M3UA_asp_up_act(0, omit, rctx_sender); /* send a well-formed, encoded SCCP message via M3UA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); var template (value) M3UA_Protocol_Data tx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, '00'O, sccp_enc); f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); @@ -111,11 +89,7 @@ f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); f_IPA_send(0, sccp_enc); /* expect to receive it via M3UA */ @@ -146,11 +120,7 @@ f_M3UA_asp_up_act(0, omit, rctx_receiver); /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring_rnd_len(100); - var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); - var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - var octetstring sccp_enc := enc_PDU_SCCP(sccp); + var octetstring sccp_enc := f_SCCP_UDT(); f_vty_config2(VTY, {"cs7 instance 0"}, "network-indicator national"); f_IPA_send(0, sccp_enc); @@ -187,18 +157,18 @@ var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); - var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); - f_IPA_send(0, enc_PDU_SCCP(sccp)); + var octetstring sccp_enc := f_SCCP_UDT(called, calling, data); + f_IPA_send(0, sccp_enc); /* patch point codes into addresses */ called := valueof(ts_SccpAddr_PC_GT(oct2int(pc_receiver), '83'O, "mtp3_itu", '1234'H)); calling := valueof(ts_SccpAddr_PC_GT(oct2int(pc_sender), '83'O, "mtp3_itu", '5678'H)); - var PDU_SCCP sccp_exp := valueof(ts_SCCP_UDT(called, calling, data)); + sccp_enc := f_SCCP_UDT(called, calling, data); /* expect to receive it via M3UA */ var template (present) M3UA_Protocol_Data rx_pd; rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, c_M3UA_SI_SCCP, '00'O, '00'O, ?, - enc_PDU_SCCP(sccp_exp)); + sccp_enc); f_M3UA_exp(0, tr_M3UA_DATA(rctx_receiver, rx_pd)); f_clear_m3ua(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40529?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I67961807bba4853b58e4b6f87eb3f2b56e9bb027 Gerrit-Change-Number: 40529 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: m3ua: Introduce test TC_combinedlset_loadshare

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?usp=email ) Change subject: stp: m3ua: Introduce test TC_combinedlset_loadshare ...................................................................... stp: m3ua: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on M3UA AS. Related: SYS#7112 Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 --- M stp/STP_Tests_M3UA.cfg M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml M stp/osmo-stp-m3ua.confmerge 4 files changed, 129 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/stp/STP_Tests_M3UA.cfg b/stp/STP_Tests_M3UA.cfg index dd0c97b..860bdd7 100644 --- a/stp/STP_Tests_M3UA.cfg +++ b/stp/STP_Tests_M3UA.cfg @@ -40,6 +40,24 @@ routing_ctx := 1042 }, { + asp_name := "asp-LS0-0-0", + is_server := false, + use_tcp := false, + remote_port := 2905, + local_port := 10002, + point_code := 44, + routing_ctx := 1044 + }, + { + asp_name := "asp-LS0-1-0", + is_server := false, + use_tcp := false, + remote_port := 2905, + local_port := 10003, + point_code := 45, + routing_ctx := 1045 + }, + { asp_name := "asp-client0", is_server := true, use_tcp := false, diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 497bd82..a98ffdc 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -1655,6 +1655,90 @@ f_clear_m3ua(); } +/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a combined linkset). + * STP routing table is configured with 1 combined linkset towards PC 99 mask /14 with 2 + * AS routes ("as-LS0-0", "as-LS0-1") with same priority, each using 1 ASP ("asp-LS0-0-0", + * "asp-LS0-1-0"). Hence, traffic towards PC 99 received at asp-sender should be routed + * in loadshare fashion between those 2 AS/ASPs. + */ +testcase TC_combinedlset_loadshare() runs on RAW_M3UA_CT { + var integer i; + var Misc_Helpers.ro_charstring asps := { "asp-sender", "asp-LS0-0-0", "asp-LS0-1-0" }; + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); + var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); + var OCT4 rctx_receiver := int2oct(m3ua_configs[1].routing_ctx, 4); + var OCT4 rctx_receiver2 := int2oct(m3ua_configs[2].routing_ctx, 4); + var OCT4 pc_receiver := int2oct(99, 4); + + f_init_m3ua(m3ua_configs := m3ua_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_M3UA_asp_up_act(0, omit, rctx_sender); + + /* activate the first 'receiver' side ASP */ + f_M3UA_asp_up_act(1, c_M3UA_TMT_override, rctx_receiver); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, rctx_sender, pc_sender, 1, rctx_receiver, pc_receiver); + } + + /* activate the second 'receiver' side ASP+AS */ + f_M3UA_asp_up_act(2, c_M3UA_TMT_override, rctx_receiver); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_rnd_octstring_rnd_len(100); + var template (value) M3UA_Protocol_Data tx_pd; + var template (present) M3UA_Protocol_Data rx_pd; + /* Distribute traffic over ASPs based on SLS, since OPC is always the same. + * SLS in ITU is 4 bits. */ + var OCT1 sls := int2oct(i mod 16, 1); + tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + rx_pd := tr_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, sls, data); + f_M3UA_send(0, ts_M3UA_DATA(rctx_sender, tx_pd), 1); + alt { + [] as_count_rx_sls(1, tr_M3UA_DATA(rctx_receiver, rx_pd), sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(2, tr_M3UA_DATA(rctx_receiver2, rx_pd), sls_num_rx_2, num_rx_2); + } + } + + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + + /* Check that a given SLS is not forwarded to both ASPs: */ + for (i := 0; i < NUM_SLS; i := i+1) { + if (sls_num_rx_1[i] > 0 and sls_num_rx_2[i] > 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx packets for SLS ", i, " in both ASPs!")); + } + + } + setverdict(pass); + + f_clear_m3ua(); +} + control { /* M3UA Tests */ execute( TC_connect_asp_up() ); @@ -1671,6 +1755,7 @@ execute( TC_tmt_broadcast() ); execute( TC_act_rctx_data_no_rctx() ); execute( TC_m3ua_sctp_srv_adm_shutdown() ); + execute( TC_combinedlset_loadshare() ); /* M3UA RKM tests */ execute( TC_rkm_reg_static_notpermitted() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index fde8564..646ca7b 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='59' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -14,6 +14,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_tmt_broadcast' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_act_rctx_data_no_rctx' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_m3ua_sctp_srv_adm_shutdown' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_notpermitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_static_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_rkm_reg_dynamic_permitted' time='MASKED'/> diff --git a/stp/osmo-stp-m3ua.confmerge b/stp/osmo-stp-m3ua.confmerge index 65e2fa2..5bc337f 100644 --- a/stp/osmo-stp-m3ua.confmerge +++ b/stp/osmo-stp-m3ua.confmerge @@ -23,6 +23,21 @@ remote-ip ::1 role sg sctp-role server + ! CombinedLinkset-loadsharing ASPs: + asp asp-LS0-0-0 10002 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-LS0-1-0 10003 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server asp asp-client0 10002 2906 m3ua local-ip 127.0.0.1 local-ip ::1 @@ -51,6 +66,13 @@ asp asp-receiver0 asp asp-receiver1 routing-key 1042 42 + ! CombinedLinkset-loadsharing ASs: + as as-LS0-0 m3ua + routing-key 1044 44 + asp asp-LS0-0-0 + as as-LS0-1 m3ua + routing-key 1045 45 + asp asp-LS0-1-0 as as-client m3ua routing-key 1055 55 asp asp-client0 @@ -66,6 +88,8 @@ route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver + update route 99 16777215 linkset as-LS0-0 priority 3 + update route 99 16777215 linkset as-LS0-1 priority 3 update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I20a67648072f4d9839b1d1fceded1680362bf979 Gerrit-Change-Number: 40521 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... stp: ipa: Introduce test TC_combinedlset_loadshare Test combined linkset loadsharing on IPA AS. Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Related: SYS#7112 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp-ipa.confmerge 4 files changed, 152 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 9e9538e..8f6c24a 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -62,6 +62,20 @@ local_port := 20007 }, { + asp_name := "ipa-asp-LS0-0-0", + as_name := "ipa-as-LS0-0", + is_server := false, + remote_port := 5000, + local_port := 20010 + }, + { + asp_name := "ipa-asp-LS0-1-0", + as_name := "ipa-as-LS0-1", + is_server := false, + remote_port := 5000, + local_port := 20011 + }, + { asp_name := "ipa-asp-client0", as_name := "ipa-as-client0", is_server := true, diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 3fb0ace..2aab7c3 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -425,8 +425,8 @@ "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); if (unknwon_dynamic_asp) { - ipa_configs[0].local_port := 3010; - ipa_configs[1].local_port := 3011; + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; } f_init_ipa(ipa_configs := ipa_configs); @@ -528,6 +528,114 @@ f_tc_tmt_loadshare_sls(true); } +/* Test AS Loadsharing, (distributing traffic within linksets/ASs of a combined linkset). + * STP routing table is configured with 1 combined linkset towards PC 32 mask /14 with 2 + * AS routes ("ipa-as-LS0-0", "ipa-as-LS0-1") with same priority, each using 1 + * ASP ("ipa-asp-LS0-0-0", "ipa-asp-LS0-1-0"). + * We take advantage of the fact that AS "ipa-as-loadshare-receiver" is never used + * to transmit in other tests and use it here for the routing of its configured + * "point-code override dpc 32" towards the "ipa-as-LS0-{0,1}" in the STP config. + */ +private function f_tc_combinedlset_loadshare(boolean unknown_dynamic_asp) +runs on IPA_CT { + var integer i; + + var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-receiver0", + "ipa-asp-loadshare-receiver1", + "ipa-asp-LS0-0-0", + "ipa-asp-LS0-1-0" }; + var IpaConfigs ipa_configs := ipa_build_configs(asps); + if (unknown_dynamic_asp) { + ipa_configs[0].local_port := 9998; + ipa_configs[1].local_port := 9999; + } + + f_init_ipa(ipa_configs := ipa_configs); + + /* bring up the 'sender' side (single ASP in AS) */ + f_connect_ipa(0); + /* activate the first 'receiver' side ASP */ + f_connect_ipa(2); + + /* verify traffic is routed from sender to [sole] receiver */ + for (i := 0; i < 10; i := i+1) { + f_test_traffic(0, 2); + } + + /* activate the second 'receiver' side ASP */ + f_connect_ipa(3); + + /* verify traffic is routed from sender to new receiver */ + const integer iter_per_asp := 20; + const integer NUM_SLS := 16; /* SLS in ITU is 4 bits. */ + var integer num_rx_1 := 0; + var integer num_rx_2 := 0; + var Integers sls_num_rx_1 := {}; + var Integers sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(0, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + + /* All traffic should still be sent to the same receiver, since + * OPC+DPC+SLS cannot change in IPA ASPs. + * However, depending on how the SLS seed tables were allocated, it can + * be that STP was routing through Alternative Route and now that the + * 2nd receiver is up it is now routing to it (Normal Route). Account + * for both scenarios. */ + if (not ((num_rx_1 == iter_per_asp and num_rx_2 == 0) or (num_rx_2 == iter_per_asp and num_rx_1 == 0))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Expected all traffic through same receiver!"); + } + + + /* activate the second 'sender' side ASP */ + f_connect_ipa(1); + + num_rx_1 := 0; + num_rx_2 := 0; + sls_num_rx_1 := {}; + sls_num_rx_2 := {}; + for (i := 0; i < NUM_SLS; i := i + 1) { + sls_num_rx_1 := sls_num_rx_1 & {0}; + sls_num_rx_2 := sls_num_rx_2 & {0}; + } + for (i := 0; i < 2*iter_per_asp; i := i+1) { + var octetstring data := f_SCCP_UDT(); + f_IPA_send(i mod 2, data); + alt { + [] as_count_rx_sls(2, data, sls_num_rx_1, num_rx_1); + [] as_count_rx_sls(3, data, sls_num_rx_2, num_rx_2); + } + } + /* Make sure traffic was sent over both ASPs and that it was distributed: */ + if (num_rx_1 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 1st ASP!"); + } + if (num_rx_2 == 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Rx 0 packets in 2nd ASP!"); + } + if (num_rx_1 + num_rx_2 != 2*iter_per_asp) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx ", num_rx_1 + num_rx_2 ," packets in total vs exp ", 2*iter_per_asp)); + } + setverdict(pass); +} +testcase TC_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(false); +} +/* same as above, with "accept-asp-connections dynamic-permitted" and clients from unknown ASPs */ +testcase TC_unknown_client_dynamic_combinedlset_loadshare() runs on IPA_CT { + f_tc_combinedlset_loadshare(true); +} + private function f_IPA_ping(integer idx) runs on IPA_CT { var IpaCcmMsgtype ipa_ping_msg := IPAC_MSGT_PING; @@ -641,6 +749,8 @@ execute( TC_tmt_loadshare_roundrobin() ); execute( TC_tmt_loadshare_sls() ); execute( TC_unknown_client_dynamic_tmt_loadshare() ); + execute( TC_combinedlset_loadshare() ); + execute( TC_unknown_client_dynamic_combinedlset_loadshare() ); execute( TC_beat() ); execute( TC_beat_timeout() ); diff --git a/stp/expected-results.xml b/stp/expected-results.xml index 646ca7b..91115d9 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='62' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -59,6 +59,8 @@ <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_roundrobin' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_tmt_loadshare_sls' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_combinedlset_loadshare' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_combinedlset_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout' time='MASKED'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 954f175..ef95384 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -53,6 +53,26 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + ! CombinedLinkset-loadsharing AS(P)s: + asp ipa-asp-LS0-0-0 20010 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-LS0-1-0 20011 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-LS0-0 ipa + point-code override dpc 38 + routing-key 0 44 + asp ipa-asp-LS0-0-0 + as ipa-as-LS0-1 ipa + point-code override dpc 39 + routing-key 0 45 + asp ipa-asp-LS0-1-0 + ! CLIENT asp ipa-asp-client0 6001 7001 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -68,6 +88,9 @@ ! route-table system update route 31 16777215 linkset ipa-as-loadshare-receiver + ! These 2 below are used in TC_combinedlset_loadshare to route traffic from ipa-as-loadshare-receiver towards: + update route 32 16777215 linkset ipa-as-LS0-0 priority 6 + update route 32 16777215 linkset ipa-as-LS0-1 priority 6 update route 33 16777215 linkset ipa-as-override-receiver ! !SERVERS: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fix typo unknwon -> unknown

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?usp=email ) Change subject: Fix typo unknwon -> unknown ...................................................................... Fix typo unknwon -> unknown Change-Id: I483090332931d85a8808bd558c4d4ac4d36fa16b --- M bts/BTS_Tests.ttcn M stp/STP_Tests_IPA.ttcn 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 9c6f238..de02359 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2464,7 +2464,7 @@ case (RSL_ALG_ID_A5_6) { return 6; } case (RSL_ALG_ID_A5_7) { return 7; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; @@ -2482,7 +2482,7 @@ case (RSL_ALG_ID_A5_6) { return '101'B; } case (RSL_ALG_ID_A5_7) { return '110'B; } case else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknwon Algorithm ID"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown Algorithm ID"); /* Make compiler happy by calling mtc.stop here. It is already * called in f_shutdown */ mtc.stop; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 2aab7c3..b34297e 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -301,13 +301,13 @@ setverdict(pass); } -private function f_tc_tmt_override(boolean unknwon_dynamic_asp) +private function f_tc_tmt_override(boolean unknown_dynamic_asp) runs on IPA_CT { var Misc_Helpers.ro_charstring asps := { "ipa-asp-override-sender", "ipa-asp-override-receiver0", "ipa-asp-override-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3002; ipa_configs[1].local_port := 3003; ipa_configs[2].local_port := 3004; @@ -347,14 +347,14 @@ } } -private function f_tc_tmt_loadshare_roundrobin(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_roundrobin(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; var Misc_Helpers.ro_charstring asps := { "ipa-asp-loadshare-sender0", "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 3005; ipa_configs[1].local_port := 3006; ipa_configs[2].local_port := 3007; @@ -415,7 +415,7 @@ } } -private function f_tc_tmt_loadshare_sls(boolean unknwon_dynamic_asp) +private function f_tc_tmt_loadshare_sls(boolean unknown_dynamic_asp) runs on IPA_CT { var integer i; @@ -424,7 +424,7 @@ "ipa-asp-loadshare-receiver0", "ipa-asp-loadshare-receiver1" }; var IpaConfigs ipa_configs := ipa_build_configs(asps); - if (unknwon_dynamic_asp) { + if (unknown_dynamic_asp) { ipa_configs[0].local_port := 9998; ipa_configs[1].local_port := 9999; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40534?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I483090332931d85a8808bd558c4d4ac4d36fa16b Gerrit-Change-Number: 40534 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: ipa: Introduce test TC_combinedlset_loadshare

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email ) Change subject: stp: ipa: Introduce test TC_combinedlset_loadshare ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40530?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I029ac9f3c664d2f30cddc36f6eb1b39295689247 Gerrit-Change-Number: 40530 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 26 Jun 2025 14:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025