February 2026 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: ss7_as: Optimize ss7_as_asp_assoc_find()
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42112?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ss7_as: Optimize ss7_as_asp_assoc_find() ...................................................................... ss7_as: Optimize ss7_as_asp_assoc_find() Look for counterpart on the object with the shortest list, ie. convert from O(N) to O(min(N,M)). This way eg. if we have 100 ASPs on 1 AS, lookup time becomes O(1). Same if we have eg. 1 ASP serving 100 AS. Change-Id: I139aede15af6b6a77d19e6fcf6b6abe8ed6599a6 --- M src/ss7_as.c 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified 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 diff --git a/src/ss7_as.c b/src/ss7_as.c index e22fc6c..1cc212f 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -243,8 +243,20 @@ const struct osmo_ss7_asp *asp) { struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { - if (assoc->asp == asp) + OSMO_ASSERT(as); + OSMO_ASSERT(asp); + + /* Optimization: Look for counterpart on the object with the shortest list: */ + if (as->num_assoc_asps <= asp->num_assoc_as) { + llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { + if (assoc->asp == asp) + return assoc; + } + return NULL; + } + + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + if (assoc->as == as) return assoc; } return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42112?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: I139aede15af6b6a77d19e6fcf6b6abe8ed6599a6 Gerrit-Change-Number: 42112 Gerrit-PatchSet: 5 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

[M] Change in libosmo-sigtran[master]: asp: Introduce asp->assoc_as_list
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42111?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: asp: Introduce asp->assoc_as_list ...................................................................... asp: Introduce asp->assoc_as_list This way we can iterate easily/quickly the AS served by a given ASP. This in turn allows simplifying some code since we cache the amount of AS served by the ASP at any time, so we save some counting. Related: SYS#6953 Change-Id: I1ca90748286374109dbb4277cbc7b2337ce2072a --- M src/ipa.c M src/sccp_instance.c M src/ss7_as.c M src/ss7_as.h M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/tcap_as_loadshare.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c M src/xua_internal.h M src/xua_shared.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 14 files changed, 77 insertions(+), 124 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/ipa.c b/src/ipa.c index 6cf7104..29dc5c0 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -169,22 +169,6 @@ return rc; } -struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as; - - /* in the IPA case, we assume there is a 1:1 mapping between the - * ASP and the AS. An AS without ASP means there is no - * connection, and an ASP without AS means that we don't (yet?) - * know the identity of the peer */ - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (osmo_ss7_as_has_asp(as, asp)) - return as; - } - return NULL; -} - /* Patch a SCCP message and add point codes to Called/Calling Party (if missing) */ static struct msgb *patch_sccp_with_pc(const struct osmo_ss7_asp *asp, const struct msgb *sccp_msg_in, uint32_t opc, uint32_t dpc) @@ -254,7 +238,7 @@ enum ipaccess_proto ipa_proto = osmo_ipa_msgb_cb_proto(msg); struct m3ua_data_hdr data_hdr; struct xua_msg *xua = NULL; - struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); + struct osmo_ss7_as *as = ss7_asp_get_first_as(asp); uint32_t opc, dpc; if (!as) { diff --git a/src/sccp_instance.c b/src/sccp_instance.c index 6388b4b..d6937d6 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -562,18 +562,6 @@ * Convenience function for CLIENT ***********************************************************************/ - /* Returns whether AS is already associated to any AS. - * Helper function for osmo_sccp_simple_client_on_ss7_id(). */ -static bool asp_serves_some_as(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as_i; - llist_for_each_entry(as_i, &asp->inst->as_list, list) { - if (osmo_ss7_as_has_asp(as_i, asp)) - return true; - } - return false; -} - /*! \brief request an sccp client instance * \param[in] ctx talloc context * \param[in] ss7_id of the SS7/CS7 instance @@ -695,7 +683,7 @@ llist_for_each_entry(asp_i, &ss7->asp_list, list) { if (asp_i->cfg.proto != prot) continue; - if (asp_serves_some_as(asp_i)) { + if (asp_i->num_assoc_as > 0) { /* This ASP is already on another AS. * If it was on this AS, we'd have found it above. */ continue; diff --git a/src/ss7_as.c b/src/ss7_as.c index 8a5c1a1..e22fc6c 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -65,7 +65,9 @@ assoc->as = as; assoc->asp = asp; llist_add_tail(&assoc->as_entry, &as->assoc_asp_list); + llist_add_tail(&assoc->asp_entry, &asp->assoc_as_list); as->num_assoc_asps++; + asp->num_assoc_as++; return assoc; } @@ -74,6 +76,8 @@ { llist_del(&assoc->as_entry); assoc->as->num_assoc_asps--; + llist_del(&assoc->asp_entry); + assoc->asp->num_assoc_as--; talloc_free(assoc); } diff --git a/src/ss7_as.h b/src/ss7_as.h index db219e0..2e7f484 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -86,6 +86,8 @@ struct ss7_as_asp_assoc { /* Entry in (struct osmo_ss7_as*)->assoc_asp_list */ struct llist_head as_entry; + /* Entry in (struct osmo_ss7_asp*)->assoc_as_list */ + struct llist_head asp_entry; struct osmo_ss7_as *as; /* backpointer */ struct osmo_ss7_asp *asp; /* backpointer */ }; diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 5e96519..9b8f164 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -742,6 +742,7 @@ } rate_ctr_group_set_name(asp->ctrg, name); asp->inst = inst; + INIT_LLIST_HEAD(&asp->assoc_as_list); /* ASP in "no shutdown" state by default: */ asp->cfg.adm_state = OSMO_SS7_ASP_ADM_S_ENABLED; ss7_asp_peer_init(&asp->cfg.remote); @@ -769,7 +770,7 @@ void osmo_ss7_asp_destroy(struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as, *as2; + struct ss7_as_asp_assoc *assoc, *assoc2; OSMO_ASSERT(ss7_initialized); LOGPASP(asp, DLSS7, LOGL_INFO, "Destroying ASP\n"); @@ -784,8 +785,8 @@ /* Unlink from all ASs we are part of. * Some RKM-dynamically allocated ASs may be freed as a result from this: */ - llist_for_each_entry_safe(as, as2, &asp->inst->as_list, list) - ss7_as_del_asp(as, asp); + llist_for_each_entry_safe(assoc, assoc2, &asp->assoc_as_list, asp_entry) + ss7_as_del_asp(assoc->as, asp); /* unlink from ss7_instance */ asp->inst = NULL; @@ -1552,13 +1553,12 @@ const struct osmo_ss7_as *excl_as, bool network_byte_order) { unsigned int count = 0; - struct osmo_ss7_as *as; + struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(as, &asp->inst->as_list, list) { + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + struct osmo_ss7_as *as = assoc->as; if (as == excl_as) continue; - if (!osmo_ss7_as_has_asp(as, asp)) - continue; if (as->cfg.routing_key.context == 0) continue; if (count >= rctx_size) @@ -1586,6 +1586,17 @@ return _ss7_asp_get_all_rctx(asp, rctx, rctx_size, excl_as, false); } +/* Get first AS in the ASP, or NULL if no AS associated. + * This is useful for instance in IPA code, where we assume only up to 1 AS is configured per ASP. */ +struct osmo_ss7_as *ss7_asp_get_first_as(const struct osmo_ss7_asp *asp) +{ + struct ss7_as_asp_assoc *assoc; + assoc = llist_first_entry_or_null(&asp->assoc_as_list, struct ss7_as_asp_assoc, asp_entry); + if (!assoc) + return NULL; + return assoc->as; +} + /* determine the osmo_ss7_as_traffic_mode to be used by this ASP; will * iterate over all AS configured for this ASP. If they're compatible, * a single traffic mode is returned as enum osmo_ss7_as_traffic_mode. @@ -1593,12 +1604,11 @@ * configured, -1 is returned */ int ss7_asp_determine_traf_mode(const struct osmo_ss7_asp *asp) { - const struct osmo_ss7_as *as; + const struct ss7_as_asp_assoc *assoc; int tmode = -1; - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + const struct osmo_ss7_as *as = assoc->as; /* we only care about traffic modes explicitly set */ if (!as->cfg.mode_set_by_vty) continue; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 80a0a8a..0d047cb 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -55,6 +55,9 @@ struct osmo_ss7_asp { /*! entry in \ref osmo_ss7_instance.asp_list */ struct llist_head list; + struct llist_head assoc_as_list; /* list of struct ss7_as_asp_assoc */ + unsigned int num_assoc_as; /* amount of ss7_as_asp_assoc/ss7_as in as_list */ + struct osmo_ss7_instance *inst; /*! ASP FSM */ @@ -187,6 +190,7 @@ const struct osmo_ss7_as *excl_as); unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, const struct osmo_ss7_as *excl_as); +struct osmo_ss7_as *ss7_asp_get_first_as(const struct osmo_ss7_asp *asp); int ss7_asp_determine_traf_mode(const struct osmo_ss7_asp *asp); diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 6731398..241863a 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -116,6 +116,24 @@ xua_tx_snm_daud(asp, rctx, num_rctx, &aff_pc, 1, "VTY"); } +static char *as_list_for_asp(const struct osmo_ss7_asp *asp, char *buf, size_t buf_len) +{ + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + const struct ss7_as_asp_assoc *assoc; + unsigned int count = 0; + + if (asp->num_assoc_as == 0) { + OSMO_STRBUF_PRINTF(sb, "?"); + return buf; + } + + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + OSMO_STRBUF_PRINTF(sb, "%s%s", count != 0 ? "," : "", assoc->as->cfg.name); + count++; + } + return buf; +} + DEFUN_ATTR(cs7_asp_audit, cs7_asp_audit_cmd, "cs7 instance <0-15> asp NAME audit point-code POINT_CODE", CS7_STR "Instance related commands\n" "SS7 Instance Number\n" @@ -232,7 +250,6 @@ struct osmo_ss7_instance *inst = vty->index; const char *name = argv[0]; struct osmo_ss7_asp *asp; - struct osmo_ss7_as *as; asp = osmo_ss7_asp_find_by_name(inst, name); if (!asp) { @@ -240,13 +257,12 @@ return CMD_WARNING; } - llist_for_each_entry(as, &inst->as_list, list) { - if (osmo_ss7_as_has_asp(as, asp)) { - vty_out(vty, "%% ASP '%s' currently configured in AS '%s'. " - "You must first remove the ASP from the AS configuration%s", - name, as->cfg.name, VTY_NEWLINE); - return CMD_WARNING; - } + if (asp->num_assoc_as > 0) { + char as_buf[512]; + vty_out(vty, "%% ASP '%s' currently configured in %u AS: '%s'. " + "You must first remove the ASP from the AS configuration%s", + name, asp->num_assoc_as, as_list_for_asp(asp, as_buf, sizeof(as_buf)), VTY_NEWLINE); + return CMD_WARNING; } osmo_ss7_asp_destroy(asp); @@ -871,24 +887,6 @@ } } -static char *as_list_for_asp(const struct osmo_ss7_asp *asp, char *buf, size_t buf_len) -{ - struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; - const struct osmo_ss7_as *as; - unsigned int count = 0; - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - OSMO_STRBUF_PRINTF(sb, "%s%s", count != 0 ? "," : "", as->cfg.name); - count++; - break; - } - - if (count == 0) - OSMO_STRBUF_PRINTF(sb, "?"); - return buf; -} - /* Similar to osmo_sock_multiaddr_get_name_buf(), but aimed at listening sockets (only local part): */ static char *get_sockname_buf(char *buf, size_t buf_len, int fd, int proto, bool local) { diff --git a/src/tcap_as_loadshare.c b/src/tcap_as_loadshare.c index 356a982..9c969d3 100644 --- a/src/tcap_as_loadshare.c +++ b/src/tcap_as_loadshare.c @@ -716,7 +716,11 @@ goto out; } - as = ipa_find_as_for_asp(asp); + /* in the IPA case, we assume there is a 1:1 mapping between the + * ASP and the AS. An AS without ASP means there is no + * connection, and an ASP without AS means that we don't (yet?) + * know the identity of the peer */ + as = ss7_asp_get_first_as(asp); if (!as) { LOGPASP(asp, DLTCAP, LOGL_ERROR, "Rx message for IPA ASP without AS?!\n"); rc = -ENOENT; diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 32986fc..4204e31 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -394,14 +394,10 @@ { struct xua_asp_fsm_priv *xafp = fi->priv; struct osmo_ss7_asp *asp = xafp->asp; - struct osmo_ss7_instance *inst = asp->inst; - struct osmo_ss7_as *as; + struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(as, &inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - osmo_fsm_inst_dispatch(as->fi, event, data); - } + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) + osmo_fsm_inst_dispatch(assoc->as->fi, event, data); } /* check if expected message was received + stop t_ack */ @@ -483,17 +479,14 @@ static void common_asp_fsm_down_onenter(struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as, *as2; - struct osmo_ss7_instance *inst = asp->inst; + struct ss7_as_asp_assoc *assoc, *assoc2; /* First notify all AS associated to the ASP that it went down: */ dispatch_to_all_as(asp->fi, XUA_ASPAS_ASP_DOWN_IND, asp); /* Implicit clean up tasks: */ - llist_for_each_entry_safe(as, as2, &inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - + llist_for_each_entry_safe(assoc, assoc2, &asp->assoc_as_list, asp_entry) { + struct osmo_ss7_as *as = assoc->as; #ifdef WITH_TCAP_LOADSHARING tcap_as_del_asp(as, asp); #endif @@ -702,10 +695,9 @@ if (traf_mode) { /* if the peer has specified a traffic mode at all */ enum osmo_ss7_as_traffic_mode tmode = osmo_ss7_tmode_from_xua(traf_mode); - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - + struct ss7_as_asp_assoc *assoc; + llist_for_each_entry(assoc, &asp->assoc_as_list, asp_entry) { + as = assoc->as; if (!as->cfg.mode_set_by_peer && !as->cfg.mode_set_by_vty) { as->cfg.mode = tmode; LOGPAS(as, DLSS7, LOGL_INFO, @@ -1531,7 +1523,7 @@ { struct osmo_fsm_inst *fi; struct ipa_asp_fsm_priv *iafp; - struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); + struct osmo_ss7_as *as = ss7_asp_get_first_as(asp); const char *unit_name; bool can_start = true; diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 11dd32e..1c8df3e 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -155,21 +155,6 @@ #define ENSURE_SG_OR_IPSP(fi, event) \ ENSURE_ROLE_COND(fi, event, _role == OSMO_SS7_ASP_ROLE_SG || _role == OSMO_SS7_ASP_ROLE_IPSP) -static struct osmo_ss7_as *find_first_as_in_asp(struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - struct ss7_as_asp_assoc *assoc; - llist_for_each_entry(assoc, &as->assoc_asp_list, as_entry) { - if (assoc->asp == asp) - return as; - } - } - - return NULL; -} - /* handle an incoming RKM registration response */ static int handle_reg_conf(struct osmo_fsm_inst *fi, uint32_t l_rk_id, uint32_t rctx) { @@ -358,7 +343,7 @@ lm_fsm_state_chg(fi, S_RKM_REG); prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); OSMO_ASSERT(prim); - as = find_first_as_in_asp(lmp->asp); + as = ss7_asp_get_first_as(lmp->asp); if (!as) { LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); ss7_asp_disconnect_stream(lmp->asp); diff --git a/src/xua_internal.h b/src/xua_internal.h index 81c8a1b..c8ae79f 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -147,7 +147,6 @@ struct msgb *ipa_to_msg(struct xua_msg *xua); int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); -struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp); int osmo_isup_party_parse(char *out_digits, const uint8_t *in, unsigned int in_num_bytes, bool odd); diff --git a/src/xua_shared.c b/src/xua_shared.c index 022b8ed..0fa94c4 100644 --- a/src/xua_shared.c +++ b/src/xua_shared.c @@ -39,23 +39,6 @@ #include "ss7_internal.h" #include "xua_internal.h" -/* if given ASP only has one AS, return that AS */ -static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp *asp) -{ - struct osmo_ss7_as *as, *as_found = NULL; - - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - /* check if we already had found another AS within this ASP -> not unique */ - if (as_found) - return NULL; - as_found = as; - } - - return as_found; -} - /* this is why we can use the M3UA constants below in a function shared between M3UA + SUA */ osmo_static_assert(M3UA_ERR_INVAL_ROUT_CTX == SUA_ERR_INVAL_ROUT_CTX, _err_rctx); osmo_static_assert(M3UA_ERR_NO_CONFGD_AS_FOR_ASP == SUA_ERR_NO_CONFGD_AS_FOR_ASP, _err_as_for_asp); @@ -94,13 +77,13 @@ } } else { /* no explicit routing context; this only works if there is only one AS in the ASP */ - *as = find_single_as_for_asp(asp); - if (!*as) { + if (asp->num_assoc_as != 1) { LOGPASP(asp, log_ss, LOGL_ERROR, "%s(): ASP sent M3UA without Routing Context IE but unable to uniquely " "identify the AS for this message\n", __func__); return M3UA_ERR_INVAL_ROUT_CTX; } + *as = ss7_asp_get_first_as(asp); } return 0; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 61cbd66..72eb0de 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -657,7 +657,7 @@ No ASP named 'unknown-asp' found OsmoSTP(config-cs7)# no asp my-asp -% ASP 'my-asp' currently configured in AS 'my-ass'. You must first remove the ASP from the AS configuration +% ASP 'my-asp' currently configured in 1 AS: 'my-ass'. You must first remove the ASP from the AS configuration OsmoSTP(config-cs7)# as my-ass m3ua OsmoSTP(config-cs7-as)# no asp my-asp OsmoSTP(config-cs7-as)# exit diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 0cd0c39..1ff4e36 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -502,7 +502,7 @@ No ASP named 'unknown-asp' found ss7_asp_vty_test(config-cs7)# no asp my-asp -% ASP 'my-asp' currently configured in AS 'my-ass'. You must first remove the ASP from the AS configuration +% ASP 'my-asp' currently configured in 1 AS: 'my-ass'. You must first remove the ASP from the AS configuration ss7_asp_vty_test(config-cs7)# as my-ass m3ua ss7_asp_vty_test(config-cs7-as)# no asp my-asp ss7_asp_vty_test(config-cs7-as)# exit -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42111?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: I1ca90748286374109dbb4277cbc7b2337ce2072a Gerrit-Change-Number: 42111 Gerrit-PatchSet: 5 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>

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix missing break in m3a_rx_snm for IPSP
by pespin 16 Feb '26

16 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?usp=email ) Change subject: m3ua: Fix missing break in m3a_rx_snm for IPSP ...................................................................... m3ua: Fix missing break in m3a_rx_snm for IPSP Related: Coverity CID#557519 Fixes: e597f08dde51361434a027dc4362a5698220afb6 Change-Id: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 --- M src/m3ua.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 93659c7..3980bd3 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -1197,6 +1197,7 @@ break; case OSMO_SS7_ASP_ROLE_IPSP: rc = m3ua_rx_snm_ipsp(asp, xua); + break; default: rc = M3UA_ERR_UNSUPP_MSG_CLASS; break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?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: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 Gerrit-Change-Number: 42124 Gerrit-PatchSet: 2 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>

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix missing break in m3a_rx_snm for IPSP
by pespin 16 Feb '26

16 Feb '26

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?usp=email ) Change subject: m3ua: Fix missing break in m3a_rx_snm for IPSP ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: ack, I actually forgot to put it. I added it and will merge. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?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: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 Gerrit-Change-Number: 42124 Gerrit-PatchSet: 2 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:52:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix missing break in m3a_rx_snm for IPSP
by pespin 16 Feb '26

16 Feb '26

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by laforge The change is no longer submittable: Code-Review is unsatisfied now. Change subject: m3ua: Fix missing break in m3a_rx_snm for IPSP ...................................................................... m3ua: Fix missing break in m3a_rx_snm for IPSP Related: Coverity CID#557519 Fixes: e597f08dde51361434a027dc4362a5698220afb6 Change-Id: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 --- M src/m3ua.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/24/42124/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 Gerrit-Change-Number: 42124 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-pfcp[master]: cp_peer: Implement local originated heartbeat procedure
by pespin 16 Feb '26

16 Feb '26

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/42120?usp=email ) Change subject: cp_peer: Implement local originated heartbeat procedure ...................................................................... Patch Set 1: (1 comment) File src/libosmo-pfcp/pfcp_cp_peer.c: https://gerrit.osmocom.org/c/libosmo-pfcp/+/42120/comment/86dd2496_18114569… : PS1, Line 112: unsigned int tval_rx_heartbeat_s = : osmo_tdef_get(cp_peer->ep->cfg.tdefs, OSMO_PFCP_TIMER_HEARTBEAT_RESP, OSMO_TDEF_S, -1); : o > I understand that the user can configure the HB interval and response timeout separately - this is f […] Yes, because you are expected to set "HB response timeout" to be > "HB interval". The tval_rx_heartbeat_s is expected to be set so that it waits up to N Heartbeat Requests lost/non-answered when it triggers. So usually you'd set eg. tval_tx_heartbeat_s=3, tval_rx_heartbeat_s=10 to trigger after 3 hearbeat request went unanswered. Unfortunately the PFCP spec doesn't really provide detailed information on how the Heartbeat procedure is supposed to figure out assoc timeout, so we are basically doing something similar to what is done iirc in GTP here. What I realize now is that the values set by default in the tdef are both 15s for both tval_tx_heartbeat_s and tval_rx_heartbeat_s, which may be too tight. I'll update tval_rx_heartbeat_s to 25 or so. This values were not used so far since this feature was not implemented, and value "15s" doesn't really show up in the spec in any way afaict. -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/42120?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I7efc0961e1ea39dd7f4cc6ba96be4cf5ce9a2d6c Gerrit-Change-Number: 42120 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:50:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: Introduce struct osmo_ss7_as_asp_assoc
by osmith 16 Feb '26

16 Feb '26

Attention is currently required from: daniel, fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?usp=email ) Change subject: Introduce struct osmo_ss7_as_asp_assoc ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?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: I149ab467899633ac50cba3e482b2cae02124279d Gerrit-Change-Number: 42105 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:44:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in libosmo-sigtran[master]: Introduce struct osmo_ss7_as_asp_assoc
by laforge 16 Feb '26

16 Feb '26

Attention is currently required from: daniel, fixeria, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?usp=email ) Change subject: Introduce struct osmo_ss7_as_asp_assoc ...................................................................... Patch Set 4: (1 comment) File src/ss7_as.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105/comment/840882a2_6d8af… : PS3, Line 61: if (!as) > ack, this should be !assoc :) Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?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: I149ab467899633ac50cba3e482b2cae02124279d Gerrit-Change-Number: 42105 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:41:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: Introduce struct osmo_ss7_as_asp_assoc
by laforge 16 Feb '26

16 Feb '26

Attention is currently required from: daniel, fixeria, osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?usp=email ) Change subject: Introduce struct osmo_ss7_as_asp_assoc ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Patchset: PS1: > See also follow-up patch https://gerrit.osmocom. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42105?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: I149ab467899633ac50cba3e482b2cae02124279d Gerrit-Change-Number: 42105 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:40:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix missing break in m3a_rx_snm for IPSP
by laforge 16 Feb '26

16 Feb '26

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?usp=email ) Change subject: m3ua: Fix missing break in m3a_rx_snm for IPSP ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: We usually put a Fixes: CID#... in the comit log, but not critical here -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/42124?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: I387794b0a736ee8419e7d12dc0f586aa30b9ac26 Gerrit-Change-Number: 42124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Feb 2026 10:38:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log February 2026