- gerrit-log - lists.osmocom.org

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

14 Nov '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41429?usp=email ) Change subject: mtp: Introduce osmo_ss7_user_find_by_si() public API ...................................................................... Patch Set 3: Code-Review+1 -- 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: comment 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: 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-Comment-Date: Fri, 14 Nov 2025 20:16:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

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

14 Nov '25

Attention is currently required from: daniel, laforge, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41432?usp=email ) Change subject: ipa: Adapt handling logic of rx msg from osmo_ipa_segmentation_cb() ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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> 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Nov 2025 20:16:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[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: (1 comment) File include/osmocom/sigtran/protocol/mtp.h: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41410/comment/cae8f2f5_5e4d9… : PS5, Line 30: * > Note we could also decide to set up a different SI for each IPA protocol we handle, similar to the e […] See how osmo-bsc (SCCPlite) uses it here: https://gerrit.osmocom.org/c/osmo-bsc/+/41400 -- 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:48:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-bsc[master]: sccplite: Handle MGCP/CTRL over SCCPLite multiplex using MTP-TRANSFER...
by pespin 14 Nov '25

14 Nov '25

Attention is currently required from: daniel, fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41400?usp=email ) Change subject: sccplite: Handle MGCP/CTRL over SCCPLite multiplex using MTP-TRANSFER.req/ind ...................................................................... Patch Set 4: This change is ready for review. -- 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: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I567ed206eab1add21836bfd937f3790d3d7a00d7 Gerrit-Change-Number: 41400 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Nov 2025 18:47:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[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: (1 comment) File include/osmocom/sigtran/protocol/mtp.h: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41410/comment/3bd29a43_506dc… : PS5, Line 30: * > See newest version of this patch with updated commit description. […] Note we could also decide to set up a different SI for each IPA protocol we handle, similar to the existing SCCP one, for instance one SI for MGCP, one SI for CTRL, etc. but in the end it's more work to maintain, so having 1 for RAW IPA messages sounds better. Ideally the SI/NI specification would be easier to extend, but this is what we got... -- 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:40:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[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: (1 comment) File include/osmocom/sigtran/protocol/mtp.h: https://gerrit.osmocom.org/c/libosmo-sigtran/+/41410/comment/f0fc855c_cce32… : PS5, Line 30: * > does this mean we can no longer use libosmo-sigtran in national networks that use ni11 in routed MTP […] See newest version of this patch with updated commit description. Regarding your question, several pointers: * This only really adds specific logic and is relevant for IPA ASPs, meaning for other kind of ASPs there's no behavior change here, and this SI can mean nothing there if we want to. * Since this is only used for IPA ASPs, this means that this SI is never really forwarded over the wire since IPA ASP doesn't forward any kind of SI information. Hence, this is only relevant in the local libosmo-sigtran stack for the user to be able to manage such traffic. Then, we can differentiate between 2 scenarios: * endpoint (ASP, local distribution): Only picked/handled if the MTP user (app) registers a ss7_user for that SI. The SI value 2 (reserved) is picked on purpose to avoid colliding with other existing protocols (over IPA, which is anyway not standarized...). * STP (SG, routing): With the provided patch we actually improve the situation by allowing routing IPA messages (other than SCCP); before this patch they could only be picked through the dirty ss7_rx_nknown_cb() by the app, and otherwise they were always discarded. Now non-SCCP IPA messages are routed based on MTP, which I'd say is the expected behavior. Ideally, somebody using SCCPLite would configure the NI with "Reserved for national use", since in the end it's using other SIs (MGCP, CTRL) which are not specified in the International network. In practice it doesn't matter since we are using IPA in those scenarios, where the SI is never sent over the network...In the end, this becomes another IPA particularity imho. -- 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:37:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[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

[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

[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

[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

2025

2024

2023

2022

gerrit-log