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

[M] Change in libosmo-sigtran[master]: vty: Add cmd 'show cs7 instance <0-15> as name AS_NAME'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39710?usp=email ) Change subject: vty: Add cmd 'show cs7 instance <0-15> as name AS_NAME' ...................................................................... vty: Add cmd 'show cs7 instance <0-15> as name AS_NAME' As also available in Cisco ITP. Change-Id: I76be29aeacb60201ecb5bab2203f02e3cdfc0943 --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 65 insertions(+), 16 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: 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 83890b8..63b127c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -2358,29 +2358,43 @@ vty_out(vty, " point-code override patch-sccp both%s", VTY_NEWLINE); } -DEFUN(show_cs7_as, show_cs7_as_cmd, - "show cs7 instance <0-15> as (active|all|m3ua|sua)", - SHOW_STR CS7_STR INST_STR INST_STR "Application Server (AS)\n" - "Display all active ASs\n" - "Display all ASs (default)\n" - "Display all m3ua ASs\n" - "Display all SUA ASs\n") +static void show_one_as(struct vty *vty, struct osmo_ss7_as *as) +{ + vty_out(vty, "%-12s %-12s %-10u %-13s %4s %13s %3s %5s %4s %10s%s", + as->cfg.name, osmo_fsm_inst_state_name(as->fi), as->cfg.routing_key.context, + osmo_ss7_pointcode_print(as->inst, as->cfg.routing_key.pc), + "", "", "", "", "", osmo_ss7_as_traffic_mode_name(as->cfg.mode), + VTY_NEWLINE); +} + +static int show_as(struct vty *vty, int id, const char *as_name, const char *filter) { struct osmo_ss7_instance *inst; - struct osmo_ss7_as *as; - const char *filter = argv[1]; - int id = atoi(argv[0]); + struct osmo_ss7_as *as = NULL; inst = osmo_ss7_instance_find(id); if (!inst) { - vty_out(vty, "No SS7 instance %d found%s", id, VTY_NEWLINE); + vty_out(vty, "%% No SS7 instance %d found%s", id, VTY_NEWLINE); return CMD_WARNING; } + if (as_name) { + as = osmo_ss7_as_find_by_name(inst, as_name); + if (!as) { + vty_out(vty, "%% No AS '%s' found%s", as_name, VTY_NEWLINE); + return CMD_WARNING; + } + } + vty_out(vty, " Routing Routing Key Cic Cic Traffic%s", VTY_NEWLINE); vty_out(vty, "AS Name State Context Dpc Si Opc Ssn Min Max Mode%s", VTY_NEWLINE); vty_out(vty, "------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- -------%s", VTY_NEWLINE); + if (as) { + show_one_as(vty, as); + return CMD_SUCCESS; + } + llist_for_each_entry(as, &inst->as_list, list) { if (filter && !strcmp(filter, "m3ua") && as->cfg.proto != OSMO_SS7_ASP_PROT_M3UA) continue; @@ -2388,15 +2402,37 @@ continue; if (filter && !strcmp(filter, "active") && !osmo_ss7_as_active(as)) continue; - vty_out(vty, "%-12s %-12s %-10u %-13s %4s %13s %3s %5s %4s %10s%s", - as->cfg.name, osmo_fsm_inst_state_name(as->fi), as->cfg.routing_key.context, - osmo_ss7_pointcode_print(as->inst, as->cfg.routing_key.pc), - "", "", "", "", "", osmo_ss7_as_traffic_mode_name(as->cfg.mode), - VTY_NEWLINE); + show_one_as(vty, as); } return CMD_SUCCESS; } +DEFUN(show_cs7_as, show_cs7_as_cmd, + "show cs7 instance <0-15> as (active|all|m3ua|sua)", + SHOW_STR CS7_STR INST_STR INST_STR "Application Server (AS)\n" + "Display all active ASs\n" + "Display all ASs (default)\n" + "Display all m3ua ASs\n" + "Display all SUA ASs\n") +{ + const char *filter = argv[1]; + int id = atoi(argv[0]); + + return show_as(vty, id, NULL, filter); +} + +DEFUN(show_cs7_as_name, show_cs7_as_name_cmd, + "show cs7 instance <0-15> as name AS_NAME", + SHOW_STR CS7_STR INST_STR INST_STR "Application Server (AS)\n" + "Look up AS with a given name\n" + "Name of the Application Server (AS)\n") +{ + int id = atoi(argv[0]); + const char *as_name = argv[1]; + + return show_as(vty, id, as_name, NULL); +} + /*********************************************************************** * SCCP addressbook handling ***********************************************************************/ @@ -3269,6 +3305,7 @@ install_node(&as_node, NULL); install_lib_element_ve(&show_cs7_as_cmd); + install_lib_element_ve(&show_cs7_as_name_cmd); install_lib_element(L_CS7_NODE, &cs7_as_cmd); install_lib_element(L_CS7_NODE, &no_cs7_as_cmd); install_lib_element(L_CS7_AS_NODE, &cfg_description_cmd); diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 58a1ee0..81515c1 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -11,6 +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> as name AS_NAME 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 @@ -35,6 +36,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> as name AS_NAME 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 @@ -88,6 +90,7 @@ all Display all ASs (default) m3ua Display all m3ua ASs sua Display all SUA ASs + name Look up AS with a given name OsmoSTP# show cs7 instance 0 sccp ? addressbook List all SCCP addressbook entries @@ -402,6 +405,15 @@ ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- my-ass AS_DOWN 0 0.0.0 override +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as name my-ass + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 0.0.0 override + +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as name my-ass-not-exists +% No AS 'my-ass-not-exists' found + OsmoSTP(config-cs7-as)# asp my-asp OsmoSTP(config-cs7-as)# routing-key 0 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39710?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: I76be29aeacb60201ecb5bab2203f02e3cdfc0943 Gerrit-Change-Number: 39710 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>

4 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?usp=email ) Change subject: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence, set SLS ...................................................................... sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence, set SLS The public API for SCCP UNIT-DATA.req was missing a way to state whether the "Sequence Control" Parameter was present or not in the primitive. This was originated most probably by the fact that the field is always present for SUA CLDT message generated and sent over the wire. Still, the presence of such field during UNIT-DATA.req actually indicates the Protocol Class to be used/set on the message. Hence, it is important to provide it. Once the Protocol Class to transmit the message is known, we can then generate a proper SLS. Change-Id: I834e91c1ec337713b0e684cf4fd7de854150bef6 --- M include/osmocom/sigtran/sccp_sap.h M src/sccp_helpers.c M src/sccp_sclc.c 3 files changed, 39 insertions(+), 5 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index d0fb040..98a48be 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -236,6 +236,13 @@ }; /* OSMO_SCU_PRIM_N_UNITDATA */ +/* NOTE: Ideally there should have been a "bool in_sequence_control_present", + * but that was found too late, so instead set: + * "in_sequence_control = OSMO_SCU_UNITDATA_PARAM_SEQUENCE_CONTROL_NOT_PRESENT" + * to mark the field not present (aka select Protocol Class 0). + * See ITU-T Q.711 6.2.1 for more information. + */ +#define OSMO_SCU_UNITDATA_REQ_P_SEQUENCE_CONTROL_NOT_PRESENT 0xffffffff struct osmo_scu_unitdata_param { struct osmo_sccp_addr called_addr; struct osmo_sccp_addr calling_addr; diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index 2a04b9d..6dd9ab8 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -72,6 +72,7 @@ param = &prim->u.unitdata; memcpy(&param->calling_addr, calling_addr, sizeof(*calling_addr)); memcpy(&param->called_addr, called_addr, sizeof(*called_addr)); + param->in_sequence_control = OSMO_SCU_UNITDATA_REQ_P_SEQUENCE_CONTROL_NOT_PRESENT; osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); msg->l2h = msgb_put(msg, len); diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 186efbd..e0a2844 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -35,9 +35,6 @@ * SUA which classic SCCP cannot handle (like IP addresses in GT). * However, all SCCP features can be expressed in SUA. * - * The code only supports Class 2. No support for Class 3 is intended, - * but patches are of course always welcome. - * * Missing other features: * * Segmentation/Reassembly support * * T(guard) after (re)start @@ -67,18 +64,47 @@ { struct xua_msg *xua = xua_msg_alloc(); struct osmo_scu_unitdata_param *udpar = &prim->u.unitdata; + uint32_t seq_ctrl = udpar->in_sequence_control; + uint32_t proto_class; if (!xua) return NULL; + if (seq_ctrl == OSMO_SCU_UNITDATA_REQ_P_SEQUENCE_CONTROL_NOT_PRESENT) { + /* ITU-T Q.711 6.2.1 Class 0: + * "The SCCP user can invoke this service by means of the parameter + * "sequence control" in the N-UNITDATA request primitive being absent" */ + proto_class = 0; + /* Erase the mark, we are anyway not using it in protocol_class=0. */ + seq_ctrl = 0; + /* ITU-T Q.714 (1.1.2.1 Protocol class 0): + * "They are transferred independently of each other. + * Therefore, they may be delivered to the SCCP user out-of-sequence." + */ + xua->mtp.sls = rand() & 0xf; + } else { + /* "ITU-T Q.711 6.2.1 Class 1: + * "The SCCP user can invoke this service by means of the parameter + * "sequence control" in the N-UNITDATA request primitive being present." */ + proto_class = 1; + /* ITU-T Q.714 (1.1.2.2 Protocol class 1): + * "The Signalling Link Selection (SLS) parameter in the MTP-TRANSFER + * request primitive is chosen by the originating SCCP based on the value + * of the sequence control parameter. The SLS shall be identical for a + * stream of NSDUs with the same sequence control parameter". + * SLS is 4 bits, as described in ITU Q.704 Figure 3. + */ + xua->mtp.sls = udpar->in_sequence_control & 0x0f; + } + switch (msg_type) { case SUA_CL_CLDT: xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT); xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX, 0); /* FIXME */ - xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, 0); + xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, proto_class); xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &udpar->calling_addr); xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &udpar->called_addr); - xua_msg_add_u32(xua, SUA_IEI_SEQ_CTRL, udpar->in_sequence_control); + xua_msg_add_u32(xua, SUA_IEI_SEQ_CTRL, seq_ctrl); /* optional: importance, ... correlation id? */ if (!prim) goto prim_needed; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?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: I834e91c1ec337713b0e684cf4fd7de854150bef6 Gerrit-Change-Number: 39690 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: AS loadsharing: Log routing lookup logic

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39705?usp=email ) Change subject: AS loadsharing: Log routing lookup logic ...................................................................... AS loadsharing: Log routing lookup logic Loggin very similar to what we already have for ASP loadsharing in ss7_as_select_asp_loadshare(). Change-Id: I6b4983bc2cc8bd231a5d85f378be8c93c6f4fa27 --- M src/osmo_ss7_combined_linkset.c M src/ss7_combined_linkset.h 2 files changed, 46 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo_ss7_combined_linkset.c b/src/osmo_ss7_combined_linkset.c index 99b0c79..a741aba 100644 --- a/src/osmo_ss7_combined_linkset.c +++ b/src/osmo_ss7_combined_linkset.c @@ -25,6 +25,7 @@ #include <osmocom/core/logging.h> #include <osmocom/sigtran/osmo_ss7.h> +#include "ss7_as.h" #include "ss7_combined_linkset.h" #include "ss7_route.h" #include "ss7_route_table.h" @@ -219,7 +220,8 @@ ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct osmo_ss7_route_label *rtlabel) { struct osmo_ss7_route *rt; - ext_sls_t esls = osmo_ss7_instance_calc_itu_ext_sls(clset->rtable->inst, rtlabel); + struct osmo_ss7_instance *inst = clset->rtable->inst; + ext_sls_t esls = osmo_ss7_instance_calc_itu_ext_sls(inst, rtlabel); struct osmo_ss7_esls_entry *eslse = &clset->esls_table[esls]; /* First check if we have a cached route for this ESLS */ @@ -228,7 +230,22 @@ if (rt == eslse->normal_rt) { /* We can transmit over normal route. * Clean up alternative route since it's not needed anymore */ - eslse->alt_rt = NULL; + if (eslse->alt_rt) { + LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + "Normal Route via '%s' became available, drop use of Alternative Route via '%s'\n", + rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), + rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), + rtlabel->sls, esls, + eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", + eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); + eslse->alt_rt = NULL; + } + LOGPCLSET(clset, DLSS7, LOGL_DEBUG, + "RT lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: use Normal Route via '%s'\n", + rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), + rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), + rtlabel->sls, esls, + eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>"); return rt; } /* We can transmit over alternative route: */ @@ -242,13 +259,29 @@ rt = ss7_combined_linkset_select_route_roundrobin(clset); /* Either a normal route was selected or none found: */ eslse->normal_rt = rt; + if (rt) { + LOGPCLSET(clset, DLSS7, LOGL_DEBUG, "RT loookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + "picked Normal Route via '%s' round-robin style\n", + rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), + rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), + rtlabel->sls, esls, + rt->dest.as ? rt->dest.as->cfg.name : "<linkset>"); + } return rt; } /* Normal route unavailable and no alternative route (or unavailable too). * start ITU Q.704 section 7 "forced rerouting" procedure: */ rt = ss7_combined_linkset_select_route_roundrobin(clset); - if (rt) + if (rt) { eslse->alt_rt = rt; + LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT Lookup: OPC=%u=%s,DPC=%u=%s,SLS=%u -> eSLS=%u: " + "Normal Route via '%s' unavailable, picked Alternative Route via '%s' round-robin style\n", + rtlabel->opc, osmo_ss7_pointcode_print(inst, rtlabel->opc), + rtlabel->dpc, osmo_ss7_pointcode_print2(inst, rtlabel->dpc), + rtlabel->sls, esls, + eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", + eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); + } return rt; } diff --git a/src/ss7_combined_linkset.h b/src/ss7_combined_linkset.h index b80a007..b79810b 100644 --- a/src/ss7_combined_linkset.h +++ b/src/ss7_combined_linkset.h @@ -56,3 +56,13 @@ ss7_combined_linkset_del_route(struct osmo_ss7_route *rt); struct osmo_ss7_route * ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct osmo_ss7_route_label *rtlabel); + +#define LOGPCLSET(clset, subsys, level, fmt, args ...) do { \ + char _pc_str[MAX_PC_STR_LEN]; \ + char _mask_str[MAX_PC_STR_LEN]; \ + _LOGSS7((clset)->rtable->inst, subsys, level, \ + "CombinedLinkset(dpc=%u=%s,mask=0x%x=%s,prio=%u) " fmt, \ + (clset)->cfg.pc, osmo_ss7_pointcode_print_buf(_pc_str, MAX_PC_STR_LEN, (clset)->rtable->inst, (clset)->cfg.pc), \ + (clset)->cfg.mask, osmo_ss7_pointcode_print_buf(_mask_str, MAX_PC_STR_LEN, (clset)->rtable->inst, (clset)->cfg.mask), \ + (clset)->cfg.priority, ## args); \ + } while (0) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39705?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: I6b4983bc2cc8bd231a5d85f378be8c93c6f4fa27 Gerrit-Change-Number: 39705 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>

4 months

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp_scrc: Improve logging of route lookup failure

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39706?usp=email ) Change subject: sccp_scrc: Improve logging of route lookup failure ...................................................................... sccp_scrc: Improve logging of route lookup failure Change-Id: I54a59f8b95451b473204d625acdc22dcfc94b631 --- M src/sccp_scrc.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 869235c..63ded9d 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -154,8 +154,9 @@ rt = ss7_instance_lookup_route(inst->ss7, &rtlabel); if (!rt) { - LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for " - "DPC %u: no route!\n", xua->mtp.dpc); + char buf[256]; + LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP for %s: no route!\n", + ss7_route_label_to_str(buf, sizeof(buf), inst->ss7, &rtlabel)); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39706?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: I54a59f8b95451b473204d625acdc22dcfc94b631 Gerrit-Change-Number: 39706 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>

4 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence...

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?usp=email ) Change subject: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence, set SLS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?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: I834e91c1ec337713b0e684cf4fd7de854150bef6 Gerrit-Change-Number: 39690 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Mar 2025 10:01:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[XS] Change in osmo-mgw[master]: E1: implement dummy fill for HRv1 codec

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39751?usp=email ) Change subject: E1: implement dummy fill for HRv1 codec ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I188bc0a0468b19126281016f45e36f1de617e9ee Gerrit-Change-Number: 39751 Gerrit-PatchSet: 5 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 10:01:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[M] Change in osmo-mgw[master]: E1: change dummy fill frame generation method

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39750?usp=email ) Change subject: E1: change dummy fill frame generation method ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I123f77295c56d61ff9aac5f5d64b25eca01e0d63 Gerrit-Change-Number: 39750 Gerrit-PatchSet: 4 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 10:01:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[M] Change in osmo-mgw[master]: MGCP extension: add parameters for TW-TS-001 & TW-TS-002

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39730?usp=email ) Change subject: MGCP extension: add parameters for TW-TS-001 & TW-TS-002 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39730?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0d58e6d84418f50670c8ab7cf8490af3bc2f5c26 Gerrit-Change-Number: 39730 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 10 Mar 2025 09:59:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence...

by daniel

Attention is currently required from: fixeria, laforge, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?usp=email ) Change subject: sccp: Allow marking UNIT-DATA.req Sequence Control param non-presence, set SLS ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39690?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: I834e91c1ec337713b0e684cf4fd7de854150bef6 Gerrit-Change-Number: 39690 Gerrit-PatchSet: 3 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Mar 2025 09:05:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: use --autoreconf-in-src-copy by default

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39735?usp=email ) Change subject: testenv: use --autoreconf-in-src-copy by default ...................................................................... testenv: use --autoreconf-in-src-copy by default Pass --autoreconf-in-src-copy to osmo-dev's gen_makefile.py by default, so we can always avoid errors related to: * running "./configure" in-tree and out-of-tree (results in "configure: error: source directory already configured; run "make distclean" there first") * running "./configure" / "autoreconf" with different autotools versions (on host system and in podman container) I've kept is as experimental flag at first for better testing, but make it the default now as it seems to work reliably. The old make dir is cleaned up when the user runs "./testenv.py clean" the next time. Related: osmo-dev I18ac50e3441df81e1fe7d8d5321df7e80ab9c650 Change-Id: I41e1fb534e253ddb43f266d73485b83259a8aa40 --- M _testenv/testenv/__init__.py M _testenv/testenv/osmo_dev.py M _testenv/testenv/requirements.py 3 files changed, 9 insertions(+), 16 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 4a925bb..c1991ca 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -170,14 +170,6 @@ default=ccache_dir_default, ) - group = sub_run.add_argument_group("experimental options") - group.add_argument( - "-A", - "--autoreconf-in-src-copy", - action="store_true", - help="run autoreconf in a copy of the source dir, avoids 'run make distclean' errors", - ) - sub.add_parser("clean", help="clean previous build artifacts") args = parser.parse_args() diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8748b93..695ca0d 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -73,14 +73,10 @@ os.path.join(testenv.args.cache, "host/usr"), ] - if testenv.args.autoreconf_in_src_copy: - # Use a different make dir, so we don't have unexpected behavior when - # the user already ran autoreconf or ./configure through osmo-dev with - # the previous make dir, without --autoreconf-in-src-copy. - make_dir += "2" - extra_opts += [ - "--autoreconf-in-src-copy", - ] + # Make dirs created without passing --autoreconf-in-src-copy to + # gen_makefile.py (as previous versions of testenv did) are incompatible. + # Add the "2" to avoid potential conflicts. + make_dir += "2" cmd = [ "./gen_makefile.py", @@ -103,6 +99,7 @@ "no_systemd.opts", "werror.opts", os.path.join(testenv.data_dir, "osmo-dev/osmo-bts-trx.opts"), + "--autoreconf-in-src-copy", ] + extra_opts cwd = get_osmo_dev_dir() diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 4973f6e..5405f50 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -44,6 +44,10 @@ "lddtree", "qemu-system-x86_64", ] + if not testenv.args.binary_repo: + programs += [ + "rsync", + ] abort = False for program in programs: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39735?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: I41e1fb534e253ddb43f266d73485b83259a8aa40 Gerrit-Change-Number: 39735 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025