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

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_{cs,ps}_rua_dt_during_sccp_wait_cc

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40184?usp=email ) Change subject: hnbgw: Introduce test TC_{cs,ps}_rua_dt_during_sccp_wait_cc ...................................................................... hnbgw: Introduce test TC_{cs,ps}_rua_dt_during_sccp_wait_cc Related: SYS#7453 Change-Id: I97767db5560edf951202c876726d0c52b5b5b49f --- M hnbgw/HNBGW_Tests.ttcn M hnbgw/expected-results.xml 2 files changed, 55 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 28b41d2..a123dda 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1567,6 +1567,56 @@ f_shutdown_helper(); } +/* scenario: HNB transmits a RUA DirectTransfer after having transmitted a RUA Connect + * (with RANAP payload) and conn is still being established on SCCP side (HNBGW sent CR, + * waiting for CC from CN). */ +private function f_tc_rua_dt_during_sccp_wait_cc(charstring id) runs on ConnHdlr { + /* HNB->MSC: InitialUE */ + var RANAP_PDU tx_ranap_pdu := f_build_initial_ue(g_pars); + f_iuh2iu_connect(f_build_initial_ue(g_pars)); + + /* CREQ was received at CN, now UE/HNB decides to transmit RANAP PDU (Iu Release REq). + * This has been seen in a production setup on the field, with a high + * latency+jitter satellite network between HNB and HNBGW. + * We expect HNBGW to queue the msg until the SCCP conn is confirmed. */ + tx_ranap_pdu := valueof(ts_RANAP_IuReleaseRequest(ts_RanapCause_nas_normal)); + RUA.send(tx_ranap_pdu); + + /* Let some time for RUA DirectTransfer to reach the HNBGW: */ + f_sleep(1.0); + + /* Now tx SCCP CC from CN to HNBGW: */ + BSSAP.send(ts_MSC_CONN_PRIM_CONNECT_RES); + + /* now that SCCP conn is connected, HNBGW should forward the previously queued RANAP PDU: */ + f_bssap_expect(tx_ranap_pdu); + + /* Validate that we can indeed forward some Downlink data CN may have sent to HNBGW meanwhile. + * This would usually be for instance a Attach Accept or similar. */ + tx_ranap_pdu := valueof(ts_RANAP_DirectTransfer(f_rnd_octstring(10))); + f_iu2iuh(tx_ranap_pdu); + + f_cn_iu_release_procedure(); +} +private function f_TC_rua_dt_during_sccp_wait_cc(boolean is_ps) runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + /* Instruct RAN_Emulation to avoid accepting the conn, we'll trigger an + * SCCP CC by sending a N-CONNECT RESP primitive in ConnHdlr. */ + g_ran_ops.ranap_connect_ind_auto_res := false; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_rua_dt_during_sccp_wait_cc), f_TestHdlrParams(6, is_ps)); + vc_conn.done; + + f_shutdown_helper(); +} +testcase TC_cs_rua_dt_during_sccp_wait_cc() runs on test_CT { + f_TC_rua_dt_during_sccp_wait_cc(false); +}testcase TC_ps_rua_dt_during_sccp_wait_cc() runs on test_CT { + f_TC_rua_dt_during_sccp_wait_cc(true); +} + friend function f_tc_ps_rab_assignment(charstring id) runs on ConnHdlr { var RANAP_PDU tx; @@ -1578,7 +1628,6 @@ f_cn_iu_release_procedure(pfcp_teardown := g_pars.pfcp_pars.pfcp_enabled); } - testcase TC_ps_rab_assignment() runs on test_CT { var ConnHdlr vc_conn; g_num_hnbs := 1; @@ -2603,6 +2652,8 @@ execute(TC_cs_rua_disconnect_during_sccp_cr_cc()); execute(TC_cs_iu_release_req_rua_disconnect()); execute(TC_ps_iu_release_req_rua_disconnect()); + execute(TC_cs_rua_dt_during_sccp_wait_cc()); + execute(TC_ps_rua_dt_during_sccp_wait_cc()); execute(TC_ps_rab_assignment()); execute(TC_ps_rab_assignment_concurrent()); diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 3fca542..3777715 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='Titan' tests='58' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='Titan' tests='60' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='HNBGW_Tests' name='TC_hnb_register' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_hnb_register_duplicate_reuse_sctp_assoc' time='MASKED'/> @@ -29,6 +29,8 @@ <testcase classname='HNBGW_Tests' name='TC_cs_rua_disconnect_during_sccp_cr_cc' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_cs_iu_release_req_rua_disconnect' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_iu_release_req_rua_disconnect' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_cs_rua_dt_during_sccp_wait_cc' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_ps_rua_dt_during_sccp_wait_cc' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_concurrent' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Compl_on_1_cnlink' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40184?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97767db5560edf951202c876726d0c52b5b5b49f Gerrit-Change-Number: 40184 Gerrit-PatchSet: 4 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Configure local ASP/AS in osmo-hnbgw.cfg

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40218?usp=email ) Change subject: hnbgw: Configure local ASP/AS in osmo-hnbgw.cfg ...................................................................... hnbgw: Configure local ASP/AS in osmo-hnbgw.cfg This allows us using known port for the SCTP assoc, which can then be used to look up ASP in osmo-stp VTY. Change-Id: Ic04702b597f7217890ee58734c11b866fb14af8b --- M hnbgw/osmo-hnbgw.cfg 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 677be22..423cec5 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -37,6 +37,15 @@ cs7 instance 0 point-code 0.23.5 + asp asp-clnt-msc-0 2905 2906 m3ua + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role asp + sctp-role client + as as-clnt-msc-0 m3ua + asp asp-clnt-msc-0 + routing-key 0 0.23.5 + sccp-address msc-naught point-code 0.23.4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic04702b597f7217890ee58734c11b866fb14af8b Gerrit-Change-Number: 40218 Gerrit-PatchSet: 2 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Configure local ASP/AS in osmo-hnbgw.cfg

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40218?usp=email ) Change subject: hnbgw: Configure local ASP/AS in osmo-hnbgw.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic04702b597f7217890ee58734c11b866fb14af8b Gerrit-Change-Number: 40218 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 May 2025 14:59:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?usp=email ) Change subject: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx() ...................................................................... xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx() Change-Id: I6fe4f388b11991e7c7396c9d632b376e8591a8f3 --- M src/xua_asp_fsm.c 1 file changed, 5 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 4603734..11a34b4 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -173,32 +173,14 @@ /* add M3UA_IEI_ROUTE_CTX to xua_msg containig all routing keys of ASs within ASP */ static int xua_msg_add_asp_rctx(struct xua_msg *xua, struct osmo_ss7_asp *asp) { - struct osmo_ss7_as *as; uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; - unsigned int i = 0; + unsigned int cnt; - /* iterate over all ASs and build array of routing contexts */ - llist_for_each_entry(as, &asp->inst->as_list, list) { - if (!osmo_ss7_as_has_asp(as, asp)) - continue; - rctx[i++] = htonl(as->cfg.routing_key.context); - if (i >= ARRAY_SIZE(rctx)-1) { - break; - } - } - /* add xUA IE with routing contests to the message (if any) */ - if (i) { - /* bail out (and not add the IE) if there's only one routing context (and hence - * only one AS) within this ASP, and that routing context is zero, meaning no routing - * context IE shall be used */ - if (i == 1 && rctx[0] == 0) - return 0; - - xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, i*sizeof(uint32_t), (uint8_t *)rctx); - } - + cnt = ss7_asp_get_all_rctx_be(asp, rctx, ARRAY_SIZE(rctx), NULL); + if (cnt > 0) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, cnt*sizeof(uint32_t), (uint8_t *)rctx); /* return count of routing contexts added */ - return i; + return cnt; } /* ask the xUA implementation to transmit a specific message */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?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: I6fe4f388b11991e7c7396c9d632b376e8591a8f3 Gerrit-Change-Number: 40190 Gerrit-PatchSet: 2 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 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: asp: Make sure asp->{client,server} is nulled before destroy callback

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40193?usp=email ) Change subject: asp: Make sure asp->{client,server} is nulled before destroy callback ...................................................................... asp: Make sure asp->{client,server} is nulled before destroy callback disconnect_cb() in case of stream_cli and closed_cb() in case of stream_srv may call some libosmo-sigtran code. Make sure we don't access the pointer anymore in that case for safety. Change-Id: I3f0774eac630c8bc7e9a10f874e1c72763fd14a0 --- M src/osmo_ss7_asp.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index c054369..4044003 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -686,22 +686,27 @@ * announce disconnection to upper layers. */ int ss7_asp_disconnect_stream(struct osmo_ss7_asp *asp) { + struct osmo_stream_cli *cli; + struct osmo_stream_srv *srv; + /* First tear down previous state if existing: */ if (asp->cfg.is_server) { /* We are in server mode now */ if (asp->client) { /* if we previously were in client mode, * destroy it */ - osmo_stream_cli_destroy(asp->client); + cli = asp->client; asp->client = NULL; + osmo_stream_cli_destroy(cli); } } else { /* We are in client mode now */ if (asp->server) { /* if we previously were in server mode, * destroy it */ - osmo_stream_srv_destroy(asp->server); + srv = asp->server; asp->server = NULL; + osmo_stream_srv_destroy(srv); } if (asp->client) { /* Make sure we close the previous stream before starting a new one: */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40193?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: I3f0774eac630c8bc7e9a10f874e1c72763fd14a0 Gerrit-Change-Number: 40193 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: asp: Make sure previous stream_srv is immediatelly destroyed when req...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40194?usp=email ) Change subject: asp: Make sure previous stream_srv is immediatelly destroyed when requested ...................................................................... asp: Make sure previous stream_srv is immediatelly destroyed when requested This will be needed when the asp is in SCTP=server mode and we request it to shutdown/restart. Path in xua_accept_cb() for dynamic ASPs in SCTP=server mode needs to be fixed since it was wrongly calling osmo_ss7_asp_restart() and taking advantage of the fact that the asp->server was not being freed in that case. Change-Id: I8edd64234654ba987f35de2d7ad610e96bda27eb --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 4044003..02dbcb8 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -699,6 +699,12 @@ asp->client = NULL; osmo_stream_cli_destroy(cli); } + if (asp->server) { + /* Make sure we close the previous stream right now: */ + srv = asp->server; + asp->server = NULL; + osmo_stream_srv_destroy(srv); + } } else { /* We are in client mode now */ if (asp->server) { diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 52a3508..5483aae 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -153,7 +153,12 @@ oxs->cfg.local.host_cnt); ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &hostbuf_ptr, 1); - osmo_ss7_asp_restart(asp); + if ((rc = xua_asp_fsm_start(asp, asp->cfg.role, LOGL_DEBUG)) < 0) { + talloc_free(sock_name); + osmo_ss7_asp_destroy(asp); + return rc; + } + OSMO_ASSERT(asp->fi); } } if (!asp) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40194?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: I8edd64234654ba987f35de2d7ad610e96bda27eb Gerrit-Change-Number: 40194 Gerrit-PatchSet: 2 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?usp=email ) Change subject: Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS ...................................................................... Tx multiple Routing Contexts in NOTIFY on ASPs serving multiple AS Routing Context IE in NOTIFY msg should contain n X 32-bit integers, one for each Routing Context (AS) this ASP is serving. This fixes only 1 AS being announced during NOTIFY if the ASP was configured to server more than one AS. Change-Id: I646301ec3d08ef98f227cf4d19da1039e40cedd2 --- M include/osmocom/sigtran/sigtran_sap.h M src/m3ua.c M src/osmo_ss7_asp.c M src/ss7_asp.h M src/xua_as_fsm.c M src/xua_msg.c M src/xua_msg.h 7 files changed, 87 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/sigtran_sap.h b/include/osmocom/sigtran/sigtran_sap.h index 87504c8..610c711 100644 --- a/include/osmocom/sigtran/sigtran_sap.h +++ b/include/osmocom/sigtran/sigtran_sap.h @@ -39,7 +39,8 @@ uint16_t status_type; uint16_t status_info; uint32_t asp_id; - uint32_t route_ctx; + uint32_t route_ctx_count; + uint32_t route_ctx[OSMO_SS7_MAX_RCTX_COUNT]; char *info_string; }; diff --git a/src/m3ua.c b/src/m3ua.c index 04ee7c5..b64bfad 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -427,8 +427,11 @@ xua_msg_add_u32(xua, M3UA_IEI_ASP_ID, npar->asp_id); /* Optional Routing Context */ - if (npar->presence & NOTIFY_PAR_P_ROUTE_CTX) - xua_msg_add_u32(xua, M3UA_IEI_ROUTE_CTX, npar->route_ctx); + if (npar->presence & NOTIFY_PAR_P_ROUTE_CTX) { + xua_msg_add_u32_data(xua, M3UA_IEI_ROUTE_CTX, + npar->route_ctx_count * sizeof(npar->route_ctx[0]), + (uint8_t *)&npar->route_ctx[0]); + } /* Optional: Info String */ if (npar->info_string) @@ -468,7 +471,20 @@ } if (rctx_ie) { - npar->route_ctx = xua_msg_part_get_u32(rctx_ie); + if (rctx_ie->len & 0x03) { + LOGP(DLM3UA, LOGL_ERROR, + "M3UA NOTIFY with Routing Context IE length non-multiple of 4!\n"); + return -1; + } + if (rctx_ie->len > sizeof(npar->route_ctx)) { + LOGP(DLM3UA, LOGL_ERROR, + "M3UA NOTIFY with Routing Context IE containing > %zu items not supported!\n", + ARRAY_SIZE(npar->route_ctx)); + return -1; + } + npar->route_ctx_count = rctx_ie->len >> 2; + for (unsigned int i = 0; i < npar->route_ctx_count; i++) + npar->route_ctx[i] = ntohl(*(uint32_t *)&rctx_ie->dat[i << 2]); npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; } diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 02dbcb8..f2d511a 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -1313,8 +1313,8 @@ } /* Obtain all routing contexts (in network byte order) that exist within the given ASP */ -unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, - const struct osmo_ss7_as *excl_as) +static unsigned int _ss7_asp_get_all_rctx(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as, bool network_byte_order) { unsigned int count = 0; struct osmo_ss7_as *as; @@ -1328,8 +1328,25 @@ continue; if (count >= rctx_size) break; - rctx[count] = htonl(as->cfg.routing_key.context); + if (network_byte_order) + rctx[count] = htonl(as->cfg.routing_key.context); + else + rctx[count] = as->cfg.routing_key.context; count++; } return count; } + +/* Obtain all routing contexts (in network byte order) that exist within the given ASP */ +unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as) +{ + return _ss7_asp_get_all_rctx(asp, rctx, rctx_size, excl_as, true); +} + +/* Obtain all routing contexts (in host byte order) that exist within the given ASP */ +unsigned int ss7_asp_get_all_rctx(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as) +{ + return _ss7_asp_get_all_rctx(asp, rctx, rctx_size, excl_as, false); +} diff --git a/src/ss7_asp.h b/src/ss7_asp.h index bdde5bd..5dee90a 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -128,6 +128,8 @@ void ss7_asp_restart_after_reconfigure(struct osmo_ss7_asp *asp); void osmo_ss7_asp_remove_default_lm(struct osmo_ss7_asp *asp); +unsigned int ss7_asp_get_all_rctx(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, + const struct osmo_ss7_as *excl_as); unsigned int ss7_asp_get_all_rctx_be(const struct osmo_ss7_asp *asp, uint32_t *rctx, unsigned int rctx_size, const struct osmo_ss7_as *excl_as); diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 5adc469..7f7c7d6 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -39,7 +39,15 @@ return msg; } -static void tx_notify(struct osmo_ss7_asp *asp, const struct osmo_xlm_prim_notify *npar) +static int fill_notify_route_ctx(const struct osmo_ss7_asp *asp, struct osmo_xlm_prim_notify *npar) +{ + npar->route_ctx_count = ss7_asp_get_all_rctx(asp, npar->route_ctx, ARRAY_SIZE(npar->route_ctx), NULL); + if (npar->route_ctx_count > 0) + npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; + return 0; +} + +static void tx_notify(struct osmo_ss7_asp *asp, struct osmo_xlm_prim_notify *npar) { const char *type_name, *info_name, *info_str; type_name = get_value_string(m3ua_ntfy_type_names, npar->status_type); @@ -48,6 +56,7 @@ LOGPASP(asp, DLSS7, LOGL_INFO, "Tx NOTIFY Type %s:%s (%s)\n", type_name, info_name, info_str); + fill_notify_route_ctx(asp, npar); struct msgb *msg = encode_notify(npar); osmo_ss7_asp_send(asp, msg); } @@ -93,6 +102,7 @@ LOGPASP(asp, DLSS7, LOGL_INFO, "Tx NOTIFY Type %s:%s (%s)\n", type_name, info_name, info_str); + fill_notify_route_ctx(asp, npar); msg = encode_notify(npar); osmo_ss7_asp_send(asp, msg); sent++; @@ -221,8 +231,6 @@ static void fill_notify_statchg_pars(const struct osmo_fsm_inst *fi, struct osmo_xlm_prim_notify *npar) { - struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; - struct osmo_ss7_as *as = xafp->as; *npar = (struct osmo_xlm_prim_notify){ .status_type = M3UA_NOTIFY_T_STATCHG, }; @@ -242,12 +250,6 @@ /* Nothing will be sent anyway... */ return; } - - /* Add the routing context, if it is configured */ - if (as->cfg.routing_key.context) { - npar->presence |= NOTIFY_PAR_P_ROUTE_CTX; - npar->route_ctx = as->cfg.routing_key.context; - } } /* is the given AS one with a single ASP of IPA type? */ diff --git a/src/xua_msg.c b/src/xua_msg.c index 5584b82..d32d824 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -83,6 +83,38 @@ return 0; } +/* Add Array of host-byte-order u32 converting them to network-byte-order: */ +int xua_msg_add_u32_data(struct xua_msg *msg, uint16_t tag, + uint16_t len, const uint8_t *dat) +{ + struct xua_msg_part *part; + + if (len & 0x03) + return -1; /* non-multiple-of-4 */ + + part = talloc_zero(msg, struct xua_msg_part); + if (!part) + return -1; + + part->tag = tag; + part->len = len; + + /* do we have any data? */ + if (part->len != 0) { + part->dat = talloc_size(part, len); + if (!part->dat) { + talloc_free(part); + return -1; + } + /* Copy over data converting it to network-byte-order: */ + for (unsigned int i = 0; i < len ; i += sizeof(uint32_t)) + *((uint32_t *)&part->dat[i]) = htonl(*(uint32_t *)&dat[i]); + } + + llist_add_tail(&part->entry, &msg->headers); + return 0; +} + struct xua_msg_part *xua_msg_find_tag(const struct xua_msg *xua, uint16_t tag) { struct xua_msg_part *part; diff --git a/src/xua_msg.h b/src/xua_msg.h index 79af86f..80d4c79 100644 --- a/src/xua_msg.h +++ b/src/xua_msg.h @@ -76,6 +76,7 @@ void xua_msg_free(struct xua_msg *msg); int xua_msg_add_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); +int xua_msg_add_u32_data(struct xua_msg *msg, uint16_t tag, uint16_t len, const uint8_t *dat); struct xua_msg_part *xua_msg_find_tag(const struct xua_msg *msg, uint16_t tag); int xua_msg_free_tag(struct xua_msg *xua, uint16_t tag); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40011?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: I646301ec3d08ef98f227cf4d19da1039e40cedd2 Gerrit-Change-Number: 40011 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: asp: Avoid accessing dyn sctp-server ASP after closing conn during re...

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40214?usp=email ) Change subject: asp: Avoid accessing dyn sctp-server ASP after closing conn during restart ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40214?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: Ic9f2b01ddcf38d93396701cf5d406d1cfd18704d Gerrit-Change-Number: 40214 Gerrit-PatchSet: 1 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: Tue, 06 May 2025 14:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: Implement ASP adm state shutdown

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40197?usp=email ) Change subject: Implement ASP adm state shutdown ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40197?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: I7e4eedb65c4f2952f8b39ca4c539ca2f40e9946c Gerrit-Change-Number: 40197 Gerrit-PatchSet: 1 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 May 2025 14:58:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx()

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?usp=email ) Change subject: xua_asp_fsm: Reuse ss7_asp_get_all_rctx_be() in xua_msg_add_asp_rctx() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40190?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: I6fe4f388b11991e7c7396c9d632b376e8591a8f3 Gerrit-Change-Number: 40190 Gerrit-PatchSet: 2 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: Tue, 06 May 2025 14:58:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025