- gerrit-log - lists.osmocom.org

[M] Change in libosmo-sigtran[master]: vty: Add cmd to look up route
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?usp=email ) Change subject: vty: Add cmd to look up route ...................................................................... vty: Add cmd to look up route Implement a command which allows looking up a given route, similar to linux "ip route get", which is helpful to debug routing setup. Related: SYS#7112 Change-Id: I4dbe04862c018a1beea253de99404adb88bb7f4b --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty 3 files changed, 53 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 6b404b3..d1885ea 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -539,6 +539,51 @@ return CMD_SUCCESS; } +DEFUN(show_cs7_route_lookup, show_cs7_route_lookup_cmd, + "show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps]", + SHOW_STR CS7_STR INST_STR INST_STR + "Look up route\n" "Destination PC\n" + "From\n" "Origin PC\n" + "SLS\n" "SLS value\n" + "List ASPs of the AS if route points to an AS") +{ + int id = atoi(argv[0]); + bool list_asps = argc > 4; + struct osmo_ss7_instance *inst; + struct osmo_ss7_route *rt; + uint32_t dpc; + int pc; + + inst = osmo_ss7_instance_find(id); + if (!inst) { + vty_out(vty, "No SS7 instance %d found%s", id, VTY_NEWLINE); + return CMD_WARNING; + } + + pc = osmo_ss7_pointcode_parse(inst, argv[1]); + if (pc < 0 || !osmo_ss7_pc_is_valid((uint32_t)pc)) { + vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + dpc = pc; + + pc = osmo_ss7_pointcode_parse(inst, argv[2]); + if (pc < 0 || !osmo_ss7_pc_is_valid((uint32_t)pc)) { + vty_out(vty, "Invalid point code (%s)%s", argv[2], VTY_NEWLINE); + return CMD_WARNING; + } + + rt = osmo_ss7_route_lookup(inst, dpc); + if (!rt) { + vty_out(vty, "No route found for DPC %s%s", + osmo_ss7_pointcode_print(inst, dpc), VTY_NEWLINE); + return CMD_WARNING; + } + + vty_out(vty, "%s%s", osmo_ss7_route_name(rt, list_asps), VTY_NEWLINE); + return CMD_SUCCESS; +} + /*********************************************************************** * xUA Listener Configuration (SG) ***********************************************************************/ @@ -3103,6 +3148,7 @@ install_lib_element(L_CS7_AS_NODE, &as_pc_patch_sccp_cmd); install_lib_element_ve(&show_cs7_route_cmd); + install_lib_element_ve(&show_cs7_route_lookup_cmd); vty_init_addr(); } diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 10833ea..2c68080 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -86,3 +86,7 @@ 3.2.1/14 2 as3 ? ? ? 3.2.1/14 5 as2 ? ? ? 3.2.1/14 6 as1 ? ? ? + +OsmoSTP(config-cs7-rt)# ! NOW TEST LOOKUP WORKS AS DESIRED (as3 PICKED): +OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0 +pc=6161=3.2.1 mask=0x3fff=7.255.7 via AS as3 proto=m3ua diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index cb24560..9394cf4 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -12,6 +12,7 @@ show cs7 instance <0-15> asp-assoc-status name ASP_NAME show cs7 instance <0-15> as (active|all|m3ua|sua) show cs7 instance <0-15> route + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> @@ -35,6 +36,7 @@ show cs7 instance <0-15> asp-assoc-status name ASP_NAME show cs7 instance <0-15> as (active|all|m3ua|sua) show cs7 instance <0-15> route + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> @@ -78,6 +80,7 @@ asp-assoc-status Application Server Process (ASP) SCTP association status as Application Server (AS) route Routing Table + route-lookup Look up route sccp Signalling Connection Control Part OsmoSTP# show cs7 instance 0 as ? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?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: I4dbe04862c018a1beea253de99404adb88bb7f4b Gerrit-Change-Number: 39611 Gerrit-PatchSet: 3 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>

1 0

[M] Change in libosmo-sigtran[master]: Move osmo_ss7_route_name() to osmo_ss7_route.c
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39608?usp=email ) Change subject: Move osmo_ss7_route_name() to osmo_ss7_route.c ...................................................................... Move osmo_ss7_route_name() to osmo_ss7_route.c Change-Id: I6889a9b6c86453044a6cf6728e7e61264d594a4e --- M src/osmo_ss7_hmrt.c M src/osmo_ss7_route.c 2 files changed, 60 insertions(+), 59 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index 5fca2d8..839b8ad 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -146,65 +146,6 @@ } } -/*! Return human readable representation of the route, in a static buffer. - * This uses both osmo_ss7_pointcode_print() and osmo_ss7_pointcode_print2(), so pairing - * osmo_ss7_route_name() with osmo_ss7_pointcode_print() in the same printf statement is likely to - * conflict. - * \param[in] rt The route information to print, or NULL. - * \param[in] list_asps If true, append info for all ASPs for the route's AS. - * \returns A string constant or static buffer. */ -const char *osmo_ss7_route_name(struct osmo_ss7_route *rt, bool list_asps) -{ - static char buf[256]; - char *pos = buf; - struct osmo_ss7_instance *inst; - size_t l; - - if (!rt) - return "no route"; - - inst = rt->rtable->inst; - -#define APPEND(fmt, args ...) \ - do { \ - l = snprintf(pos, sizeof(buf) - (pos - buf), fmt, ## args); \ - pos += l; \ - if (pos - buf >= sizeof(buf) ) \ - goto out; \ - } while (0) - - APPEND("pc=%u=%s mask=0x%x=%s", - rt->cfg.pc, osmo_ss7_pointcode_print(inst, rt->cfg.pc), - rt->cfg.mask, osmo_ss7_pointcode_print2(inst, rt->cfg.mask)); - - if (rt->dest.as) { - struct osmo_ss7_as *as = rt->dest.as; - int i; - APPEND(" via AS %s proto=%s", as->cfg.name, osmo_ss7_asp_protocol_name(as->cfg.proto)); - - if (list_asps) { - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - struct osmo_ss7_asp *asp = as->cfg.asps[i]; - if (!asp) - continue; - APPEND(" ASP"); - if (asp->cfg.name) - APPEND(" %s", asp->cfg.name); - if (asp->sock_name) - APPEND(" %s", asp->sock_name); - } - } - } else if (rt->dest.linkset) - APPEND(" via linkset %s", rt->dest.linkset->cfg.name); - else - APPEND(" has no route set"); -#undef APPEND - -out: - buf[sizeof(buf)-1] = '\0'; - return buf; -} - /* HMDC->HMRT Msg For Routing; Figure 26/Q.704 */ /* local message was receive d from L4, SRM, SLM, STM or SLTC, or * remote message received from L2 and HMDC determined msg for routing */ diff --git a/src/osmo_ss7_route.c b/src/osmo_ss7_route.c index 1afc75c..8a1592f 100644 --- a/src/osmo_ss7_route.c +++ b/src/osmo_ss7_route.c @@ -28,6 +28,7 @@ #include "ss7_linkset.h" #include "ss7_as.h" +#include "ss7_asp.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "ss7_internal.h" @@ -295,6 +296,65 @@ return buf; } +/*! Return human readable representation of the route, in a static buffer. + * This uses both osmo_ss7_pointcode_print() and osmo_ss7_pointcode_print2(), so pairing + * osmo_ss7_route_name() with osmo_ss7_pointcode_print() in the same printf statement is likely to + * conflict. + * \param[in] rt The route information to print, or NULL. + * \param[in] list_asps If true, append info for all ASPs for the route's AS. + * \returns A string constant or static buffer. */ +const char *osmo_ss7_route_name(struct osmo_ss7_route *rt, bool list_asps) +{ + static char buf[256]; + char *pos = buf; + struct osmo_ss7_instance *inst; + size_t l; + + if (!rt) + return "no route"; + + inst = rt->rtable->inst; + +#define APPEND(fmt, args ...) \ + do { \ + l = snprintf(pos, sizeof(buf) - (pos - buf), fmt, ## args); \ + pos += l; \ + if (pos - buf >= sizeof(buf)) \ + goto out; \ + } while (0) + + APPEND("pc=%u=%s mask=0x%x=%s", + rt->cfg.pc, osmo_ss7_pointcode_print(inst, rt->cfg.pc), + rt->cfg.mask, osmo_ss7_pointcode_print2(inst, rt->cfg.mask)); + + if (rt->dest.as) { + struct osmo_ss7_as *as = rt->dest.as; + int i; + APPEND(" via AS %s proto=%s", as->cfg.name, osmo_ss7_asp_protocol_name(as->cfg.proto)); + + if (list_asps) { + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + struct osmo_ss7_asp *asp = as->cfg.asps[i]; + if (!asp) + continue; + APPEND(" ASP"); + if (asp->cfg.name) + APPEND(" %s", asp->cfg.name); + if (asp->sock_name) + APPEND(" %s", asp->sock_name); + } + } + } else if (rt->dest.linkset) + APPEND(" via linkset %s", rt->dest.linkset->cfg.name); + else + APPEND(" has no route set"); +#undef APPEND + +out: + buf[sizeof(buf)-1] = '\0'; + return buf; +} + /*! \brief Find a SS7 route for given destination point code in given SS7 */ struct osmo_ss7_route * osmo_ss7_route_lookup(struct osmo_ss7_instance *inst, uint32_t dpc) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39608?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: I6889a9b6c86453044a6cf6728e7e61264d594a4e Gerrit-Change-Number: 39608 Gerrit-PatchSet: 1 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>

1 0

[S] Change in libosmo-sigtran[master]: vty: show cs7 route: display qos-class configured value
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39613?usp=email ) Change subject: vty: show cs7 route: display qos-class configured value ...................................................................... vty: show cs7 route: display qos-class configured value Change-Id: I2d2a246c7fbdf495af94ac5da14d4a93ef837f81 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_route_prio.vty 2 files changed, 13 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index d1885ea..a15b7c6 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -518,7 +518,14 @@ llist_for_each_entry(rt, &rtbl->routes, list) { vty_out(vty, "%-22s %c %c %u %-19s %-7s %-7s %-7s%s", osmo_ss7_route_print(rt), - ' ', ' ', rt->cfg.priority, rt->cfg.linkset_name, "?", "?", "?", VTY_NEWLINE); + ' ', + '0' + rt->cfg.qos_class, + rt->cfg.priority, + rt->cfg.linkset_name, + "?", + "?", + "?", + VTY_NEWLINE); } } diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 2c68080..255128e 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -65,7 +65,7 @@ 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 6 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset as1 priority 6 qos-class 7 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 @@ -75,7 +75,7 @@ route-table system 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 + update route 3.2.1 7.255.7 linkset as1 priority 6 qos-class 7 ... OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route Routing table = system @@ -83,9 +83,9 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 2 as3 ? ? ? -3.2.1/14 5 as2 ? ? ? -3.2.1/14 6 as1 ? ? ? +3.2.1/14 0 2 as3 ? ? ? +3.2.1/14 0 5 as2 ? ? ? +3.2.1/14 7 6 as1 ? ? ? OsmoSTP(config-cs7-rt)# ! NOW TEST LOOKUP WORKS AS DESIRED (as3 PICKED): OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39613?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: I2d2a246c7fbdf495af94ac5da14d4a93ef837f81 Gerrit-Change-Number: 39613 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: vty: Improve route status display in show cs7 instance route
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39617?usp=email ) Change subject: vty: Improve route status display in show cs7 instance route ...................................................................... vty: Improve route status display in show cs7 instance route Change-Id: I7f4ca56f9308803a306e7d6a3cde2faec27c3e7f --- M src/osmo_ss7_link.c M src/osmo_ss7_linkset.c M src/osmo_ss7_route.c M src/osmo_ss7_vty.c M src/ss7_link.h M src/ss7_linkset.h M src/ss7_route.h M tests/vty/osmo_stp_route_prio.vty 8 files changed, 48 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/osmo_ss7_link.c b/src/osmo_ss7_link.c index 321d72e..6310824 100644 --- a/src/osmo_ss7_link.c +++ b/src/osmo_ss7_link.c @@ -75,3 +75,11 @@ return link; } + +/* Whether link is available, ITU Q.704 section 3.2 */ +bool +ss7_link_is_available(const struct osmo_ss7_link *link) +{ + /* TODO: manage operational availability of a link... */ + return link->cfg.adm_state == OSMO_SS7_LS_ENABLED; +} diff --git a/src/osmo_ss7_linkset.c b/src/osmo_ss7_linkset.c index 146ec92..c6d4a68 100644 --- a/src/osmo_ss7_linkset.c +++ b/src/osmo_ss7_linkset.c @@ -100,3 +100,14 @@ return lset; } + +bool +ss7_linkset_is_available(const struct osmo_ss7_linkset *lset) +{ + for (unsigned int i = 0; i < ARRAY_SIZE(lset->links); i++) { + struct osmo_ss7_link *link = lset->links[i]; + if (link && ss7_link_is_available(link)) + return true; + } + return false; +} diff --git a/src/osmo_ss7_route.c b/src/osmo_ss7_route.c index 8a1592f..2787895 100644 --- a/src/osmo_ss7_route.c +++ b/src/osmo_ss7_route.c @@ -372,3 +372,15 @@ { return rt->dest.as; } + + +/* Whether route is available, ITU Q.704 */ +bool ss7_route_is_available(const struct osmo_ss7_route *rt) +{ + OSMO_ASSERT(rt); + if (rt->dest.as) + return osmo_ss7_as_active(rt->dest.as); + if (rt->dest.linkset) + return ss7_linkset_is_available(rt->dest.linkset); + return false; +} diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index b29c93a..576ad7c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -520,15 +520,18 @@ if ((filter_pc != OSMO_SS7_PC_INVALID) && ((filter_pc & rt->cfg.mask) != rt->cfg.pc)) continue; /* Skip routes not matching destination */ - vty_out(vty, "%-22s %c %c %u %-19s %-7s %-7s %-7s%s", + bool rt_avail = ss7_route_is_available(rt); + + vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s%s", osmo_ss7_route_print(rt), + rt_avail ? "acces" : "INACC", ' ', '0' + rt->cfg.qos_class, rt->cfg.priority, rt->cfg.linkset_name, + rt_avail ? "avail" : "UNAVAIL", "?", - "?", - "?", + rt_avail ? "avail" : "UNAVAIL", VTY_NEWLINE); } } diff --git a/src/ss7_link.h b/src/ss7_link.h index 5ea6556..1bdcf12 100644 --- a/src/ss7_link.h +++ b/src/ss7_link.h @@ -31,3 +31,6 @@ void ss7_link_destroy(struct osmo_ss7_link *link); struct osmo_ss7_link * ss7_link_find_or_create(struct osmo_ss7_linkset *lset, uint32_t id); + +bool +ss7_link_is_available(const struct osmo_ss7_link *link); diff --git a/src/ss7_linkset.h b/src/ss7_linkset.h index daa442f..beb60a1 100644 --- a/src/ss7_linkset.h +++ b/src/ss7_linkset.h @@ -30,3 +30,6 @@ ss7_linkset_find_by_name(struct osmo_ss7_instance *inst, const char *name); struct osmo_ss7_linkset * ss7_linkset_find_or_create(struct osmo_ss7_instance *inst, const char *name, uint32_t pc); + +bool +ss7_linkset_is_available(const struct osmo_ss7_linkset *lset); diff --git a/src/ss7_route.h b/src/ss7_route.h index 7a29b7b..0382564 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -54,3 +54,5 @@ int ss7_route_set_linkset(struct osmo_ss7_route *rt, const char *linkset_name); int ss7_route_insert(struct osmo_ss7_route *rt); + +bool ss7_route_is_available(const struct osmo_ss7_route *rt); diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 255128e..6f60d9a 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -83,9 +83,9 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 0 2 as3 ? ? ? -3.2.1/14 0 5 as2 ? ? ? -3.2.1/14 7 6 as1 ? ? ? +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 TEST LOOKUP WORKS AS DESIRED (as3 PICKED): OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39617?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: I7f4ca56f9308803a306e7d6a3cde2faec27c3e7f Gerrit-Change-Number: 39617 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: vty: Allow filtering by DPC in show cs7 instance route
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39616?usp=email ) Change subject: vty: Allow filtering by DPC in show cs7 instance route ...................................................................... vty: Allow filtering by DPC in show cs7 instance route As available in Cisco ITP too. Change-Id: Iff92e61c7e2cc3186de75cb622686657b6c9cae5 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 22 insertions(+), 6 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index a15b7c6..b29c93a 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -505,7 +505,8 @@ } } -static void vty_dump_rtable(struct vty *vty, struct osmo_ss7_route_table *rtbl) +/* "filter_pc == OSMO_SS7_PC_INVALID" means "show all" */ +static void vty_dump_rtable(struct vty *vty, struct osmo_ss7_route_table *rtbl, uint32_t filter_pc) { struct osmo_ss7_route *rt; @@ -516,6 +517,9 @@ vty_out(vty, "---------------------- - - - ------------------- ------- ------- -------%s", VTY_NEWLINE); llist_for_each_entry(rt, &rtbl->routes, list) { + if ((filter_pc != OSMO_SS7_PC_INVALID) && ((filter_pc & rt->cfg.mask) != rt->cfg.pc)) + continue; /* Skip routes not matching destination */ + vty_out(vty, "%-22s %c %c %u %-19s %-7s %-7s %-7s%s", osmo_ss7_route_print(rt), ' ', @@ -530,11 +534,14 @@ } DEFUN(show_cs7_route, show_cs7_route_cmd, - "show cs7 instance <0-15> route", - SHOW_STR CS7_STR INST_STR INST_STR "Routing Table\n") + "show cs7 instance <0-15> route [POINT_CODE]", + SHOW_STR CS7_STR INST_STR INST_STR + "Routing Table\n" + "Destination Point Code\n") { int id = atoi(argv[0]); struct osmo_ss7_instance *inst; + uint32_t filter_pc = OSMO_SS7_PC_INVALID; inst = osmo_ss7_instance_find(id); if (!inst) { @@ -542,7 +549,16 @@ return CMD_WARNING; } - vty_dump_rtable(vty, inst->rtable_system); + if (argc > 1) { + int pc = osmo_ss7_pointcode_parse(inst, argv[1]); + if (pc < 0 || !osmo_ss7_pc_is_valid((uint32_t)pc)) { + vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + filter_pc = (uint32_t)pc; + } + + vty_dump_rtable(vty, inst->rtable_system, filter_pc); return CMD_SUCCESS; } diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 9394cf4..747c7b7 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -11,7 +11,7 @@ show cs7 instance <0-15> asp-assoc-status show cs7 instance <0-15> asp-assoc-status name ASP_NAME show cs7 instance <0-15> as (active|all|m3ua|sua) - show cs7 instance <0-15> route + show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users @@ -35,7 +35,7 @@ show cs7 instance <0-15> asp-assoc-status show cs7 instance <0-15> asp-assoc-status name ASP_NAME show cs7 instance <0-15> as (active|all|m3ua|sua) - show cs7 instance <0-15> route + show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39616?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: Iff92e61c7e2cc3186de75cb622686657b6c9cae5 Gerrit-Change-Number: 39616 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: snm: Fix generating wrong format in 'affected PCs' log string
by pespin 26 Feb '25

26 Feb '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39618?usp=email ) Change subject: snm: Fix generating wrong format in 'affected PCs' log string ...................................................................... snm: Fix generating wrong format in 'affected PCs' log string The previous code wrongly added an extra ", " string between each element. Change-Id: I338a700e705f15bec962dca5ea69533ddec5e8a6 --- M src/xua_snm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/xua_snm.c b/src/xua_snm.c index 36fe3c7..971380b 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -59,7 +59,7 @@ uint8_t mask = _aff_pc >> 24; /* append point code + mask */ - out = talloc_asprintf_append(out, "%s%s/%u, ", i == 0 ? "" : ", ", + out = talloc_asprintf_append(out, "%s%s/%u", i == 0 ? "" : ", ", osmo_ss7_pointcode_print(s7i, pc), mask); } return out; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39618?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: I338a700e705f15bec962dca5ea69533ddec5e8a6 Gerrit-Change-Number: 39618 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: vty: Add cmd to look up route
by pespin 26 Feb '25

26 Feb '25

Attention is currently required from: daniel, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?usp=email ) Change subject: vty: Add cmd to look up route ...................................................................... Patch Set 3: Code-Review+2 (1 comment) File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611/comment/5b63fd58_f2b80… : PS3, Line 570: pc = osmo_ss7_pointcode_parse(inst, argv[2]); > You don't really seem to do anything with the source PC except validate. […] I'm not doing anything (yet) here because it is be implemented in a follow-up patch, when I add the new route-label struct to look up routes. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39611?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: I4dbe04862c018a1beea253de99404adb88bb7f4b Gerrit-Change-Number: 39611 Gerrit-PatchSet: 3 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Feb 2025 12:01:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 0

[L] Change in libosmo-abis[master]: rtp2trau HR: add support for TRAU-8k-UL frame output
by falconia 26 Feb '25

26 Feb '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39622?usp=email ) Change subject: rtp2trau HR: add support for TRAU-8k-UL frame output ...................................................................... rtp2trau HR: add support for TRAU-8k-UL frame output When osmo_rtp2trau() function is used to pass traffic to an E1 BTS, it only needs to generate TRAU-DL frames, not TRAU-UL. OTOH, ability to generate TRAU-UL frames is needed for TFO, i.e., for software implementation of TFO-capable speech transcoders. osmo_rtp2trau() already supports TRAU-UL frame output for FR and EFR codecs, but not for HR codec in TRAU-8k framing - add the missing support. (Out of the two possible TRAU frame formats for GSM-HR codec, TFO always uses TRAU-8k format.) Change-Id: I288cfa7d467125f7732ef1d0ef83b933e41da536 --- M src/trau/trau_rtp_conv.c M tests/Makefile.am M tests/testsuite.at A tests/trau_conv/hr_speech_invsid_bits.hex A tests/trau_conv/hr_speech_twts002.hex A tests/trau_conv/rtp2trau_hr_ul1.ok A tests/trau_conv/rtp2trau_hr_ul2.ok A tests/trau_conv/rtp2trau_hr_ul3.ok 8 files changed, 241 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/22/39622/1 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 328221e..d5ac1fa 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -756,7 +756,7 @@ return 0; } -static int rtp2trau_hr8(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) +static int rtp2trau_hr8_dl(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) { /* accept both TS 101 318 and RFC 5993 payloads */ switch (data_len) { @@ -773,12 +773,6 @@ return -EINVAL; } - /* FIXME: implement TRAU-UL frame generation if and when - * someone actually needs it in a program that uses - * this library. */ - if (tf->dir != OSMO_TRAU_DIR_DL) - return -ENOTSUP; - tf->type = OSMO_TRAU8_SPEECH; /* C1..C5 */ @@ -819,6 +813,130 @@ return 0; } +/* compute the odd parity bit of the given input bit sequence */ +static ubit_t compute_odd_parity(const ubit_t *in, unsigned int num_bits) +{ + int i; + unsigned int sum = 0; + + for (i = 0; i < num_bits; i++) { + if (in[i]) + sum++; + } + return !(sum & 1); +} + +static int rtp2trau_hr8_ul(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) +{ + uint8_t ft, xc1_4; + bool data_bits_req, have_taf; + + /* In TRAU-UL direction we require/expect TW-TS-002 RTP payload format; + * RFC 5993 is also accepted because it is a subset of TW-TS-002. + * TS 101 318 input is not supported for TRAU-UL output! */ + if (data_len < 1) + return -EINVAL; + ft = data[0] >> 4; + switch (ft) { + case FT_GOOD_SPEECH: + xc1_4 = 0; + data_bits_req = true; + have_taf = false; + break; + case FT_INVALID_SID: + xc1_4 = 4; + data_bits_req = false; + have_taf = true; + break; + case FT_GOOD_SID: + xc1_4 = 1; + data_bits_req = true; + have_taf = false; + break; + case FT_BFI_WITH_DATA: + xc1_4 = 6; + data_bits_req = true; + have_taf = true; + break; + case FT_NO_DATA: + xc1_4 = 6; + data_bits_req = false; + have_taf = true; + break; + default: + return -EINVAL; + } + /* If the frame type is one that includes data bits, the payload length + * per RFC 5993 and TW-TS-002 is 15 bytes. If the frame type is one + * that does not include data bits, then the payload length per the + * same specs is only 1 byte - but we also accept 15-byte payloads + * in this case to make life easier for applications that pass the + * content of a buffer. + * + * When we make a TRAU-UL frame from FT=1 or FT=7, we fill all Dn bits + * with zeros if we got a short (1 byte) payload. However, if the + * application passed us a long (15 byte) payload despite FT being + * 1 or 7, we fill Dn bits with application-provided payload. + */ + switch (data_len) { + case GSM_HR_BYTES_RTP_RFC5993: + break; + case 1: + if (data_bits_req) + return -EINVAL; + break; + default: + return -EINVAL; + } + + tf->type = OSMO_TRAU8_SPEECH; + + /* C1..C5 */ + tf->c_bits[0] = 0; + tf->c_bits[1] = 0; + tf->c_bits[2] = 0; + tf->c_bits[3] = 1; + tf->c_bits[4] = 0; + /* C6..C8: spare bits */ + memset(tf->c_bits + 5, 1, 3); + /* C9 is DTXd */ + tf->c_bits[8] = (data[0] & 0x08) >> 3; + + /* XC1..XC6 */ + tf->xc_bits[0] = (xc1_4 >> 3) & 1; + tf->xc_bits[1] = (xc1_4 >> 2) & 1; + tf->xc_bits[2] = (xc1_4 >> 1) & 1; + if (have_taf) + tf->xc_bits[3] = (data[0] & 0x01) >> 0; + else + tf->xc_bits[3] = (xc1_4 >> 0) & 1; + tf->xc_bits[4] = (data[0] & 0x02) >> 1; /* UFI */ + tf->xc_bits[5] = compute_odd_parity(tf->xc_bits, 5); + + memset(&tf->t_bits[0], 1, 2); + + if (data_len > 1) + osmo_pbit2ubit(tf->d_bits, data + 1, GSM_HR_BYTES * 8); + else + memset(tf->d_bits, 0, GSM_HR_BYTES * 8); + /* CRC is *not* computed by TRAU frame encoder - we have to do it */ + osmo_crc8gen_set_bits(&gsm0860_efr_crc3, tf->d_bits, 44, tf->crc_bits); + + return 0; +} + +static int rtp2trau_hr8(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) +{ + switch (tf->dir) { + case OSMO_TRAU_DIR_DL: + return rtp2trau_hr8_dl(tf, data, data_len); + case OSMO_TRAU_DIR_UL: + return rtp2trau_hr8_ul(tf, data, data_len); + default: + return -EINVAL; + } +} + /* TS 48.060 Section 5.5.1.1.2 */ static int rtp2trau_efr(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) { @@ -1571,9 +1689,9 @@ * TRAU-UL (TFO) is TW-TS-001 - the basic RTP format of TS 101 318 or * RFC 3551 lacks the necessary metadata flags. * - * - TRAU-UL output for HR codec is not currently implemented; when we do - * implement it in the future, TW-TS-002 will be required in this path - * for the same reason as above. + * - For HRv1 codec, for the same reason as above, the only correct RTP + * format for conversion to TRAU-UL is TW-TS-002. RFC 5993 payloads are + * also accepted (because it is a subset of TW-TS-002), but not TS 101 318. * * - TRAU-UL output for CSD 14.4 kbit/s mode is not currently implemented * (C-bits are always set according to the rules for TRAU-DL) - but the diff --git a/tests/Makefile.am b/tests/Makefile.am index 4645b7e..73341a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -99,13 +99,15 @@ trau_conv/fr_speech_basic.hex trau_conv/fr_speech_twts001_good.hex \ trau_conv/fr_speech_twts001_mix.hex \ trau_conv/hr_speech_rfc5993.hex trau_conv/hr_speech_ts101318.hex \ + trau_conv/hr_speech_twts002.hex trau_conv/hr_speech_invsid_bits.hex \ trau_conv/rtp2trau_efr_dl1.ok trau_conv/rtp2trau_efr_dl2.ok \ trau_conv/rtp2trau_efr_ul1.ok trau_conv/rtp2trau_efr_ul2.ok \ trau_conv/rtp2trau_efr_ul3.ok \ trau_conv/rtp2trau_fr_dl1.ok trau_conv/rtp2trau_fr_dl2.ok \ trau_conv/rtp2trau_fr_ul1.ok trau_conv/rtp2trau_fr_ul2.ok \ trau_conv/rtp2trau_fr_ul3.ok \ - trau_conv/rtp2trau_hr_dl.ok \ + trau_conv/rtp2trau_hr_dl.ok trau_conv/rtp2trau_hr_ul1.ok \ + trau_conv/rtp2trau_hr_ul2.ok trau_conv/rtp2trau_hr_ul3.ok \ trau_conv/trau16_efr.in trau_conv/trau16_efr_std.ok \ trau_conv/trau16_efr_twts001.ok \ trau_conv/trau16_fr.in trau_conv/trau16_fr_std.ok \ diff --git a/tests/testsuite.at b/tests/testsuite.at index a5cf070..b3c2764 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -162,3 +162,21 @@ cat $abs_srcdir/trau_conv/rtp2trau_hr_dl.ok > expout AT_CHECK([$abs_top_builddir/tests/trau_conv/rtp2trau_gen $abs_srcdir/trau_conv/hr_speech_rfc5993.hex hr dl], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([rtp2trau_hr_ul1]) +AT_KEYWORDS([rtp2trau_hr_ul1]) +cat $abs_srcdir/trau_conv/rtp2trau_hr_ul1.ok > expout +AT_CHECK([$abs_top_builddir/tests/trau_conv/rtp2trau_gen $abs_srcdir/trau_conv/hr_speech_rfc5993.hex hr ul], [0], [expout], [ignore]) +AT_CLEANUP + +AT_SETUP([rtp2trau_hr_ul2]) +AT_KEYWORDS([rtp2trau_hr_ul2]) +cat $abs_srcdir/trau_conv/rtp2trau_hr_ul2.ok > expout +AT_CHECK([$abs_top_builddir/tests/trau_conv/rtp2trau_gen $abs_srcdir/trau_conv/hr_speech_twts002.hex hr ul], [0], [expout], [ignore]) +AT_CLEANUP + +AT_SETUP([rtp2trau_hr_ul3]) +AT_KEYWORDS([rtp2trau_hr_ul3]) +cat $abs_srcdir/trau_conv/rtp2trau_hr_ul3.ok > expout +AT_CHECK([$abs_top_builddir/tests/trau_conv/rtp2trau_gen $abs_srcdir/trau_conv/hr_speech_invsid_bits.hex hr ul], [0], [expout], [ignore]) +AT_CLEANUP diff --git a/tests/trau_conv/hr_speech_invsid_bits.hex b/tests/trau_conv/hr_speech_invsid_bits.hex new file mode 100644 index 0000000..3ac5172 --- /dev/null +++ b/tests/trau_conv/hr_speech_invsid_bits.hex @@ -0,0 +1,14 @@ +# This TW-TS-005 hex file contains an input to osmo_rtp2trau() for GSM-HR +# codec that is *not* a valid RTP payload per TW-TS-002: an invalid SID +# frame for conversion to TRAU-UL that begins as defined in TW-TS-002 +# (FT=1 to signify invalid SID), but then contrary to the spec, does +# include the payload data bits. Such concoction is not valid in RTP +# flight between network elements, but osmo_rtp2trau() supports such +# extended usage in order to allow TFO applications to set the fill bit +# pattern in the TRAU-UL frame to something other than all zeros. +# +# In the present example, this fill bit pattern consists of R0+LPC +# parameters (33 bits) from a valid SID frame, followed by alternating +# 1s and 0s in the 79-bit SID field. + +1000D9EA65D5555555555555555555 diff --git a/tests/trau_conv/hr_speech_twts002.hex b/tests/trau_conv/hr_speech_twts002.hex new file mode 100644 index 0000000..e0e6321 --- /dev/null +++ b/tests/trau_conv/hr_speech_twts002.hex @@ -0,0 +1,43 @@ +# This hex file (TW-TS-005 Annex B format) contains some RTP payloads for +# GSM-HR codec, using the super-5993 RTP payload format of TW-TS-002, +# semantically corresponding to the uplink direction of a GSM call leg. +# +# The present example contains a mix of good and bad frames, the same kind +# of mix that can be represented in a TRAU-UL frame stream. This example +# has been constructed by hand: some frames were taken from GSM 06.07 test +# sequences and then tweaked, other are outright concoctions. The setting +# of DTXd bit is also exercised. + +# good speech frame (DHF) +000371AF61C8F2802531C000000000 + +# good speech frame (regular) +00B77916FC7D902F9372B569F5D17F +# same with TAF +01B77916FC7D902F9372B569F5D17F +# same with UFI +02B77916FC7D902F9372B569F5D17F + +# valid SID frame (first SID from dtx06.cod) +2000D9EA65FFFFFFFFFFFFFFFFFFFF +# same with TAF +2100D9EA65FFFFFFFFFFFFFFFFFFFF +# same with UFI +2200D9EA65FFFFFFFFFFFFFFFFFFFF + +# BFI with data +608FE9B77000000000000000000000 +# same with TAF +618FE9B77000000000000000000000 + +# short TW-TS-002 payloads (ToC octet only) +10 # invalid SID frame +11 # same with TAF +13 # TAF+UFI +70 # BFI-no-data +71 # same with TAF + +# some of these same frames with DTXd=1 +08B77916FC7D902F9372B569F5D17F +2800D9EA65FFFFFFFFFFFFFFFFFFFF +688FE9B77000000000000000000000 diff --git a/tests/trau_conv/rtp2trau_hr_ul1.ok b/tests/trau_conv/rtp2trau_hr_ul1.ok new file mode 100644 index 0000000..1fd3f3b --- /dev/null +++ b/tests/trau_conv/rtp2trau_hr_ul1.ok @@ -0,0 +1,17 @@ +00884486f1d7d8b98ff2c089a69c8080808080bb +00884486f1d7d8b98ff2c089a69c8080808080bb +0088469fe9dbdc8080d0808080808080808080bb +0088469fe3eedf90dd9c9dddc7f193a9e5c587bb +008845fef4fd9ba986ddabfceac589d38ab3febb +008846bfe3eedab7e4aed7eb88b4a4a4f997ccfb +008846eef98bbf8fd9a097e4eeababa7ebd1bffb +00884486f1d7d8b98ff2c089a69c8080808080bb +00884486f1d7d8b98ff2c089a69c8080808080bb +00884481d9f599b9c9cce0b8ccb6c099e9f1f6fb +00884481d9f599b18c9df0b0cdb68099d9f5f6fb +00884481d9f599b18c9df0b2cdb28099d9f5f6fb +00884481d9f599b18c9df0b2cdb28099d9f5f6fb +00884481d9f599b18c9df0b2cdb28099d9f5f6fb +00884481d9f599b18c9df0b2cdb28099d9f5f6fb +00884481d9f599b18c9df0b2cdb28099d9f5f6fb +00885081d9f599bffffffffffffffffffffffffb diff --git a/tests/trau_conv/rtp2trau_hr_ul2.ok b/tests/trau_conv/rtp2trau_hr_ul2.ok new file mode 100644 index 0000000..01ba3e4 --- /dev/null +++ b/tests/trau_conv/rtp2trau_hr_ul2.ok @@ -0,0 +1,17 @@ +00884486f1d7d8b98ff2c089a69c8080808080bb +008846eef98bbf8fd9a097e4eeababa7ebd1bffb +008846eef98bbf8fd9a097e4eeababa7ebd1bffb +00884aeef98bbf8fd9a097e4eeababa7ebd1bffb +00885081d9f599bffffffffffffffffffffffffb +00885081d9f599bffffffffffffffffffffffffb +00885c81d9f599bffffffffffffffffffffffffb +0089669fe9dbdc8080d0808080808080808080bb +0089729fe9dbdc8080d0808080808080808080bb +008940808080808080f0808080808080808080bb +008954808080808080f0808080808080808080bb +008958808080808080f0808080808080808080bb +008964808080808080f0808080808080808080bb +008970808080808080f0808080808080808080bb +008846eef98bbf8fd9a097e4eeababa7ebd1bfff +00885081d9f599bfffffffffffffffffffffffff +0089669fe9dbdc8080d0808080808080808080bf diff --git a/tests/trau_conv/rtp2trau_hr_ul3.ok b/tests/trau_conv/rtp2trau_hr_ul3.ok new file mode 100644 index 0000000..a6d657c --- /dev/null +++ b/tests/trau_conv/rtp2trau_hr_ul3.ok @@ -0,0 +1 @@ +00894081d9f599bad5a5aad5aad5aad5aad5aafb -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39622?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I288cfa7d467125f7732ef1d0ef83b933e41da536 Gerrit-Change-Number: 39622 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in libosmo-abis[master]: trau_rtp_conv: document API functions
by falconia 26 Feb '25

26 Feb '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39620?usp=email ) Change subject: trau_rtp_conv: document API functions ...................................................................... trau_rtp_conv: document API functions The two API functions that constitute TRAU<->RTP conversion layer of libosmotrau, osmo_trau2rtp() and osmo_rtp2trau(), date back to the reintroduction of E1 BTS support in Osmocom in 2020, and their functionality has been greatly extended in previous Themyscira patches. However, they have not been properly documented until now - fix this defect. Change-Id: Ib7ee2466aaab47e47f78ff94c5179b90cf393d0e --- M src/trau/trau_rtp_conv.c 1 file changed, 99 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/20/39620/1 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 9bee640..328221e 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -1456,6 +1456,38 @@ return false; } +/*! convert received TRAU-UL frame to RTP payload + * \param[out] out Buffer for the output RTP payload + * \param[in] out_len Size of buffer pointed to by \ref out + * \param[in] tf Osmo-decoded TRAU frame + * \param[in] st State/config structure + * \returns length of converted RTP payload if successful; negative on error + * + * This function is intended to operate on TRAU-UL or TFO frames, either + * received from an E1 BTS or extracted from lsbs of PCM samples in TFO. + * Supported TRAU frame types are FR & EFR speech, HRv1 speech in both + * 16k and 8k formats, and all defined CSD frame types up to 14.4 kbit/s + * extended data frames. + * + * In the case of FR/EFR speech, the output format is either RFC 3551 or + * TW-TS-001; in the case of HRv1 speech, the output format is either RFC 5993 + * or TW-TS-002. st->rtp_extensions field selects the use or non-use of + * Themyscira RTP extensions; the structure passed in \ref st currently + * has no other uses in the TRAU->RTP direction. + * + * The following TRAU frame types are _not_ supported: + * + * - TRAU-DL frames: the direction field of the parsed frame structure is + * ignored and all frames are processed as if they were TRAU-UL. In the + * case of FR, EFR, HR-16k and extended data (E-TRAU) frames some control + * bits are different between TRAU-UL and TRAU-DL, such that this + * misinterpretation will produce invalid results. + * + * - D144 sync frames: these special frames are not convertible to RTP; + * their synchronization function needs to be handled by the application. + * + * - AMR speech frames: not currently implemented. + */ int osmo_trau2rtp(uint8_t *out, size_t out_len, const struct osmo_trau_frame *tf, struct osmo_trau2rtp_state *st) { @@ -1481,6 +1513,73 @@ } } +/*! convert RTP payload to TRAU-UL or TRAU-DL frame + * \param[out] tf Osmocom-defined structure for TRAU frame bits + * \param[in] rtp Payload to be converted + * \param[in] rtp_len Length of payload in \ref rtp + * \param[in] st State/config structure + * \returns 0 in case of success; negative on error + * + * This function can be used to generate both TRAU-UL and TRAU-DL frames. + * TRAU-DL output is needed when feeding traffic to an E1 BTS; TRAU-UL output + * is needed in more specialized applications that emulate an E1 BTS or + * implement in-band TFO. + * + * The set of supported codecs and frame types is the same as osmo_trau2rtp(); + * st->type selects the TRAU frame type to be emitted. Additionally, if the + * TRAU frame type to be generated is OSMO_TRAU16_FT_DATA, st->interm_rate_16k + * needs to be set to true for 16 kbit/s IR or false for 8 kbit/s IR. + * + * In the output structure pointed to by \ref tf, the caller MUST set dir + * member prior to calling the present function; additionally, dl_ta_usec + * member MUST be set (usually to 0) prior to calling osmo_trau_frame_encode(). + * All other required bits are filled correctly by the present function. + * + * With FR/HR/EFR speech codecs, semantically appropriate RTP payloads are + * different between UL and DL output applications. Considerations for + * TRAU-DL output: + * + * - RTP payload formats of RFC 5993, TW-TS-001 and TW-TS-002 are accepted + * by the function - however, all metadata flags carried by the header octet + * of these extended formats are ignored/dropped in the DL direction. + * + * - The most native RTP input formats for conversion to TRAU-DL are those + * defined in ETSI TS 101 318 for FR, HR and EFR; the ones for FR and EFR + * are also duplicated in RFC 3551. In the case of HR codec, RFC 5993 input + * is also appropriate as specified in 3GPP TS 48.103 - as long as the user + * remembers that the extra header octet is ignored. + * + * - The only correct way to implement TrFO for GSM, accepting FR/HR/EFR from + * call leg A uplink in TW-TS-001 or TW-TS-002 format and generating TRAU-DL + * frames for call leg B, is to apply the TFO transform of TS 28.062 section + * C.3.2.1.1, then feed the output of that transform to the present function. + * + * - The provision whereby a zero-length RTP payload is not treated as an error + * like other invalid RTP inputs, but is converted to an idle speech frame + * in TRAU-DL output should be considered a bogon. This condition never + * occurs when the just-mentioned TFO transform is applied immediately prior + * to TRAU-DL output, nor does it ever occur in the original GSM architecture + * where the TRAU either free-runs a speech encoder or applies the same TFO + * transform - hence it is unlikely to be handled well by real E1 BTSes. + * Furthermore, this code path in libosmotrau is currently broken (the + * intended idle speech frame gets turned into a "regular" but invalid FR/EFR + * speech frame) and should be considered for removal. + * + * Considerations for TRAU-UL output: + * + * - For FR and EFR codecs, the only correct RTP format for conversion to + * TRAU-UL (TFO) is TW-TS-001 - the basic RTP format of TS 101 318 or + * RFC 3551 lacks the necessary metadata flags. + * + * - TRAU-UL output for HR codec is not currently implemented; when we do + * implement it in the future, TW-TS-002 will be required in this path + * for the same reason as above. + * + * - TRAU-UL output for CSD 14.4 kbit/s mode is not currently implemented + * (C-bits are always set according to the rules for TRAU-DL) - but the + * primary application for TRAU-UL frame output via libosmotrau is TFO, + * which does not include CSD. + */ int osmo_rtp2trau(struct osmo_trau_frame *tf, const uint8_t *rtp, size_t rtp_len, struct osmo_trau2rtp_state *st) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39620?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib7ee2466aaab47e47f78ff94c5179b90cf393d0e Gerrit-Change-Number: 39620 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[XS] Change in libosmo-abis[master]: rtp2trau FR & EFR: disallow BFI in DL
by falconia 26 Feb '25

26 Feb '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39625?usp=email ) Change subject: rtp2trau FR & EFR: disallow BFI in DL ...................................................................... rtp2trau FR & EFR: disallow BFI in DL osmo_rtp2trau() accepts TW-TS-001 extended RTP payload format for FR and EFR, converting to either TRAU-DL or TRAU-UL. This extended format is required for TRAU-UL/TFO frame output, but it is also accepted for conversion to TRAU-DL in order to support the current form of OsmoMGW-E1 that has no TFO transform between RTP input and TDM-timed calls to osmo_rtp2trau(). TW-TS-001 can represent not only good frames, but also bad ones - however, bad frames on Abis are valid only in UL, not in DL. Prior to the present patch, if a BFI-marked frame were fed to osmo_rtp2trau() for conversion to TRAU-DL, the Bad Frame Indicator was dropped and the garbage payload bits were emitted as if they were a good frame - bad choice. Reject BFI frames in TRAU-DL mode, return -EINVAL. Change-Id: Ic63943d4bde9902b27e4d8fe9a5fb6ccecbf36c6 --- M src/trau/trau_rtp_conv.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/25/39625/1 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 8d2631b..1114aaf 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -586,6 +586,10 @@ if ((data[0] & 0xF0) != 0xD0) return -EINVAL; + /* bad frames are only allowed in UL */ + if (bfi && tf->dir != OSMO_TRAU_DIR_UL) + return -EINVAL; + tf->type = OSMO_TRAU16_FT_FR; /* FR Data Bits according to TS 48.060 Section 5.5.1.1.2 */ @@ -894,6 +898,10 @@ if ((data[0] & 0xF0) != 0xC0) return -EINVAL; + /* bad frames are only allowed in UL */ + if (bfi && tf->dir != OSMO_TRAU_DIR_UL) + return -EINVAL; + tf->type = OSMO_TRAU16_FT_EFR; /* FR Data Bits according to TS 48.060 Section 5.5.1.1.2 */ @@ -1566,6 +1574,7 @@ * - RTP payload formats of RFC 5993, TW-TS-001 and TW-TS-002 are accepted * by the function - however, all metadata flags carried by the header octet * of these extended formats are ignored/dropped in the DL direction. + * BFI frames are not allowed in DL. * * - The most native RTP input formats for conversion to TRAU-DL are those * defined in ETSI TS 101 318 for FR, HR and EFR; the ones for FR and EFR -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic63943d4bde9902b27e4d8fe9a5fb6ccecbf36c6 Gerrit-Change-Number: 39625 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

2026

2025

2024

2023

2022

gerrit-log