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

[M] Change in libosmo-sigtran[master]: mtp: Support MTP-TRANSFER.req/ind of raw IPA messages
by pespin 14 Nov '25

14 Nov '25

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41410?usp=email ) Change subject: mtp: Support MTP-TRANSFER.req/ind of raw IPA messages ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41410?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: I9fedb26ccd3434fc7f272feb3c45cf4bdb80c7ae Gerrit-Change-Number: 41410 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 14 Nov 2025 18:24:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in libosmo-sigtran[master]: ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb()
by pespin 14 Nov '25

14 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41432?usp=email ) Change subject: ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb() ...................................................................... ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb() We migrated to using osmo_io+osmo_stream with osmo_ipa_segmentation_cb(), which takes care of pulling the multiple IPA headers and stores them in osmo_ipa_msgb_cb_proto(_ext)(). When doing the change, we forgot to update the rx path in ipa.c to account for those changes. Do it now to simplify the code and clarify that l1h was actually pulled from ->data. Change-Id: I4e26bf471de9a258dc2f862488253f31aa95a013 --- M src/ipa.c 1 file changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/32/41432/1 diff --git a/src/ipa.c b/src/ipa.c index c748f22..4c197ff 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -246,9 +246,6 @@ OSMO_ASSERT(sls <= 0xf); rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_SLS_0 + sls); - /* pull the IPA header */ - msgb_pull_to_l2(msg); - /* We have received an IPA-encapsulated SCCP message, without * any MTP routing label. Furthermore, the SCCP Called/Calling * Party are SSN-only, with no GT or PC. This means we have no @@ -311,10 +308,10 @@ 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)); + xua = m3ua_xfer_from_data(&data_hdr, msgb_data(msg_patched), msgb_length(msg_patched)); msgb_free(msg_patched); } else { - xua = m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); + xua = m3ua_xfer_from_data(&data_hdr, msgb_data(msg), msgb_length(msg)); } /* Update xua->mtp with values from data_hdr */ @@ -333,16 +330,15 @@ * \returns 0 on success; negative on error */ int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls) { - struct ipaccess_head *hh; int rc; OSMO_ASSERT(asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA); - /* osmo_ipa_process_msg() will already have verified length - * consistency and set up l2h pointer */ - hh = (struct ipaccess_head *) msg->l1h; + /* Here IPA headers have already been validated and were stored in + * osmo_ipa_msgb_cb_proto(_ext)(), and msgb_data() and msgb_l2() both + * point to IPA payload. */ - switch (hh->proto) { + switch (osmo_ipa_msgb_cb_proto(msg)) { case IPAC_PROTO_IPACCESS: rc = ipa_rx_msg_ccm(asp, msg); break; @@ -350,7 +346,7 @@ rc = ipa_rx_msg_sccp(asp, msg, sls); break; default: - rc = ss7_asp_rx_unknown(asp, hh->proto, msg); + rc = ss7_asp_rx_unknown(asp, osmo_ipa_msgb_cb_proto(msg), msg); } return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41432?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: I4e26bf471de9a258dc2f862488253f31aa95a013 Gerrit-Change-Number: 41432 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: mtp: Introduce osmo_ss7_user_find_by_si() public API
by pespin 14 Nov '25

14 Nov '25

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41429?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mtp: Introduce osmo_ss7_user_find_by_si() public API ...................................................................... mtp: Introduce osmo_ss7_user_find_by_si() public API This is needed by mtp_sap/ss7_user API users to figure out whether there's a user set up already for a given Service Indicator. Change-Id: I7db659dc443148f3aab70d2c6229c2271346cf38 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/ss7_hmrt.c M src/ss7_user.c M src/ss7_user.h M src/xua_snm.c 6 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/29/41429/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41429?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: I7db659dc443148f3aab70d2c6229c2271346cf38 Gerrit-Change-Number: 41429 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: mtp: Introduce mtp_prim_* API helpers
by pespin 14 Nov '25

14 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41417?usp=email ) Change subject: mtp: Introduce mtp_prim_* API helpers ...................................................................... mtp: Introduce mtp_prim_* API helpers This allows keeping more API related packing inside mtp_sap.c, as well as provide public API to be able to submit a MTP-TRANSFER.req from outside of the library (which will be used by osmo-bsc to submit MGCP/CTRL over IPA in SCCPLite). Change-Id: I4af154a65b8c23b9e8647845337ad1b5aa3901aa --- M TODO-RELEASE M include/osmocom/sigtran/mtp_sap.h M src/mtp_sap.c M src/sccp_scrc.c M src/ss7_hmrt.c M src/ss7_user.h 6 files changed, 55 insertions(+), 19 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index dd3b333..28aed5b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmo-sigtran add enum mtp_network_indicator, mtp_network_indicator_vals libosmo-sigtran add osmo_ss7_instance_get_network_indicator() libosmo-sigtran add osmo_ss7_user_mtp_sap_prim_down() +libosmo-sigtran add osmo_mtp_prim_xfer_req_prepend() diff --git a/include/osmocom/sigtran/mtp_sap.h b/include/osmocom/sigtran/mtp_sap.h index 590e0ab..4cc280d 100644 --- a/include/osmocom/sigtran/mtp_sap.h +++ b/include/osmocom/sigtran/mtp_sap.h @@ -72,3 +72,6 @@ #define msgb_mtp_prim(msg) ((struct osmo_mtp_prim *)(msg)->l1h) char *osmo_mtp_prim_name(const struct osmo_prim_hdr *oph); + +struct osmo_mtp_prim *osmo_mtp_prim_xfer_req_prepend(const struct osmo_mtp_transfer_param *param, + struct msgb *msg); diff --git a/src/mtp_sap.c b/src/mtp_sap.c index cef0497..d3656bc 100644 --- a/src/mtp_sap.c +++ b/src/mtp_sap.c @@ -62,6 +62,47 @@ return prim_name_buf; } +struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, + const uint8_t *user_data, size_t user_data_len) +{ + struct osmo_mtp_prim *prim; + struct msgb *upmsg = m3ua_msgb_alloc("M3UA MTP-TRANSFER.ind"); + + OSMO_ASSERT(upmsg); + prim = (struct osmo_mtp_prim *) msgb_put(upmsg, sizeof(*prim)); + + /* Allow filling in params later: */ + if (param) + prim->u.transfer = *param; + + osmo_prim_init(&prim->oph, MTP_SAP_USER, + OSMO_MTP_PRIM_TRANSFER, + PRIM_OP_INDICATION, upmsg); + /* copy data */ + upmsg->l2h = msgb_put(upmsg, user_data_len); + memcpy(upmsg->l2h, user_data, user_data_len); + + return prim; +} + +/*! \brief Wrap MTP payload into an MTP-TRANSFER.req primitive + * \param[in] param MTP-TRANSFER.req params to copy to the primitive (Optional, can be NULL) + * \param[in] msg msgb containing MTP payload and where primitive will be prepended + * \returns return MTP-TRANSFER.req prepended to msgb + */ +struct osmo_mtp_prim *osmo_mtp_prim_xfer_req_prepend(const struct osmo_mtp_transfer_param *param, struct msgb *msg) +{ + struct osmo_mtp_prim *omp; + + 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); + if (param) + omp->u.transfer = *param; + return omp; +} + /*! \brief Send a MTP SAP Primitive up to the MTP User * \param[in] osu MTP User to whom to send the primitive * \param[in] prim Primitive to send to the user diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 9cf71a3..92f7818 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -114,10 +114,7 @@ } /* 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); + omp = osmo_mtp_prim_xfer_req_prepend(NULL, msg); param = &omp->u.transfer; if (sua->mtp.opc) param->opc = sua->mtp.opc; diff --git a/src/ss7_hmrt.c b/src/ss7_hmrt.c index b915481..81a56a8 100644 --- a/src/ss7_hmrt.c +++ b/src/ss7_hmrt.c @@ -46,30 +46,20 @@ /* convert from M3UA message to MTP-TRANSFER.ind osmo_mtp_prim */ static struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua) { - struct osmo_mtp_prim *prim; - struct osmo_mtp_transfer_param *param; struct xua_msg_part *data_ie = xua_msg_find_tag(xua, M3UA_IEI_PROT_DATA); + struct osmo_mtp_prim *prim; struct m3ua_data_hdr *data_hdr; - struct msgb *upmsg = m3ua_msgb_alloc("M3UA MTP-TRANSFER.ind"); if (!data_ie || data_ie->len < sizeof(*data_hdr)) { /* FIXME: ERROR message */ - msgb_free(upmsg); return NULL; } data_hdr = (struct m3ua_data_hdr *) data_ie->dat; - /* fill primitive */ - prim = (struct osmo_mtp_prim *) msgb_put(upmsg, sizeof(*prim)); - param = &prim->u.transfer; - osmo_prim_init(&prim->oph, MTP_SAP_USER, - OSMO_MTP_PRIM_TRANSFER, - PRIM_OP_INDICATION, upmsg); - - m3ua_dh_to_xfer_param(param, data_hdr); - /* copy data */ - upmsg->l2h = msgb_put(upmsg, data_ie->len - sizeof(*data_hdr)); - memcpy(upmsg->l2h, data_ie->dat+sizeof(*data_hdr), data_ie->len - sizeof(*data_hdr)); + prim = mtp_prim_xfer_ind_alloc(NULL, + data_ie->dat + sizeof(*data_hdr), + data_ie->len - sizeof(*data_hdr)); + m3ua_dh_to_xfer_param(&prim->u.transfer, data_hdr); return prim; } diff --git a/src/ss7_user.h b/src/ss7_user.h index 280fc82..a1cd21b 100644 --- a/src/ss7_user.h +++ b/src/ss7_user.h @@ -1,6 +1,7 @@ #pragma once #include <stdint.h> +#include <unistd.h> #include <osmocom/core/prim.h> #include <osmocom/sigtran/mtp_sap.h> @@ -25,6 +26,9 @@ void ss7_user_unregister_all(struct osmo_ss7_user *user); int ss7_user_mtp_sap_prim_up(const struct osmo_ss7_user *osu, struct osmo_mtp_prim *omp); +struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, + const uint8_t *user_data, size_t user_data_len); + #define _LOGPSS7U(osu, subsys, level, fmt, args ...) \ _LOGSS7((osu)->inst, subsys, level, "ss7_user(%s) " fmt, osu->name, ## args) #define LOGPSS7U(osu, level, fmt, args ...) \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41417?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: I4af154a65b8c23b9e8647845337ad1b5aa3901aa Gerrit-Change-Number: 41417 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: mtp: Submit MTP-RESUME/PAUSE.ind up over MTP SAP
by pespin 14 Nov '25

14 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41418?usp=email ) Change subject: mtp: Submit MTP-RESUME/PAUSE.ind up over MTP SAP ...................................................................... mtp: Submit MTP-RESUME/PAUSE.ind up over MTP SAP This allows supporting MTP users other than existing internal SCCP stack. Change-Id: If4360f07aa199e84c57820957ddde4259d1c92ce --- M src/mtp_sap.c M src/sccp_instance.c M src/ss7_user.h M src/xua_snm.c 4 files changed, 76 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/mtp_sap.c b/src/mtp_sap.c index d3656bc..844b544 100644 --- a/src/mtp_sap.c +++ b/src/mtp_sap.c @@ -62,6 +62,39 @@ return prim_name_buf; } +static struct msgb *mtp_prim_msgb_alloc(void) +{ + return m3ua_msgb_alloc("mtp_prim_up"); +} + +static struct osmo_mtp_prim *mtp_prim_resume_ind_alloc(uint32_t pc) +{ + struct msgb *upmsg = mtp_prim_msgb_alloc(); + struct osmo_mtp_prim *prim; + + OSMO_ASSERT(upmsg); + prim = (struct osmo_mtp_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, MTP_SAP_USER, + OSMO_MTP_PRIM_RESUME, + PRIM_OP_INDICATION, upmsg); + prim->u.resume.affected_dpc = pc; + return prim; +} + +static struct osmo_mtp_prim *mtp_prim_pause_ind_alloc(uint32_t pc) +{ + struct msgb *upmsg = mtp_prim_msgb_alloc(); + struct osmo_mtp_prim *prim; + + OSMO_ASSERT(upmsg); + prim = (struct osmo_mtp_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, MTP_SAP_USER, + OSMO_MTP_PRIM_PAUSE, + PRIM_OP_INDICATION, upmsg); + prim->u.pause.affected_dpc = pc; + return prim; +} + struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, const uint8_t *user_data, size_t user_data_len) { @@ -103,6 +136,28 @@ return omp; } +void mtp_resume_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc) +{ + for (unsigned int service_ind = 0; service_ind < ARRAY_SIZE(s7i->user); service_ind++) { + struct osmo_mtp_prim *omp; + if (!s7i->user[service_ind]) + continue; + omp = mtp_prim_resume_ind_alloc(pc); + ss7_user_mtp_sap_prim_up(s7i->user[service_ind], omp); + } +} + +void mtp_pause_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc) +{ + for (unsigned int service_ind = 0; service_ind < ARRAY_SIZE(s7i->user); service_ind++) { + struct osmo_mtp_prim *omp; + if (!s7i->user[service_ind]) + continue; + omp = mtp_prim_pause_ind_alloc(pc); + ss7_user_mtp_sap_prim_up(s7i->user[service_ind], omp); + } +} + /*! \brief Send a MTP SAP Primitive up to the MTP User * \param[in] osu MTP User to whom to send the primitive * \param[in] prim Primitive to send to the user diff --git a/src/sccp_instance.c b/src/sccp_instance.c index 0d67e4d..a093308 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -260,7 +260,7 @@ struct osmo_sccp_instance *inst = ctx; struct osmo_mtp_prim *omp = (struct osmo_mtp_prim *)oph; struct xua_msg *xua; - int rc; + int rc = 0; OSMO_ASSERT(oph->sap == MTP_SAP_USER); @@ -279,6 +279,12 @@ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua); xua_msg_free(xua); break; + case OSMO_PRIM(OSMO_MTP_PRIM_RESUME, PRIM_OP_INDICATION): + sccp_scmg_rx_mtp_resume(inst, omp->u.resume.affected_dpc); + break; + case OSMO_PRIM(OSMO_MTP_PRIM_PAUSE, PRIM_OP_INDICATION): + sccp_scmg_rx_mtp_pause(inst, omp->u.pause.affected_dpc); + break; default: LOGPSCI(inst, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", oph->primitive, oph->operation); diff --git a/src/ss7_user.h b/src/ss7_user.h index a1cd21b..0da1eea 100644 --- a/src/ss7_user.h +++ b/src/ss7_user.h @@ -29,6 +29,10 @@ struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, const uint8_t *user_data, size_t user_data_len); +void mtp_resume_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc); +void mtp_pause_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc); + + #define _LOGPSS7U(osu, subsys, level, fmt, args ...) \ _LOGSS7((osu)->inst, subsys, level, "ss7_user(%s) " fmt, osu->name, ## args) #define LOGPSS7U(osu, level, fmt, args ...) \ diff --git a/src/xua_snm.c b/src/xua_snm.c index fd2ef24..adaa7ff 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -36,6 +36,7 @@ #include "ss7_route.h" #include "ss7_internal.h" #include "ss7_route_table.h" +#include "ss7_user.h" #include "xua_internal.h" #include "sccp_internal.h" @@ -132,10 +133,10 @@ } } -/* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ -static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, - const uint32_t *aff_pc, unsigned int num_aff_pc, - bool available) +/* generate MTP-PAUSE / MTP-RESUME towards local MTP users */ +static void xua_snm_pc_available_to_mtp_users(struct osmo_ss7_instance *s7i, + const uint32_t *aff_pc, unsigned int num_aff_pc, + bool available) { int i; for (i = 0; i < num_aff_pc; i++) { @@ -147,9 +148,9 @@ if (!mask) { if (available) - sccp_scmg_rx_mtp_resume(sccp, pc); + mtp_resume_ind_up_to_all_users(s7i, pc); else - sccp_scmg_rx_mtp_pause(sccp, pc); + mtp_pause_ind_up_to_all_users(s7i, pc); } else { /* we have to send one MTP primitive for each individual point * code within that mask */ @@ -157,9 +158,9 @@ uint32_t fullpc; for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { if (available) - sccp_scmg_rx_mtp_resume(sccp, fullpc); + mtp_resume_ind_up_to_all_users(s7i, fullpc); else - sccp_scmg_rx_mtp_pause(sccp, fullpc); + mtp_pause_ind_up_to_all_users(s7i, fullpc); } } } @@ -231,8 +232,7 @@ /* inform local users via a MTP-{PAUSE, RESUME} primitive */ - if (s7i->sccp) - xua_snm_pc_available_to_sccp(s7i->sccp, aff_pc, num_aff_pc, available); + xua_snm_pc_available_to_mtp_users(s7i, aff_pc, num_aff_pc, available); /* inform remote ASPs via DUNA/DAVA */ llist_for_each_entry(asp, &s7i->asp_list, list) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41418?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: If4360f07aa199e84c57820957ddde4259d1c92ce Gerrit-Change-Number: 41418 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: mtp: Improve mtp_sap/ss7_user APIs
by pespin 14 Nov '25

14 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?usp=email ) Change subject: mtp: Improve mtp_sap/ss7_user APIs ...................................................................... mtp: Improve mtp_sap/ss7_user APIs * The ss7_user API was so far never used externally, and internally only by SCCP and a unit test. It has several bad practices like first passing a inst parent ptr to allocate it, and then require a inst pointer again to operate on it (eg. register/unregister, send a primitive, etc.). This only makes the API more complex than needed and creates potential problems where a isnt differnet than the one ss7_user was allocated on is passed. Instead, the ss7_user is pinned to its parent inst during alloction, and all MTP-SAP always happens uniquely through the ss7_user. This follows much more closely the already sanitized and much more used sccp_sap/sccp_user APIs. * Move more primitive/SAP related code to mtp_sap.c, to make it easier to spot where the inter-layer communication happens. This way we also have the same disposition as with sccp_sap/sccp_user. * Clean up some primitive related APIs to unify naming with other usual SAP/primitive osmocom code. Change-Id: If320db2bcec7ccbbc2cdac0cbf018fd8be7bde22 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/mtp_sap.c M src/sccp_instance.c M src/sccp_scrc.c M src/ss7_hmrt.c M src/ss7_instance.h M src/ss7_user.c M src/ss7_user.h M src/xua_internal.h M tests/ss7/ss7_test.c 11 files changed, 133 insertions(+), 115 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/TODO-RELEASE b/TODO-RELEASE index 2ecfd57..dd3b333 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmo-netif >1.6.0 stream OSMO_STREAM_{CLI,SRV}_TCP_SOCKOPT_KEEP* libosmo-sigtran add enum mtp_network_indicator, mtp_network_indicator_vals libosmo-sigtran add osmo_ss7_instance_get_network_indicator() +libosmo-sigtran add osmo_ss7_user_mtp_sap_prim_down() diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 5a51ba3..b560caf 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -92,15 +92,13 @@ void osmo_ss7_user_set_priv(struct osmo_ss7_user *user, void *priv); void *osmo_ss7_user_get_priv(const struct osmo_ss7_user *user); -int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind, - struct osmo_ss7_user *user); -int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind, - struct osmo_ss7_user *user); +int osmo_ss7_user_register(struct osmo_ss7_user *user, uint8_t service_ind); +int osmo_ss7_user_unregister(struct osmo_ss7_user *user, uint8_t service_ind); -/* SS7 User wants to issue MTP-TRANSFER.req */ -int osmo_ss7_user_mtp_xfer_req(struct osmo_ss7_instance *inst, - struct osmo_mtp_prim *omp); +/* MTP User wants to submit a primitive down to MTP SAP */ +int osmo_ss7_user_mtp_sap_prim_down(struct osmo_ss7_user *user, + struct osmo_mtp_prim *omp); /*********************************************************************** * SCCP Instance diff --git a/src/mtp_sap.c b/src/mtp_sap.c index b6b6eeb..cef0497 100644 --- a/src/mtp_sap.c +++ b/src/mtp_sap.c @@ -27,6 +27,10 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/mtp_sap.h> +#include "ss7_user.h" +#include "ss7_internal.h" +#include "xua_internal.h" + const struct value_string osmo_mtp_prim_type_names[] = { { OSMO_MTP_PRIM_TRANSFER, "MTP-TRANSFER" }, { OSMO_MTP_PRIM_PAUSE, "MTP-PAUSE" }, @@ -57,3 +61,46 @@ mtp_prim_hdr_name_buf(prim_name_buf, sizeof(prim_name_buf), oph); return prim_name_buf; } + +/*! \brief Send a MTP SAP Primitive up to the MTP User + * \param[in] osu MTP User to whom to send the primitive + * \param[in] prim Primitive to send to the user + * \returns return value of the MTP User's prim_cb() function + * + * Ownership of prim->oph->msg is passed to the user of the registered callback + */ +int ss7_user_mtp_sap_prim_up(const struct osmo_ss7_user *osu, struct osmo_mtp_prim *omp) +{ + LOGPSS7U(osu, LOGL_DEBUG, "Delivering to MTP User: %s\n", + osmo_mtp_prim_name(&omp->oph)); + return osu->prim_cb(&omp->oph, (void *) osu->priv); +} + +/* MTP-User requests to send a MTP-TRANSFER.req via the stack + * \param[in] osu MTP User sending us the primitive + * \param[in] oph Osmocom primitive sent by the user + * + * The oph->msg ownership is transferred to this function, which will free it. + */ +int osmo_ss7_user_mtp_sap_prim_down(struct osmo_ss7_user *osu, struct osmo_mtp_prim *omp) +{ + struct msgb *msg = omp->oph.msg; + int rc; + + OSMO_ASSERT(omp->oph.sap == MTP_SAP_USER); + + switch (OSMO_PRIM_HDR(&omp->oph)) { + case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_REQUEST): + rc = hmrt_mtp_xfer_request_l4_to_l3(osu->inst, &omp->u.transfer, + msgb_l2(msg), msgb_l2len(msg)); + break; + default: + LOGPSS7U(osu, LOGL_ERROR, "Ignoring unknown primitive %u:%u\n", + omp->oph.primitive, omp->oph.operation); + rc = -1; + break; + } + + msgb_free(msg); + return rc; +} diff --git a/src/sccp_instance.c b/src/sccp_instance.c index f5b056f..0d67e4d 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -326,7 +326,7 @@ inst->ss7_user = osmo_ss7_user_create(ss7, "SCCP"); osmo_ss7_user_set_prim_cb(inst->ss7_user, mtp_user_prim_cb); osmo_ss7_user_set_priv(inst->ss7_user, inst); - osmo_ss7_user_register(ss7, MTP_SI_SCCP, inst->ss7_user); + osmo_ss7_user_register(inst->ss7_user, MTP_SI_SCCP); llist_add_tail(&inst->list, &sccp_instances); @@ -341,7 +341,7 @@ return; inst->ss7->sccp = NULL; - osmo_ss7_user_unregister(inst->ss7, MTP_SI_SCCP, inst->ss7_user); + osmo_ss7_user_unregister(inst->ss7_user, MTP_SI_SCCP); osmo_ss7_user_destroy(inst->ss7_user); inst->ss7_user = NULL; diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index ad474aa..9cf71a3 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -134,7 +134,7 @@ 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); + return osmo_ss7_user_mtp_sap_prim_down(inst->ss7_user, omp); } /* Generate MTP-TRANSFER.req from xUA message */ diff --git a/src/ss7_hmrt.c b/src/ss7_hmrt.c index bd5d480..b915481 100644 --- a/src/ss7_hmrt.c +++ b/src/ss7_hmrt.c @@ -44,7 +44,7 @@ #include "ss7_user.h" /* convert from M3UA message to MTP-TRANSFER.ind osmo_mtp_prim */ -struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua) +static struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua) { struct osmo_mtp_prim *prim; struct osmo_mtp_transfer_param *param; @@ -74,23 +74,10 @@ return prim; } -/* convert from MTP-TRANSFER.req to osmo_mtp_prim */ -static struct xua_msg *mtp_prim_to_m3ua(struct osmo_mtp_prim *prim) -{ - struct msgb *msg = prim->oph.msg; - struct osmo_mtp_transfer_param *param = &prim->u.transfer; - struct m3ua_data_hdr data_hdr; - - mtp_xfer_param_to_m3ua_dh(&data_hdr, param); - - return m3ua_xfer_from_data(&data_hdr, msgb_l2(msg), msgb_l2len(msg)); -} - /* delivery given XUA message to given SS7 user * Ownership of xua_msg passed is transferred to this function. */ -static int deliver_to_mtp_user(const struct osmo_ss7_user *osu, - struct xua_msg *xua) +static int deliver_to_mtp_user(const struct osmo_ss7_user *osu, struct xua_msg *xua) { struct osmo_mtp_prim *prim; int rc; @@ -103,7 +90,7 @@ } prim->u.transfer = xua->mtp; - rc = osu->prim_cb(&prim->oph, (void *) osu->priv); + rc = ss7_user_mtp_sap_prim_up(osu, prim); ret_free: xua_msg_free(xua); @@ -145,17 +132,18 @@ return -1; } - /* Check for local SSN registered for this DPC/SSN */ - osu = inst->user[service_ind]; - if (osu) { - return deliver_to_mtp_user(osu, xua); - } else { + /* "User Part Available?" */ + osu = ss7_user_find(inst, service_ind); + if (!osu) { + /* "Discard Message" */ LOGSS7(inst, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind); - /* Discard Message */ /* FIXME: User Part Unavailable HMDT -> HMRT */ xua_msg_free(xua); return -1; } + + /* "MTP Transfer indication HMDT→L4" */ + return deliver_to_mtp_user(osu, xua); } /* HMDC->HMRT Msg For Routing; Figure 26/Q.704 */ @@ -251,35 +239,22 @@ } } -/* MTP-User requests to send a MTP-TRANSFER.req via the stack */ -int osmo_ss7_user_mtp_xfer_req(struct osmo_ss7_instance *inst, - struct osmo_mtp_prim *omp) +/* Figure 26/Q.704 (sheet 1 of 5) "MTP Transfer request L4→L3" */ +int hmrt_mtp_xfer_request_l4_to_l3(struct osmo_ss7_instance *inst, const struct osmo_mtp_transfer_param *param, uint8_t *user_data, size_t user_data_len) { + struct m3ua_data_hdr data_hdr; struct xua_msg *xua; - int rc; - OSMO_ASSERT(omp->oph.sap == MTP_SAP_USER); + /* convert from osmo_mtp_prim MTP-TRANSFER.req to xua_msg */ + mtp_xfer_param_to_m3ua_dh(&data_hdr, param); + xua = m3ua_xfer_from_data(&data_hdr, user_data, user_data_len); + OSMO_ASSERT(xua); + xua->mtp = *param; - switch (OSMO_PRIM_HDR(&omp->oph)) { - case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_REQUEST): - xua = mtp_prim_to_m3ua(omp); - xua->mtp = omp->u.transfer; - /* normally we would call hmrt_message_for_routing() - * here, if we were to follow the state diagrams of the - * ITU-T Q.70x specifications. However, what if a local - * MTP user sends a MTP-TRANSFER.req to a local SSN? - * This wouldn't work as per the spec, but I believe it - * is a very useful feature (aka "loopback device" in - * IPv4). So we call m3ua_hmdc_rx_from_l2() just like - * the MTP-TRANSFER had been received from L2. */ - rc = m3ua_hmdc_rx_from_l2(inst, xua); - break; - default: - LOGSS7(inst, LOGL_ERROR, "Ignoring unknown primitive %u:%u\n", - omp->oph.primitive, omp->oph.operation); - rc = -1; - } - - msgb_free(omp->oph.msg); - return rc; + /* normally we would call hmrt_message_for_routing() here, if we were to follow the state + * diagrams of the ITU-T Q.70x specifications. However, what if a local MTP user sends a + * MTP-TRANSFER.req to a local SSN? This wouldn't work as per the spec, but I believe it + * is a very useful feature (aka "loopback device" in IPv4). So we call + * m3ua_hmdc_rx_from_l2() just like the MTP-TRANSFER had been received from L2. */ + return m3ua_hmdc_rx_from_l2(inst, xua); } diff --git a/src/ss7_instance.h b/src/ss7_instance.h index d4d0b3d..3045403 100644 --- a/src/ss7_instance.h +++ b/src/ss7_instance.h @@ -43,7 +43,7 @@ struct llist_head xua_servers; /* array for faster lookup of user (indexed by service * indicator) */ - const struct osmo_ss7_user *user[16]; + struct osmo_ss7_user *user[16]; struct osmo_ss7_route_table *rtable_system; diff --git a/src/ss7_user.c b/src/ss7_user.c index e7d0483..0ec42ff 100644 --- a/src/ss7_user.c +++ b/src/ss7_user.c @@ -26,9 +26,11 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/prim.h> #include <osmocom/sigtran/osmo_ss7.h> +#include <osmocom/sigtran/mtp_sap.h> #include "ss7_user.h" #include "ss7_internal.h" +#include "xua_internal.h" /*********************************************************************** * MTP Users (Users of MTP, such as SCCP or ISUP) @@ -48,9 +50,17 @@ void osmo_ss7_user_destroy(struct osmo_ss7_user *user) { + ss7_user_unregister_all(user); talloc_free(user); } +struct osmo_ss7_user *ss7_user_find(struct osmo_ss7_instance *inst, uint8_t service_indicator) +{ + if (service_indicator >= ARRAY_SIZE(inst->user)) + return NULL; + return inst->user[service_indicator]; +} + struct osmo_ss7_instance *osmo_ss7_user_get_instance(const struct osmo_ss7_user *user) { return user->inst; @@ -72,75 +82,57 @@ } /*! \brief Register a MTP user for a given service indicator - * \param[in] inst SS7 instance for which we register the user + * \param[in] user SS7 user to register (including primitive call-back) * \param[in] service_ind Service (ISUP, SCCP, ...) - * \param[in] user SS7 user (including primitive call-back) * \returns 0 on success; negative on error */ -int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind, - struct osmo_ss7_user *user) +int osmo_ss7_user_register(struct osmo_ss7_user *user, uint8_t service_ind) { + struct osmo_ss7_instance *inst = user->inst; + if (service_ind >= ARRAY_SIZE(inst->user)) return -EINVAL; if (inst->user[service_ind]) return -EBUSY; - DEBUGP(DLSS7, "registering user=%s for SI %u with priv %p\n", - user->name, service_ind, user->priv); + LOGPSS7U(user, LOGL_DEBUG, "registering for SI %u with priv %p\n", + service_ind, user->priv); - user->inst = inst; inst->user[service_ind] = user; return 0; } /*! \brief Unregister a MTP user for a given service indicator - * \param[in] inst SS7 instance for which we register the user + * \param[in] user SS7 user to unregister. * \param[in] service_ind Service (ISUP, SCCP, ...) - * \param[in] user (optional) SS7 user. If present, we will not - * unregister other users * \returns 0 on success; negative on error */ -int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind, - struct osmo_ss7_user *user) +int osmo_ss7_user_unregister(struct osmo_ss7_user *user, uint8_t service_ind) { + struct osmo_ss7_instance *inst = user->inst; + if (service_ind >= ARRAY_SIZE(inst->user)) return -EINVAL; if (!inst->user[service_ind]) return -ENODEV; - if (user && (inst->user[service_ind] != user)) + if (inst->user[service_ind] != user) return -EINVAL; - if (user) - user->inst = NULL; + LOGPSS7U(user, LOGL_DEBUG, "unregistering from SI %u with priv %p\n", + service_ind, user->priv); + inst->user[service_ind] = NULL; return 0; } -/* deliver to a local MTP user */ -int ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp) +void ss7_user_unregister_all(struct osmo_ss7_user *user) { - uint32_t service_ind; - const struct osmo_ss7_user *osu; - - if (omp->oph.sap != MTP_SAP_USER || - omp->oph.primitive != OSMO_MTP_PRIM_TRANSFER || - omp->oph.operation != PRIM_OP_INDICATION) { - LOGP(DLSS7, LOGL_ERROR, "Unsupported Primitive\n"); - return -EINVAL; + struct osmo_ss7_instance *inst = user->inst; + for (unsigned int i = 0; i < ARRAY_SIZE(inst->user); i++) { + if (inst->user[i] == user) + inst->user[i] = NULL; } - - service_ind = omp->u.transfer.sio & 0xF; - osu = inst->user[service_ind]; - - if (!osu) { - LOGP(DLSS7, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind); - return -ENODEV; - } - - DEBUGP(DLSS7, "delivering MTP-TRANSFER.ind to user %s, priv=%p\n", - osu->name, osu->priv); - return osu->prim_cb(&omp->oph, (void *) osu->priv); } diff --git a/src/ss7_user.h b/src/ss7_user.h index 6021330..280fc82 100644 --- a/src/ss7_user.h +++ b/src/ss7_user.h @@ -5,7 +5,7 @@ #include <osmocom/sigtran/mtp_sap.h> /*********************************************************************** - * SS7 Linksets + * SS7 User (MTP SAP) ***********************************************************************/ struct osmo_ss7_instance; @@ -21,4 +21,11 @@ void *priv; }; -int ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp); +struct osmo_ss7_user *ss7_user_find(struct osmo_ss7_instance *inst, uint8_t service_indicator); +void ss7_user_unregister_all(struct osmo_ss7_user *user); +int ss7_user_mtp_sap_prim_up(const struct osmo_ss7_user *osu, struct osmo_mtp_prim *omp); + +#define _LOGPSS7U(osu, subsys, level, fmt, args ...) \ + _LOGSS7((osu)->inst, subsys, level, "ss7_user(%s) " fmt, osu->name, ## args) +#define LOGPSS7U(osu, level, fmt, args ...) \ + _LOGPSS7U(osu, DLSS7, level, fmt, ## args) diff --git a/src/xua_internal.h b/src/xua_internal.h index 36393f3..90a68be 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -1,5 +1,8 @@ #pragma once +#include <unistd.h> +#include <stdint.h> + #include <osmocom/core/tdef.h> #include <osmocom/sigtran/osmo_ss7.h> #include "xua_msg.h" @@ -34,7 +37,6 @@ void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); -struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua); int m3ua_hmdc_rx_from_l2(struct osmo_ss7_instance *inst, struct xua_msg *xua); struct msgb *m3ua_to_msg(struct xua_msg *xua); int m3ua_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); @@ -69,6 +71,9 @@ const struct m3ua_data_hdr *mdh); void mtp_xfer_param_to_m3ua_dh(struct m3ua_data_hdr *mdh, const struct osmo_mtp_transfer_param *param); +int hmrt_mtp_xfer_request_l4_to_l3(struct osmo_ss7_instance *inst, + const struct osmo_mtp_transfer_param *param, + uint8_t *user_data, size_t user_data_len); extern const struct xua_msg_class m3ua_msg_class_mgmt; diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c index c8e1c67..739d786 100644 --- a/tests/ss7/ss7_test.c +++ b/tests/ss7/ss7_test.c @@ -124,25 +124,18 @@ osmo_ss7_user_set_priv(user, (void *) 0x1234); /* registration */ - OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, user) == 0); - OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, NULL) == -EBUSY); - OSMO_ASSERT(osmo_ss7_user_register(s7i, 255, NULL) == -EINVAL); + OSMO_ASSERT(osmo_ss7_user_register(user, 1) == 0); + OSMO_ASSERT(osmo_ss7_user_register(user, 1) == -EBUSY); + OSMO_ASSERT(osmo_ss7_user_register(user, 255) == -EINVAL); /* primitive delivery */ - OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == 23); + OSMO_ASSERT(ss7_user_mtp_sap_prim_up(user, &omp) == 23); /* cleanup */ - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 255, NULL) == -EINVAL); - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 10, NULL) == -ENODEV); - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user2) == -EINVAL); - OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user) == 0); - - /* primitive delivery should fail now */ - OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == -ENODEV); - - /* wrong primitive delivery should also fail */ - omp.oph.primitive = OSMO_MTP_PRIM_PAUSE; - OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == -EINVAL); + OSMO_ASSERT(osmo_ss7_user_unregister(user, 255) == -EINVAL); + OSMO_ASSERT(osmo_ss7_user_unregister(user, 10) == -ENODEV); + OSMO_ASSERT(osmo_ss7_user_unregister(user2, 1) == -EINVAL); + OSMO_ASSERT(osmo_ss7_user_unregister(user, 1) == 0); osmo_ss7_user_destroy(user); osmo_ss7_user_destroy(user2); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?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: If320db2bcec7ccbbc2cdac0cbf018fd8be7bde22 Gerrit-Change-Number: 41411 Gerrit-PatchSet: 4 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]: mtp: Submit MTP-STATUS.ind up over MTP SAP
by pespin 14 Nov '25

14 Nov '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41419?usp=email ) Change subject: mtp: Submit MTP-STATUS.ind up over MTP SAP ...................................................................... mtp: Submit MTP-STATUS.ind up over MTP SAP This allows supporting MTP users other than existing internal SCCP stack. Change-Id: I5e810451481e50f2942b3a1bf88212326b8d124e --- M include/osmocom/sigtran/mtp_sap.h M src/mtp_sap.c M src/sccp_instance.c M src/ss7_user.h M src/xua_snm.c 5 files changed, 66 insertions(+), 12 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sigtran/mtp_sap.h b/include/osmocom/sigtran/mtp_sap.h index 4cc280d..1816b2d 100644 --- a/include/osmocom/sigtran/mtp_sap.h +++ b/include/osmocom/sigtran/mtp_sap.h @@ -56,7 +56,9 @@ struct osmo_mtp_status_param { uint32_t affected_dpc; - uint32_t cause; + uint32_t cause; /* enum mtp_unavail_cause */ + bool congestion_level_present; + uint8_t congestion_level; }; struct osmo_mtp_prim { diff --git a/src/mtp_sap.c b/src/mtp_sap.c index 844b544..8c21f53 100644 --- a/src/mtp_sap.c +++ b/src/mtp_sap.c @@ -95,6 +95,26 @@ return prim; } +struct osmo_mtp_prim *mtp_prim_status_ind_alloc(uint32_t dpc, + enum mtp_unavail_cause cause, + bool cong_level_present, + uint8_t cong_level) +{ + struct msgb *upmsg = mtp_prim_msgb_alloc(); + struct osmo_mtp_prim *prim; + + OSMO_ASSERT(upmsg); + prim = (struct osmo_mtp_prim *) msgb_put(upmsg, sizeof(*prim)); + osmo_prim_init(&prim->oph, MTP_SAP_USER, + OSMO_MTP_PRIM_STATUS, + PRIM_OP_INDICATION, upmsg); + prim->u.status.affected_dpc = dpc; + prim->u.status.cause = cause; + prim->u.status.congestion_level_present = cong_level_present; + prim->u.status.congestion_level = cong_level; + return prim; +} + struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, const uint8_t *user_data, size_t user_data_len) { @@ -158,6 +178,19 @@ } } +void mtp_status_ind_up_to_all_users(struct osmo_ss7_instance *s7i, + uint32_t dpc, enum mtp_unavail_cause cause, + bool cong_level_present, uint8_t cong_level) +{ + for (unsigned int service_ind = 0; service_ind < ARRAY_SIZE(s7i->user); service_ind++) { + struct osmo_mtp_prim *omp; + if (!s7i->user[service_ind]) + continue; + omp = mtp_prim_status_ind_alloc(dpc, cause, cong_level_present, cong_level); + ss7_user_mtp_sap_prim_up(s7i->user[service_ind], omp); + } +} + /*! \brief Send a MTP SAP Primitive up to the MTP User * \param[in] osu MTP User to whom to send the primitive * \param[in] prim Primitive to send to the user diff --git a/src/sccp_instance.c b/src/sccp_instance.c index a093308..6388b4b 100644 --- a/src/sccp_instance.c +++ b/src/sccp_instance.c @@ -285,6 +285,11 @@ case OSMO_PRIM(OSMO_MTP_PRIM_PAUSE, PRIM_OP_INDICATION): sccp_scmg_rx_mtp_pause(inst, omp->u.pause.affected_dpc); break; + case OSMO_PRIM(OSMO_MTP_PRIM_STATUS, PRIM_OP_INDICATION): + sccp_scmg_rx_mtp_status(inst, omp->u.status.affected_dpc, + omp->u.status.cause, + omp->u.status.congestion_level); + break; default: LOGPSCI(inst, LOGL_ERROR, "Unknown primitive %u:%u receivd\n", oph->primitive, oph->operation); diff --git a/src/ss7_user.h b/src/ss7_user.h index 0da1eea..bec6c22 100644 --- a/src/ss7_user.h +++ b/src/ss7_user.h @@ -3,6 +3,7 @@ #include <stdint.h> #include <unistd.h> #include <osmocom/core/prim.h> +#include <osmocom/sigtran/protocol/mtp.h> #include <osmocom/sigtran/mtp_sap.h> /*********************************************************************** @@ -29,8 +30,15 @@ struct osmo_mtp_prim *mtp_prim_xfer_ind_alloc(const struct osmo_mtp_transfer_param *param, const uint8_t *user_data, size_t user_data_len); +struct osmo_mtp_prim *mtp_prim_status_ind_alloc(uint32_t dpc, + enum mtp_unavail_cause cause, + bool cong_level_present, + uint8_t cong_level); void mtp_resume_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc); void mtp_pause_ind_up_to_all_users(struct osmo_ss7_instance *s7i, uint32_t pc); +void mtp_status_ind_up_to_all_users(struct osmo_ss7_instance *s7i, + uint32_t dpc, enum mtp_unavail_cause cause, + bool cong_level_present, uint8_t cong_level); #define _LOGPSS7U(osu, subsys, level, fmt, args ...) \ diff --git a/src/xua_snm.c b/src/xua_snm.c index adaa7ff..4890f79 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -303,13 +303,17 @@ const char *info_str) { struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_user *osu; struct osmo_ss7_asp *asp; uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; - /* Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */ - if (s7i->sccp && user == MTP_SI_SCCP) - sccp_scmg_rx_mtp_status(s7i->sccp, dpc, cause, 0); + /* Translate to MTP-STATUS.ind towards MTP-User (SCCP will create N-PCSTATE.ind to SCU) */ + osu = ss7_user_find(s7i, user); + if (osu) { + struct osmo_mtp_prim *omp = mtp_prim_status_ind_alloc(dpc, cause, false, 0); + ss7_user_mtp_sap_prim_up(osu, omp); + } /* inform remote ASPs via DUPU */ llist_for_each_entry(asp, &s7i->asp_list, list) { @@ -333,9 +337,10 @@ /* ITU Q.701 8.4 "The level value is included if national options with congestion priorities or multiple signalling link states without congestion priorities as in Recommendation Q.704 are implemented" */ -static void xua_snm_scon_to_sccp(struct osmo_sccp_instance *sccp, - const uint32_t *aff_pc, unsigned int num_aff_pc, - uint8_t cong_level) +static void xua_snm_scon_to_mtp_users(struct osmo_ss7_instance *s7i, + const uint32_t *aff_pc, unsigned int num_aff_pc, + bool cong_level_present, + uint8_t cong_level) { int i; @@ -347,14 +352,16 @@ uint8_t mask = _aff_pc >> 24; if (!mask) { - sccp_scmg_rx_mtp_status(sccp, pc, MTP_UNAVAIL_C_CONGESTED, cong_level); + mtp_status_ind_up_to_all_users(s7i, pc, MTP_UNAVAIL_C_CONGESTED, + cong_level_present, cong_level); } else { /* we have to send one MTP primitive for each individual point * code within that mask */ uint32_t maskbits = (1 << mask) - 1; uint32_t fullpc; for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) - sccp_scmg_rx_mtp_status(sccp, fullpc, MTP_UNAVAIL_C_CONGESTED, cong_level); + mtp_status_ind_up_to_all_users(s7i, fullpc, MTP_UNAVAIL_C_CONGESTED, + cong_level_present, cong_level); } } } @@ -370,9 +377,8 @@ /* TODO: Change Congested level/state of related routes, * see ITU Q.704 3.8.4 "Congestion status of signalling route sets" */ - /* Translate to MTP-STATUS.ind towards SCCP (will create N-PCSTATE.ind to SCU) */ - if (s7i->sccp) - xua_snm_scon_to_sccp(s7i->sccp, aff_pc, num_aff_pc, cong_level ? *cong_level : 0); + /* Translate to MTP-STATUS.ind towards MTP Users (SCCP will create N-PCSTATE.ind to SCU) */ + xua_snm_scon_to_mtp_users(s7i, aff_pc, num_aff_pc, !!cong_level, cong_level ? *cong_level : 0); /* RFC4666 1.4.6: "When an SG receives a congestion message (SCON) from an ASP and the SG * determines that an SPMC is now encountering congestion, it MAY trigger SS7 MTP3 Transfer -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41419?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: I5e810451481e50f2942b3a1bf88212326b8d124e Gerrit-Change-Number: 41419 Gerrit-PatchSet: 4 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]: mtp: Introduce mtp_prim_* API helpers
by pespin 14 Nov '25

14 Nov '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41417?usp=email ) Change subject: mtp: Introduce mtp_prim_* API helpers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41417?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: I4af154a65b8c23b9e8647845337ad1b5aa3901aa Gerrit-Change-Number: 41417 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Nov 2025 15:03:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: mtp: Improve mtp_sap/ss7_user APIs
by pespin 14 Nov '25

14 Nov '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?usp=email ) Change subject: mtp: Improve mtp_sap/ss7_user APIs ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?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: If320db2bcec7ccbbc2cdac0cbf018fd8be7bde22 Gerrit-Change-Number: 41411 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Nov 2025 15:03:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: mtp: Improve mtp_sap/ss7_user APIs
by osmith 14 Nov '25

14 Nov '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?usp=email ) Change subject: mtp: Improve mtp_sap/ss7_user APIs ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File TODO-RELEASE: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411/comment/22820a6b_62a07… : PS3, Line 13: libosmo-sigtran add osmo_ss7_user_mtp_sap_prim_down() > I'm pretty sure they were unused, so imho no need to pollute here even more. Acknowledged -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41411?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: If320db2bcec7ccbbc2cdac0cbf018fd8be7bde22 Gerrit-Change-Number: 41411 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Nov 2025 13:51:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log November 2025