- gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: WIP
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41400?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I567ed206eab1add21836bfd937f3790d3d7a00d7 --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/41400/1 diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 2ba7af8..f24395a 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -628,6 +628,7 @@ return 0; } +#if 0 /* Obtain SS7 application server currently handling given MSC (DPC) */ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { @@ -642,9 +643,11 @@ return NULL; return as; } +#endif int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg) { +#if 0 struct osmo_ss7_as *as; struct osmo_ss7_asp *asp; @@ -667,6 +670,24 @@ return -1; } return osmo_ss7_asp_send(asp, msg); +#endif + + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(msc->a.sccp); + struct osmo_mtp_prim *omp; + struct osmo_mtp_transfer_param *param; + + /* 2) wrap into MTP-TRANSFER.req primitive */ + msg->l2h = msg->data; + omp = (struct osmo_mtp_prim *) msgb_push(msg, sizeof(*omp)); + osmo_prim_init(&omp->oph, MTP_SAP_USER, OSMO_MTP_PRIM_TRANSFER, PRIM_OP_REQUEST, msg); + param = &omp->u.transfer; + param->opc = s7i->cfg.primary_pc; + param->dpc = msc->a.msc_addr.pc; + param->sls = 0; + param->sio = MTP_SIO(MTP_SI_SCCP, s7i->cfg.network_indicator); + + /* 3) send via MTP-SAP (osmo_ss7_instance) */ + return osmo_ss7_user_mtp_xfer_req(s7i, omp); } /* Encode a CTRL command and send it to the given ASP -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41400?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I567ed206eab1add21836bfd937f3790d3d7a00d7 Gerrit-Change-Number: 41400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)()
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email ) Change subject: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)() ...................................................................... Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)() This is a step further into the transition of having most of the ipa protocol code in libosmo-netif. Also, the osmo_ipa_msg_push_headers() is easier to understand than having 2 API calls prepending 2 headers. Change-Id: Ic0391ad664c43ea52837e42cea0cc0b82dd961ab --- M src/ipaccess/ipaccess-config-e1-driver.c M src/osmo-bsc/bsc_ctrl.c M src/osmo-bsc/osmo_bsc_mgcp.c 3 files changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/41401/1 diff --git a/src/ipaccess/ipaccess-config-e1-driver.c b/src/ipaccess/ipaccess-config-e1-driver.c index 17a5dde..631e430 100644 --- a/src/ipaccess/ipaccess-config-e1-driver.c +++ b/src/ipaccess/ipaccess-config-e1-driver.c @@ -179,8 +179,8 @@ return -EINVAL; } - msg->l2h = msg->data; - ipa_prepend_header(msg, sign_link->tei); + /* msg->l2h is set here: */ + osmo_ipa_msg_push_header(msg, sign_link->tei); LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX: %s\n", osmo_hexdump(msg->l2h, msgb_l2len(msg))); osmo_stream_cli_send(cli, msg); @@ -213,7 +213,7 @@ if (!nmsg2) return NULL; msgb_v_put(nmsg2, IPAC_MSGT_ID_ACK); - ipa_prepend_header(nmsg2, IPAC_PROTO_IPACCESS); + osmo_ipa_msg_push_header(nmsg2, IPAC_PROTO_IPACCESS); return nmsg2; } diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index f24395a..1efeeaf 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -710,9 +710,7 @@ if (!msg) return -1; - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); - ipa_prepend_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, IPAC_PROTO_OSMO, IPAC_PROTO_EXT_CTRL); return osmo_ss7_asp_send(asp, msg); } @@ -726,9 +724,7 @@ if (!msg) return -1; - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); - ipa_prepend_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, IPAC_PROTO_OSMO, IPAC_PROTO_EXT_CTRL); return bsc_sccplite_msc_send(msc, msg); } diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index 4114cc3..978ff8c 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -195,6 +195,6 @@ msg->l2h[rc] = '\0'; LOGP(DMSC, LOGL_NOTICE, "Received MGCP on UDP proxy socket: %s\n", msg->l2h); - ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD); + osmo_ipa_msg_push_header(msg, IPAC_PROTO_MGCP_OLD); return bsc_sccplite_msc_send(msc, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0391ad664c43ea52837e42cea0cc0b82dd961ab Gerrit-Change-Number: 41401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: mobile app: Indicate ER-GSM band support in MS classmark 3
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email ) Change subject: mobile app: Indicate ER-GSM band support in MS classmark 3 ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica13814eddb5293c7d7a2a21dd6a7a437cd1d351 Gerrit-Change-Number: 41360 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Nov 2025 17:02:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmocom-bb[master]: Add ER-GSM band support to all relevant applications
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email ) Change subject: Add ER-GSM band support to all relevant applications ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41359?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I71baa3317df685cf6479b6e20e6ae078911aa24f Gerrit-Change-Number: 41359 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Nov 2025 17:01:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmocom-bb[master]: gsm/gsm_utils: Support the ER-GSM band (ARFCN 940..954)
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: jolly. fixeria has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmocom-bb/+/41392?usp=email ) Change subject: gsm/gsm_utils: Support the ER-GSM band (ARFCN 940..954) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/41392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2fbddc523e72c6d6134e8a9d8132ad58266ce0db Gerrit-Change-Number: 41392 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 11 Nov 2025 16:58:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: cosmetic: mtp.h: improve and fix wrong spec reference
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41399?usp=email ) Change subject: cosmetic: mtp.h: improve and fix wrong spec reference ...................................................................... cosmetic: mtp.h: improve and fix wrong spec reference Change-Id: I98d3a03138812827725fecd5e093ac8f917d7a8c --- M include/osmocom/sigtran/protocol/mtp.h 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/99/41399/1 diff --git a/include/osmocom/sigtran/protocol/mtp.h b/include/osmocom/sigtran/protocol/mtp.h index 4542289..9654a66 100644 --- a/include/osmocom/sigtran/protocol/mtp.h +++ b/include/osmocom/sigtran/protocol/mtp.h @@ -2,8 +2,9 @@ #include <osmocom/core/utils.h> -/* Chapter 15.17.4 of Q.704 + RFC4666 3.4.5. */ -/* Section 5.1 of ETSI EG 201 693: MTP SI code allocations (for NI= 00) */ +/* Q.704 14.2.1, RFC4666 3.4.5. + * ETSI EG 201 693 Section 5.1: MTP SI code allocations (for NI=00 (international network) only) + */ enum mtp_si_ni00 { MTP_SI_SNM = 0, MTP_SI_STM = 1, @@ -24,13 +25,13 @@ extern const struct value_string mtp_si_vals[]; -/* Chapter 15.17.5 of Q.704 */ +/* Q.704 15.17.5 */ enum mtp_unavail_cause { MTP_UNAVAIL_C_UNKNOWN = 0x0, MTP_UNAVAIL_C_UNEQUIP_REM_USER = 0x1, MTP_UNAVAIL_C_INACC_REM_USER = 0x2, /* This field is not explicitly listed in Q.704 15.17.5, but it is - * expicitly described as one of four options in: + * explicitly described as one of four options in: * Q.701 "TABLE 1" and 8.4 * Q.704 2.4.2 * Q.711 "Table 18" and 7.2.4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41399?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I98d3a03138812827725fecd5e093ac8f917d7a8c Gerrit-Change-Number: 41399 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: sccplite: Avoid msgb_free() during ss7 rx_unknown_cb()
by pespin 11 Nov '25

11 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41398?usp=email ) Change subject: sccplite: Avoid msgb_free() during ss7 rx_unknown_cb() ...................................................................... sccplite: Avoid msgb_free() during ss7 rx_unknown_cb() Since its original addition, API osmo_ss7_register_rx_unknown_cb() states that the msgb is owned by the caller. Hence, osmo-bsc shall not free the msgb. Older versions of libosmo-sigtran (before f16fdf58059b2dea8e940c45c11779c7d4634c3f) had a buggy implementation and actually leaked the msgb. Related: SYS#6876 Change-Id: I0ce97e3e5a8399d401750dd67494cfd5cf2108e5 --- M TODO-RELEASE M src/osmo-bsc/bsc_ctrl.c M src/osmo-bsc/osmo_bsc_mgcp.c M src/osmo-bsc/osmo_bsc_sigtran.c 4 files changed, 12 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0eae0e8..400e0e0 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmo-mgcp-client bump_dep Depend on I0d58e6d84418f50670c8ab7cf8490af3bc2f5c26 libosmo-sigtran >2.1.0 osmo_sccp_addr_{create,update}() +libosmo-sigtran minor_release>2.1.0 Avoid leaking msgb during asp_rx_unknown() diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 931a8ae..2ba7af8 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -712,7 +712,7 @@ } /* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link. - * Transfers msg ownership. */ + * msg is owned by the caller. */ int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) { struct ctrl_cmd *cmd; @@ -725,7 +725,6 @@ /* prase raw (ASCII) CTRL command into ctrl_cmd */ cmd = ctrl_cmd_parse3(asp, msg, &parse_failed); OSMO_ASSERT(cmd); - msgb_free(msg); if (cmd->type == CTRL_TYPE_ERROR && parse_failed) goto send_reply; diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index d7de4d2..4114cc3 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -91,7 +91,7 @@ return 0; } -/* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg ownership. */ +/* We received an IPA-encapsulated MGCP message from a MSC. msg owned by caller. */ int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg) { struct bsc_msc_data *msc; @@ -107,16 +107,14 @@ osmo_ss7_asp_get_name(asp), msg->l2h); msc = msc_from_asp(asp); - if (!msc) { - rc = 0; - goto free_msg_ret; - } + if (!msc) + return 0; rc = parse_local_endpoint_name(rcv_ep_local_name, sizeof(rcv_ep_local_name), (const char *)msg->l2h); if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse CIC\n", osmo_ss7_asp_get_name(asp)); - goto free_msg_ret; + return rc; } /* Lookup which conn attached to the MSC holds an MGW endpoint with the @@ -145,8 +143,7 @@ if (!mgcp_cli) { LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to find associated MGW\n", osmo_ss7_asp_get_name(asp)); - rc = 0; - goto free_msg_ret; + return 0; } rc = osmo_sockaddr_str_from_str(&osa_str, mgcp_client_remote_addr_str(mgcp_cli), @@ -154,7 +151,7 @@ if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address %s:%u\n", osmo_ss7_asp_get_name(asp), mgcp_client_remote_addr_str(mgcp_cli), mgcp_client_remote_port(mgcp_cli)); - goto free_msg_ret; + return rc; } LOGP(DMSC, LOGL_NOTICE, "%s: Forwarding IPA-encapsulated MGCP to MGW at " OSMO_SOCKADDR_STR_FMT "\n", @@ -164,7 +161,7 @@ if (rc < 0) { LOGP(DMSC, LOGL_ERROR, "(%s:) Received IPA-encapsulated MGCP: Failed to parse MGCP address " OSMO_SOCKADDR_STR_FMT "\n", osmo_ss7_asp_get_name(asp), OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL(&osa_str)); - goto free_msg_ret; + return rc; } dest_len = osmo_sockaddr_size(&osa); @@ -172,8 +169,6 @@ * to be large enough to deal with whatever small/infrequent MGCP messages */ rc = sendto(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0, &osa.u.sa, dest_len); -free_msg_ret: - msgb_free(msg); return rc; } diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 88174cc..cc6ac5e 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -792,13 +792,12 @@ } /* this function receives all messages received on an ASP for a PPID / StreamID that - * libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP */ + * libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP. + * msg is owned by the caller, ie. ownership is not transferred to this callback. */ static int asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg) { - if (osmo_ss7_asp_get_proto(asp) != OSMO_SS7_ASP_PROT_IPA) { - msgb_free(msg); + if (osmo_ss7_asp_get_proto(asp) != OSMO_SS7_ASP_PROT_IPA) return 0; - } switch (ppid_mux) { case IPAC_PROTO_OSMO: @@ -814,6 +813,5 @@ default: break; } - msgb_free(msg); return 0; /* OSMO_SS7_UNKNOWN? */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0ce97e3e5a8399d401750dd67494cfd5cf2108e5 Gerrit-Change-Number: 41398 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua,tcp-m3ua: Unify Rx code paths to deduplicate code
by pespin 11 Nov '25

11 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41397?usp=email ) Change subject: xua,tcp-m3ua: Unify Rx code paths to deduplicate code ...................................................................... xua,tcp-m3ua: Unify Rx code paths to deduplicate code This also makes those protocol paths resembles more the one of IPA, where we call rx_ipa_msg() to handle the msgb. m3ua_tcp_cli_read_cb() is also modified to avoid going through the SCTP read_cb, which doesn't make much sense. Change-Id: I54cf6c9b8c27fd67bae74d7931745f140e0575c0 --- M src/ss7_asp.c 1 file changed, 48 insertions(+), 43 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 23c0737..f3476ea 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1057,12 +1057,41 @@ return rc; } +static int xua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + unsigned int ppid = msgb_sctp_ppid(msg); + int rc; + + if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) + rc = sua_rx_msg(asp, msg); + else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) + rc = m3ua_rx_msg(asp, msg); + else + rc = ss7_asp_rx_unknown(asp, ppid, msg); + return rc; +} + +static int m3ua_tcp_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + const struct xua_common_hdr *hdr = (const struct xua_common_hdr *) msg->data; + + /* spoof SCTP PPID */ + msgb_sctp_ppid(msg) = M3UA_PPID; + + /* spoof SCTP Stream ID */ + if (hdr->msg_class == M3UA_MSGC_XFER) + msgb_sctp_stream(msg) = 1; + else + msgb_sctp_stream(msg) = 0; + + return m3ua_rx_msg(asp, msg); +} + /* netif code tells us we can read something from the socket */ int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); - unsigned int ppid; int flags; int rc = 0; @@ -1101,17 +1130,9 @@ return rc; } - ppid = msgb_sctp_ppid(msg); msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) - rc = sua_rx_msg(asp, msg); - else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) - rc = m3ua_rx_msg(asp, msg); - else - rc = ss7_asp_rx_unknown(asp, ppid, msg); - + rc = xua_rx_msg(asp, msg); msgb_free(msg); return rc; } @@ -1135,7 +1156,6 @@ { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); - const struct xua_common_hdr *hdr; int rc; /* Reparent msg to srv_link, to avoid "msg" being automatically freed if @@ -1157,17 +1177,8 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *)msg->data; - if (hdr->msg_class == M3UA_MSGC_XFER) - msgb_sctp_stream(msg) = 1; - else - msgb_sctp_stream(msg) = 0; - - rc = m3ua_rx_msg(asp, msg); + rc = m3ua_tcp_rx_msg(asp, msg); msgb_free(msg); - return rc; } @@ -1264,25 +1275,28 @@ /* read call-back for M3UA-over-TCP socket */ static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { - const struct xua_common_hdr *hdr; + struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + int rc = 0; - /* spoof SCTP PPID */ - msgb_sctp_ppid(msg) = M3UA_PPID; + if (res < 0) { + xua_cli_close_and_reconnect(conn); + goto out; + } else if (res == 0) { + xua_cli_close_and_reconnect(conn); + goto out; + } - /* spoof SCTP Stream ID */ - hdr = (const struct xua_common_hdr *) msg->data; - if (hdr->msg_class == M3UA_MSGC_XFER) - msgb_sctp_stream(msg) = 1; - else - msgb_sctp_stream(msg) = 0; - - return xua_cli_read_cb(conn, res, msg); + msg->dst = asp; + rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); + rc = m3ua_tcp_rx_msg(asp, msg); +out: + msgb_free(msg); + return rc; } static int xua_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - unsigned int ppid; int flags; int rc = 0; @@ -1313,21 +1327,12 @@ goto out; } else if (res == 0) { xua_cli_close_and_reconnect(conn); - goto out; } - ppid = msgb_sctp_ppid(msg); msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - - if (ppid == SUA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_SUA) - rc = sua_rx_msg(asp, msg); - else if (ppid == M3UA_PPID && asp->cfg.proto == OSMO_SS7_ASP_PROT_M3UA) - rc = m3ua_rx_msg(asp, msg); - else - rc = ss7_asp_rx_unknown(asp, ppid, msg); - + rc = xua_rx_msg(asp, msg); out: msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41397?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: I54cf6c9b8c27fd67bae74d7931745f140e0575c0 Gerrit-Change-Number: 41397 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 0

[M] Change in libosmo-sigtran[master]: ipa: Clarify msgb_free in ipa_rx_msg()
by pespin 11 Nov '25

11 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?usp=email ) Change subject: ipa: Clarify msgb_free in ipa_rx_msg() ...................................................................... ipa: Clarify msgb_free in ipa_rx_msg() First of all, clean up and clarify the handling of msgb in ipa_rx_msg_sccp() by always freeing the patched msgb copy, and letting parent function free the original received msgb. This in turn allows moving the msgb_free() of the received msg to ipa_cli_read_cb() and ss7_asp_ipa_srv_conn_rx_cb(), which is where the msgb is allocated, and makes the msgb lifecycle far more easy to understand. This is also what's already done in the xua_cli_read_cb()/ss7_asp_xua_srv_conn_rx_cb(). This way we have similar code paths in xua and ipa. Related: OS#6876 Change-Id: Id29955182d9da47165ee9a2d7777b92fb87844b9 --- M src/ipa.c M src/ss7_asp.c 2 files changed, 26 insertions(+), 25 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/ipa.c b/src/ipa.c index 3b2b6da..c748f22 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -149,8 +149,6 @@ rc = -1; } - msgb_free(msg); - return rc; } @@ -171,7 +169,7 @@ } /* Patch a SCCP message and add point codes to Called/Calling Party (if missing) */ -static struct msgb *patch_sccp_with_pc(struct osmo_ss7_asp *asp, struct msgb *sccp_msg_in, +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) { struct osmo_sccp_addr addr; @@ -184,11 +182,8 @@ if (!sua) { LOGPASP(asp, DLSS7, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n", msgb_hexdump(sccp_msg_in)); - msgb_free(sccp_msg_in); return NULL; } - /* free the input message and work with SUA version instead */ - msgb_free(sccp_msg_in); rc = sua_addr_parse(&addr, sua, SUA_IEI_DEST_ADDR); switch (rc) { @@ -238,13 +233,12 @@ { int rc; struct m3ua_data_hdr data_hdr; - struct xua_msg *xua; + struct xua_msg *xua = NULL; struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); uint32_t opc, dpc; if (!as) { LOGPASP(asp, DLSS7, LOGL_ERROR, "Rx message for IPA ASP without AS?!\n"); - msgb_free(msg); return -1; } @@ -302,25 +296,27 @@ dpc = as->cfg.pc_override.dpc; } - /* Second, patch this into the SCCP message */ - if (as->cfg.pc_override.sccp_mode == OSMO_SS7_PATCH_BOTH) { - msg = patch_sccp_with_pc(asp, msg, opc, dpc); - if (!msg) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n"); - return -1; - } - } - - /* Third, create a MTP3/M3UA label with those point codes */ + /* Second, create a MTP3/M3UA label with those point codes */ memset(&data_hdr, 0, sizeof(data_hdr)); data_hdr.si = MTP_SI_SCCP; data_hdr.opc = osmo_htonl(opc); data_hdr.dpc = osmo_htonl(dpc); data_hdr.sls = sls; data_hdr.ni = as->inst->cfg.network_indicator; - /* Create M3UA message in XUA structure */ - xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); - msgb_free(msg); + + /* Third, patch this into the SCCP message and create M3UA message in XUA structure */ + if (as->cfg.pc_override.sccp_mode == OSMO_SS7_PATCH_BOTH) { + struct msgb *msg_patched = patch_sccp_with_pc(asp, msg, opc, dpc); + if (!msg_patched) { + LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to patch PC into SCCP message; dropping\n"); + return -1; + } + xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg_patched), msgb_l2len(msg_patched)); + msgb_free(msg_patched); + } else { + xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); + } + /* Update xua->mtp with values from data_hdr */ m3ua_dh_to_xfer_param(&xua->mtp, &data_hdr); @@ -332,7 +328,7 @@ /*! \brief process M3UA message received from socket * \param[in] asp Application Server Process receiving \a msg - * \param[in] msg received message buffer. Callee takes ownership! + * \param[in] msg received message buffer. It is kept owned by the caller. * \param[in] sls The SLS (signaling link selector) field to use in the generated M3UA header * \returns 0 on success; negative on error */ int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) @@ -355,7 +351,6 @@ break; default: rc = ss7_asp_rx_unknown(asp, hh->proto, msg); - msgb_free(msg); } return rc; diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 7b819de..23c0737 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1031,6 +1031,7 @@ { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct osmo_stream_srv_link *link = osmo_stream_srv_get_master(conn); + int rc; /* Reparent msg to srv_link, to avoid "msg" being automatically freed if * "conn" is teared down during msg handling (or if its associated @@ -1051,7 +1052,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, asp->ipa.sls); + rc = ipa_rx_msg(asp, msg, asp->ipa.sls); + msgb_free(msg); + return rc; } /* netif code tells us we can read something from the socket */ @@ -1239,6 +1242,7 @@ static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); + int rc; if (res <= 0) { if (res == -EAGAIN) { @@ -1252,7 +1256,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, asp->ipa.sls); + rc = ipa_rx_msg(asp, msg, asp->ipa.sls); + msgb_free(msg); + return rc; } /* read call-back for M3UA-over-TCP socket */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41396?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: Id29955182d9da47165ee9a2d7777b92fb87844b9 Gerrit-Change-Number: 41396 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 0

[S] Change in osmo-bsc[master]: sccplite: Avoid msgb_free() during ss7 rx_unknown_cb()
by pespin 11 Nov '25

11 Nov '25

Attention is currently required from: fixeria, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41398?usp=email ) Change subject: sccplite: Avoid msgb_free() during ss7 rx_unknown_cb() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0ce97e3e5a8399d401750dd67494cfd5cf2108e5 Gerrit-Change-Number: 41398 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 11 Nov 2025 13:47:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log