- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: msc: add test for OS#5532: crash from CM Serv Rej
by fixeria 05 May '22

05 May '22

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048 ) Change subject: msc: add test for OS#5532: crash from CM Serv Rej ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048/comment/d829379c_c9f3… PS1, Line 6815: BSSAP.send(ts_PDU_DTAP_MO(ts_CM_SERV_REQ(CM_TYPE_MO_SMS, mi))); Ah, indeed. I was confused because {BTS,BSC}_Tests.f_est_dchan() does not send anything on the established channel, while BSC_ConnectionHandler.f_establish_fully() does send a CM Service Request. Nevermind. > Is the comment above not clear enough? If you said "Send *another* CM Serv Req ..." it would be cleaner, IMO. Not critical, giving CR+2. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f84d00f456aaee578787059d7010c25efcdcf56 Gerrit-Change-Number: 28048 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 May 2022 21:36:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in libgtpnl[master]: fix some cases of rc == 0 on error
by neels 05 May '22

05 May '22

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/26990 ) Change subject: fix some cases of rc == 0 on error ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: thanks, i'm still uncertain about implications of changing the behavior, given that a "workaround" is possible. @pablo, could you +1 if you would like to see this merged? -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/26990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I22fd69709e023572c6c616a4184340a554456faf Gerrit-Change-Number: 26990 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pablo <pablo(a)gnumonks.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 May 2022 20:11:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: msc: add test for OS#5532: crash from CM Serv Rej
by neels 05 May '22

05 May '22

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048 ) Change subject: msc: add test for OS#5532: crash from CM Serv Rej ...................................................................... Patch Set 1: (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048/comment/d8b05660_5861… PS1, Line 6815: BSSAP.send(ts_PDU_DTAP_MO(ts_CM_SERV_REQ(CM_TYPE_MO_SMS, mi))); > I am trying to understand the TC scenario. […] the scenario is: a conn is already open (e.g. an earlier CM Service is ongoing). Then rx a second CM Service, but its mobile identity is wrong. Is the comment above not clear enough? The first IMSI is xxxx00094, the wrong one is xxxx99999. Could also be a TMSI, but code wise it's easier to create an IMSI that is always guaranteed to mismatch. The LU is just a necessary prelude to allow the first valid CM Service Request to begin. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f84d00f456aaee578787059d7010c25efcdcf56 Gerrit-Change-Number: 28048 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 May 2022 20:02:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-msc[master]: fix crash on CM Serv Rej: fix use count mismatch
by neels 05 May '22

05 May '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28049 ) Change subject: fix crash on CM Serv Rej: fix use count mismatch ...................................................................... fix crash on CM Serv Rej: fix use count mismatch With comments, clarify the code paths where a CM Service use count has not yet been placed on the conn (just send CM Service Reject) and where the use count is placed (decrement count on CM Service Reject). Place the CM Service use count slightly earlier: - it is then correctly present when checking the mobile identity in cm_serv_reuse_conn(), avoiding the crash reported in OS#5532. - there is only one place incrementing the use count instead of two. Related: OS#5532 Change-Id: I6c735b79b67108bcaadada3f01c7046e262f939b --- M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M tests/msc_vlr/msc_vlr_test_reject_concurrency.err 3 files changed, 24 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index b5d46fd..9d3b5a2 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -246,7 +246,9 @@ return msc_a_tx_dtap_to_i(msc_a, msg); } -/* 9.2.6 CM service reject */ +/* 9.2.6 CM service reject. + * For an active and valid CM Service Request, instead use msc_vlr_tx_cm_serv_rej(), which also takes care of + * decrementing the use token for that service type. */ static int msc_gsm48_tx_mm_serv_rej(struct msc_a *msc_a, enum gsm48_reject_value value) { @@ -701,7 +703,6 @@ accept_reuse: LOG_MSC_A_CAT(msc_a, DMM, LOGL_DEBUG, "re-using already accepted connection\n"); - msc_a_get(msc_a, msc_a_cm_service_type_to_use(cm_serv_type)); msub_update_id(msc_a->c.msub); return net->vlr->ops.tx_cm_serv_acc(msc_a, cm_serv_type); } @@ -729,6 +730,14 @@ struct osmo_mobile_identity mi; int rc; + /* There are two ways to respond with a CM Service Reject: + * Directly and only send the CM Service Reject with msc_gsm48_tx_mm_serv_rej(). + * Decrement the CM Service use count token and send the message with msc_vlr_tx_cm_serv_rej(). + * + * Until we accept the CM Service Request message as such, there is no use count placed for the service type. + * So in here use msc_gsm48_tx_mm_serv_rej() to respond. + */ + /* Make sure that both header and CM Service Request fit into the buffer */ if (msgb_l3len(msg) < sizeof(*gh) + sizeof(*req)) { LOG_MSC_A(msc_a, LOGL_ERROR, "Rx CM SERVICE REQUEST: wrong message size (%u < %zu)\n", @@ -791,13 +800,16 @@ if (!msc_a_cm_service_type_to_use(req->cm_service_type)) return msc_gsm48_tx_mm_serv_rej(msc_a, GSM48_REJECT_SRV_OPT_NOT_SUPPORTED); + /* At this point, the CM Service Request message is being accepted. + * Increment the matching use token, and from here on use msc_vlr_tx_cm_serv_rej() to respond in case of + * failure. */ + msc_a_get(msc_a, msc_a_cm_service_type_to_use(req->cm_service_type)); + if (msc_a_is_accepted(msc_a)) return cm_serv_reuse_conn(msc_a, &mi, req->cm_service_type); osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &mi); - msc_a_get(msc_a, msc_a_cm_service_type_to_use(req->cm_service_type)); - is_utran = (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU); vlr_proc_acc_req(msc_a->c.fi, MSC_A_EV_AUTHENTICATED, MSC_A_EV_CN_CLOSE, NULL, @@ -1508,7 +1520,8 @@ return gsm48_tx_mm_info(msc_a); } -/* VLR asks us to transmit a CM Service Reject */ +/* VLR asks us to transmit a CM Service Reject. + * Decrement the CM Service type's use token and send the CM Service Reject message. */ static int msc_vlr_tx_cm_serv_rej(void *msc_conn_ref, enum osmo_cm_service_type cm_service_type, enum gsm48_reject_value cause) { diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index e2bf975..5761ed7 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1792,6 +1792,10 @@ return msc_a_start_assignment(msc_a, cc_trans); } +/* Map CM Service type to use token. + * Given a CM Service type, return a matching token intended for osmo_use_count. + * For unknown service type, return NULL. + */ const char *msc_a_cm_service_type_to_use(enum osmo_cm_service_type cm_service_type) { switch (cm_service_type) { diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index 67b4819..25ccdfb 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1032,8 +1032,8 @@ DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: MM GSM48_MT_MM_CM_SERV_REQ DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Rx CM SERVICE REQUEST cm_service_type=Short-Messaging-Service -DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: re-using already accepted connection DREF msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + cm_service_sms: now used by 3 (2*cm_service_sms,rx_from_ms) +DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: re-using already accepted connection DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Sending DTAP: MM GSM48_MT_MM_CM_SERV_ACC DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on GERAN-A - DTAP --GERAN-A--> MS: GSM48_MT_MM_CM_SERV_ACC: 0521 @@ -1842,8 +1842,8 @@ DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP DRLL msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_AUTHENTICATED}: Dispatching 04.08 message: MM GSM48_MT_MM_CM_SERV_REQ DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Rx CM SERVICE REQUEST cm_service_type=Short-Messaging-Service -DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: re-using already accepted connection DREF msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + cm_service_sms: now used by 3 (sms,rx_from_ms,cm_service_sms) +DMM msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: re-using already accepted connection DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: Sending DTAP: MM GSM48_MT_MM_CM_SERV_ACC DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN encode: DTAP on GERAN-A - DTAP --GERAN-A--> MS: GSM48_MT_MM_CM_SERV_ACC: 0521 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6c735b79b67108bcaadada3f01c7046e262f939b Gerrit-Change-Number: 28049 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-remsim[master]: rspro_client_fsm: Log clientConnectResult != ok
by pespin 05 May '22

05 May '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28056 ) Change subject: rspro_client_fsm: Log clientConnectResult != ok ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I8f584640758be0cceab61dcb333c81374da3288b Gerrit-Change-Number: 28056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 05 May 2022 17:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-remsim[master]: bankd: Log more clearly if we fail to open a PC/SC reader
by pespin 05 May '22

05 May '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28055 ) Change subject: bankd: Log more clearly if we fail to open a PC/SC reader ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I424f585a8a37f21806898e59e350201119645a21 Gerrit-Change-Number: 28055 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 05 May 2022 17:28:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-remsim[master]: rspro_client_fsm: Log clientConnectResult != ok
by laforge 05 May '22

05 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28056 ) Change subject: rspro_client_fsm: Log clientConnectResult != ok ...................................................................... rspro_client_fsm: Log clientConnectResult != ok This should aid debugging. Related: SYS#5950 Change-Id: I8f584640758be0cceab61dcb333c81374da3288b --- M src/asn1c_helpers.h M src/rspro_client_fsm.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/56/28056/1 diff --git a/src/asn1c_helpers.h b/src/asn1c_helpers.h index 8d4e676..ac34a8f 100644 --- a/src/asn1c_helpers.h +++ b/src/asn1c_helpers.h @@ -1,5 +1,6 @@ #pragma once +#include <asn_application.h> struct asn_TYPE_descriptor_t; const char *asn_type_name(const asn_TYPE_descriptor_t *td); diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index bd07330..bd267ca 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -32,6 +32,7 @@ #include <osmocom/gsm/protocol/ipaccess.h> #include "debug.h" +#include "asn1c_helpers.h" #include "rspro_client_fsm.h" #define S(x) (1 << (x)) @@ -229,6 +230,8 @@ pdu = data; res = rspro_get_result(pdu); if (res != ResultCode_ok) { + LOGPFSML(fi, LOGL_ERROR, "Rx RSPRO connectClientRes(result=%s), closing\n", + asn_enum_name(&asn_DEF_ResultCode, res)); ipa_client_conn_close(srvc->conn); osmo_fsm_inst_dispatch(fi, SRVC_E_TCP_DOWN, NULL); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I8f584640758be0cceab61dcb333c81374da3288b Gerrit-Change-Number: 28056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-remsim[master]: bankd: Log more clearly if we fail to open a PC/SC reader
by laforge 05 May '22

05 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/28055 ) Change subject: bankd: Log more clearly if we fail to open a PC/SC reader ...................................................................... bankd: Log more clearly if we fail to open a PC/SC reader Related: SYS#5950 Change-Id: I424f585a8a37f21806898e59e350201119645a21 --- M src/bankd/bankd_pcsc.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/55/28055/1 diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c index d7bb39c..ee01c93 100644 --- a/src/bankd/bankd_pcsc.c +++ b/src/bankd/bankd_pcsc.c @@ -237,13 +237,19 @@ &dwActiveProtocol); if (rc == SCARD_S_SUCCESS) result = 0; - else + else { LOGW_PCSC_ERROR(worker, rc, "SCardConnect"); + goto out_readerfree; + } break; } p += strlen(p) + 1; } + if (result < 0) + LOGW(worker, "Error: Cannot find PC/SC reader/slot matching using regex '%s'\n", worker->reader.name); + +out_readerfree: SCardFreeMemory(worker->reader.pcsc.hContext, mszReaders); out_regfree: -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/28055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I424f585a8a37f21806898e59e350201119645a21 Gerrit-Change-Number: 28055 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in libosmo-sccp[master]: M3UA/SUA: Implement handling of SCON (signaling congestion)
by laforge 05 May '22

05 May '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 ) Change subject: M3UA/SUA: Implement handling of SCON (signaling congestion) ...................................................................... M3UA/SUA: Implement handling of SCON (signaling congestion) If we receive any M3UA/SUA SNM SCON mesasages, distribute them to any other active ASP to make everyone aware of the congestion situation. This makes STP_Tests_M3UA.TC_ssnm_distribution_scon pass and hence should turn the entire osmo-stp test suite "green" Change-Id: Iac7aeba980fbbd8b58f8872a29ba10745eb0a730 --- M src/m3ua.c M src/sua.c M src/xua_internal.h M src/xua_snm.c 4 files changed, 139 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/54/28054/1 diff --git a/src/m3ua.c b/src/m3ua.c index 741063c..63297fe 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -864,6 +864,40 @@ xua_msg_free(xua); } +/*! Transmit SSNM SCON message indicating congestion + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] concerned_dpc optional concerned DPC (can be NULL) + * \param[in] cong_level optional congestion level (can be NULL) + * \param[in] info_string optional information string (can be NULL). */ +void m3ua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_SCON); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * sizeof(*aff_pc), (const uint8_t *) aff_pc); + + if (concerned_dpc) + xua_msg_add_u32(xua, M3UA_IEI_CONC_DEST, *concerned_dpc & 0xffffff); + if (cong_level) + xua_msg_add_u32(xua, M3UA_IEI_CONG_IND, *cong_level & 0xff); + if (info_string) + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, strlen(info_string)+1, (const uint8_t *) info_string); + + m3ua_tx_xua_asp(asp, xua); + xua_msg_free(xua); +} + /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. @@ -903,6 +937,8 @@ xua_snm_rx_dupu(asp, as, xua); break; case M3UA_SNM_SCON: + xua_snm_rx_scon(asp, as, xua); + break; case M3UA_SNM_DRST: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", xua->hdr.msg_type); diff --git a/src/sua.c b/src/sua.c index 000f064..bd51005 100644 --- a/src/sua.c +++ b/src/sua.c @@ -875,6 +875,35 @@ sua_tx_xua_asp(asp, xua); } + +/*! Transmit SSNM SCON message indicating congestion + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] ssn optional SSN (can be NULL) + * \param[in] cong_level optional congestion level (can be NULL) + * \param[in] info_string optional information string (can be NULL). */ +void sua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *ssn, + const uint8_t cong_level, const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_SCON); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + xua_msg_add_data(xua, SUA_IEI_AFFECTED_PC, num_aff_pc * sizeof(*aff_pc), (const uint8_t *) aff_pc); + if (ssn) + xua_msg_add_u32(xua, SUA_IEI_SSN, *ssn); + xua_msg_add_u32(xua, SUA_IEI_CONG_LEVEL, cong_level); + if (info_string) + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, strlen(info_string)+1, (const uint8_t *) info_string); +} + + /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. diff --git a/src/xua_internal.h b/src/xua_internal.h index 4c6bb29..5dd7066 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -21,6 +21,9 @@ void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, const uint32_t *smi, const char *info_string, bool available); +void sua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *ssn, + const uint8_t cong_level, const char *info_string); 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); @@ -30,12 +33,18 @@ void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string, bool available); +void m3ua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string); void m3ua_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); + void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_scon(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); diff --git a/src/xua_snm.c b/src/xua_snm.c index 0c14964..1212162 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -115,6 +115,24 @@ } } +static void xua_tx_scon(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_snm_congestion(asp, rctx, num_rctx, aff_pc, num_aff_pc, + concerned_dpc, cong_level, info_string); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_snm_congestion(asp, rctx, num_rctx, aff_pc, num_aff_pc, NULL, + cong_level ? *cong_level : 0, info_string); + break; + default: + break; + } +} /* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, @@ -257,6 +275,36 @@ } } +static void xua_snm_scon(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, const char *info_string) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + /* TODO: How to translate to MTP and towards SCCP (create N-PCSTATE.ind to SCU) */ + + /* inform remote ASPs via SCON */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send SCON if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + + xua_tx_scon(asp, rctx, num_rctx, aff_pc, num_aff_pc, concerned_dpc, cong_level, info_string); + } +} + /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -405,3 +453,20 @@ xua_snm_upu(as, aff_pc, user, cause, info_str); } + +/* an incoming SUA/M3UA SCON was received from a remote SG */ +void xua_snm_rx_scon(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + uint32_t _concerned_dpc, _cong_level; + const uint32_t *concerned_dpc = xua_msg_get_u32p(xua, M3UA_IEI_CONC_DEST, &_concerned_dpc); + const uint32_t *cong_level = xua_msg_get_u32p(xua, M3UA_IEI_CONG_IND, &_cong_level); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + LOGPASP(asp, log_ss, LOGL_NOTICE, "RX SCON(%s) for %s level=%u\n", info_str ? info_str : "", + format_affected_pcs_c(xua, asp->inst, ie_aff_pc), cong_level ? *cong_level : 0); + + xua_snm_scon(as, (const uint32_t *) ie_aff_pc->dat, ie_aff_pc->len / sizeof(uint32_t), + concerned_dpc, (const uint8_t *) cong_level, info_str); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac7aeba980fbbd8b58f8872a29ba10745eb0a730 Gerrit-Change-Number: 28054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: paging: Avoid unnecessary immediate polling in mainloop
by pespin 05 May '22

05 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28053 ) Change subject: paging: Avoid unnecessary immediate polling in mainloop ...................................................................... paging: Avoid unnecessary immediate polling in mainloop We have seen an increased CPU load in osmo-bsc recently since the paging improvements where merged, centered round poll() calls. It is expected most of them will be fixed with previous patch. In any case, let's avoid unnecessary poll() calls being called for no reason. Related: OS#5922 Change-Id: Ie767bdc8d4353aafe375a424e02d698ef7fd3dea --- M src/osmo-bsc/paging.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/28053/1 diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 6e888d4..7f8d362 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -469,7 +469,10 @@ LOG_PAGING_BTS(req, req->bts, DPAG, LOGL_DEBUG, "New req arrived: re-scheduling next batch in %lld.%06ld\n", (long long)tdiff.tv_sec, tdiff.tv_nsec / 1000); - osmo_timer_schedule(&bts_entry->work_timer, tdiff.tv_sec, tdiff.tv_nsec / 1000); + if (tdiff.tv_sec == 0 && tdiff.tv_nsec == 0) + paging_worker(bts_entry); + else + osmo_timer_schedule(&bts_entry->work_timer, tdiff.tv_sec, tdiff.tv_nsec / 1000); } /* else: worker is already ongoing submitting initial requests, nothing do be done */ return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie767bdc8d4353aafe375a424e02d698ef7fd3dea Gerrit-Change-Number: 28053 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log