- gerrit-log - lists.osmocom.org

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Introduce tests/osmo-config-merge testsuite This allows catching current bugs and possible regressions when fixing them. For instance, testB2.ok already shows a bug where lots of lines expected to be merged under the "cs7 instance 0" end up put in an un expected place. This happens due to comments being used by osmo-config-merge during tree creation, and will be fixed in a follow-up commit. Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 --- M .gitignore M configure.ac M tests/Makefile.am A tests/osmo-config-merge/Makefile.am A tests/osmo-config-merge/atlocal.in A tests/osmo-config-merge/testA.cfg A tests/osmo-config-merge/testA.confmerge A tests/osmo-config-merge/testA.ok A tests/osmo-config-merge/testB.cfg A tests/osmo-config-merge/testB.confmerge A tests/osmo-config-merge/testB.ok A tests/osmo-config-merge/testB2.cfg A tests/osmo-config-merge/testB2.confmerge A tests/osmo-config-merge/testB2.ok A tests/osmo-config-merge/testsuite.at 15 files changed, 1,095 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 7 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: epdg: introduce testenv support

by pespin

Attention is currently required from: lynxis lazus, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email ) Change subject: epdg: introduce testenv support ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: > (open thread) as mentioned in private, feel free to take over it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?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: I5063e6ef55e8918653e9634237103790f47784a2 Gerrit-Change-Number: 40305 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 16 May 2025 11:14:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/kernel/fragment: enable osmo-epdg options

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40307?usp=email ) Change subject: scripts/kernel/fragment: enable osmo-epdg options ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > with this I can get the tests we currently have in osmo-ttcn3-hacks to pass. ttcn3-epdg-test doesn't test the strongswan part, TTCN3 emulates strongswan by sending GSUP to osmo-epdg, so we are only testing *after* the ipsec part. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia60d5c1f5ade31e37293b40340e789f04ea86287 Gerrit-Change-Number: 40307 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 16 May 2025 11:13:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: scripts/kernel/fragment: enable osmo-epdg options

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/40307?usp=email ) Change subject: scripts/kernel/fragment: enable osmo-epdg options ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > are you sure yet those are all that's required, like the ipsec + related support needed for strongsw […] with this I can get the tests we currently have in osmo-ttcn3-hacks to pass. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia60d5c1f5ade31e37293b40340e789f04ea86287 Gerrit-Change-Number: 40307 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 16 May 2025 09:41:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp_scoc.c: validate success of sua_addr_parse()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40298?usp=email ) Change subject: sccp_scoc.c: validate success of sua_addr_parse() ...................................................................... sccp_scoc.c: validate success of sua_addr_parse() Related: Coverity CID#523214 Change-Id: I008ee6f9024247c14d986a2baba061cc12bf68ec --- M src/sccp_scoc.c 1 file changed, 29 insertions(+), 5 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/sccp_scoc.c b/src/sccp_scoc.c index 4e390af..c122ce4 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -916,8 +916,14 @@ //udisp->in_sequence_control; if (xua) { udisp->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); - if (xua_msg_find_tag(xua, SUA_IEI_SRC_ADDR)) - sua_addr_parse(&udisp->responding_addr, xua, SUA_IEI_SRC_ADDR); + if (xua_msg_find_tag(xua, SUA_IEI_SRC_ADDR)) { + if (sua_addr_parse(&udisp->responding_addr, xua, SUA_IEI_SRC_ADDR) < 0) { + LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + talloc_free(scu_prim->oph.msg); + return; + } + } data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); udisp->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE); if (data_ie) { @@ -1035,11 +1041,16 @@ case SCOC_E_RCOC_CONN_IND: xua = data; /* copy relevant parameters from xua to conn */ - sua_addr_parse(&conn->calling_addr, xua, SUA_IEI_SRC_ADDR); - sua_addr_parse(&conn->called_addr, xua, SUA_IEI_DEST_ADDR); conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF); conn->sccp_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) & 3; conn->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE); + + rc = sua_addr_parse(&conn->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + goto refuse_destroy_conn; + } /* 3.1.6.1 The originating node of the CR message * (identified by the OPC in the calling party address * or by default by the OPC in the MTP label, [and the @@ -1052,12 +1063,24 @@ conn->remote_pc = xua->mtp.opc; } + rc = sua_addr_parse(&conn->called_addr, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + goto refuse_destroy_conn; + } + osmo_fsm_inst_state_chg(fi, S_CONN_PEND_IN, 0, 0); /* N-CONNECT.ind to User */ scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION); break; } + return; + +refuse_destroy_conn: + xua_gen_encode_and_send(conn, event, NULL, SUA_CO_COREF); + osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0); } static void scoc_fsm_idle_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) @@ -1405,7 +1428,8 @@ S(SCOC_E_RCOC_RLSD_IND) | S(SCOC_E_RCOC_REL_COMPL_IND) | S(SCOC_E_RCOC_OTHER_NPDU), - .out_state_mask = S(S_CONN_PEND_OUT) | + .out_state_mask = S(S_IDLE) | + S(S_CONN_PEND_OUT) | S(S_CONN_PEND_IN), }, [S_CONN_PEND_IN] = { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40298?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: I008ee6f9024247c14d986a2baba061cc12bf68ec Gerrit-Change-Number: 40298 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>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp: sccp_addr_to_str_buf(): Use osmo_ss7_pointcode_print_buf()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40306?usp=email ) Change subject: sccp: sccp_addr_to_str_buf(): Use osmo_ss7_pointcode_print_buf() ...................................................................... sccp: sccp_addr_to_str_buf(): Use osmo_ss7_pointcode_print_buf() During logging, the logging macro may already be using the static buffer API to log context about a related PC. Hence, calling it here may overwrite it. Instead, use osmo_ss7_pointcode_print_buf(). It specially makes sense in this API which is already a _buf() API, where the user precisely expects no use of static buffers. Change-Id: Ib54984e755dca16d5be4d3d5dac82faa38e83c79 --- M src/sccp_helpers.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c index 6643e4e..39099fd 100644 --- a/src/sccp_helpers.c +++ b/src/sccp_helpers.c @@ -355,11 +355,12 @@ { struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; char ipbuf[INET6_ADDRSTRLEN]; + char buf_pc[MAX_PC_STR_LEN]; OSMO_STRBUF_PRINTF(sb, "RI=%s", osmo_sccp_routing_ind_name(addr->ri)); if (addr->presence & OSMO_SCCP_ADDR_T_PC) - OSMO_STRBUF_PRINTF(sb, "%cPC=%s", sep_char, osmo_ss7_pointcode_print(ss7, addr->pc)); + OSMO_STRBUF_PRINTF(sb, "%cPC=%s", sep_char, osmo_ss7_pointcode_print_buf(buf_pc, sizeof(buf_pc), ss7, addr->pc)); if (addr->presence & OSMO_SCCP_ADDR_T_SSN) OSMO_STRBUF_PRINTF(sb, "%cSSN=%s", sep_char, osmo_sccp_ssn_name(addr->ssn)); if (addr->presence & OSMO_SCCP_ADDR_T_IPv4) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40306?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: Ib54984e755dca16d5be4d3d5dac82faa38e83c79 Gerrit-Change-Number: 40306 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>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Log remote PC in LOGPSCC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40299?usp=email ) Change subject: sccp: Log remote PC in LOGPSCC ...................................................................... sccp: Log remote PC in LOGPSCC This information was lacking as would have been useful when looking at some logs. Change-Id: Ifa3670f3f0894c3334299c6c9826a17bd63dd9ae --- M src/sccp_scoc.c 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index c122ce4..4165ca0 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -63,6 +63,7 @@ #include "xua_internal.h" #include "sccp_internal.h" +#include "ss7_internal.h" #include "ss7_instance.h" #define S(x) (1 << (x)) @@ -128,7 +129,8 @@ struct osmo_timer_list t_rep_rel; }; #define _LOGPSCC(scc, subsys, level, fmt, args ...) \ - _LOGPSCU((scc)->user, subsys, level, "CONN(%d) " fmt, (conn)->conn_id, ## args) + _LOGPSCU((scc)->user, subsys, level, "CONN(%d,remPC=%u=%s) " fmt, \ + (conn)->conn_id, (conn)->remote_pc, osmo_ss7_pointcode_print((conn)->inst->ss7, (conn)->remote_pc), ## args) #define LOGPSCC(scc, level, fmt, args ...) \ _LOGPSCC(scc, DLSCCP, level, fmt, ## args) @@ -1808,11 +1810,14 @@ static void sccp_scoc_rx_inval_opc(struct sccp_connection *conn, struct xua_msg *xua) { + char buf_opc[MAX_PC_STR_LEN]; + LOGPSCC(conn, LOGL_NOTICE, - "Received message %s for opc=%u=%s on conn with mismatching remote pc=%u=%s\n", + "Received message %s on conn with mismatching remote pc=%u=%s\n", xua_hdr_dump(xua, &xua_dialect_sua), - xua->mtp.opc, osmo_ss7_pointcode_print(conn->inst->ss7, xua->mtp.opc), - conn->remote_pc, osmo_ss7_pointcode_print2(conn->inst->ss7, conn->remote_pc)); + xua->mtp.opc, + osmo_ss7_pointcode_print_buf(buf_opc, sizeof(buf_opc), conn->inst->ss7, xua->mtp.opc)); + /* we have received a message with invalid origin PC and thus * apply the action indicated in Table B.2/Q.714 */ switch (xua->hdr.msg_type) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40299?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: Ifa3670f3f0894c3334299c6c9826a17bd63dd9ae Gerrit-Change-Number: 40299 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>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp_demo_use: Log rx N-PCSTATE.ind

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40301?usp=email ) Change subject: sccp_demo_use: Log rx N-PCSTATE.ind ...................................................................... sccp_demo_use: Log rx N-PCSTATE.ind Change-Id: I19ff96c5892af412333ae413d95416c592e87f5c --- M examples/sccp_test_server.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/examples/sccp_test_server.c b/examples/sccp_test_server.c index aa3a76c..11ec258 100644 --- a/examples/sccp_test_server.c +++ b/examples/sccp_test_server.c @@ -43,9 +43,12 @@ static int echo_prim_cb(struct osmo_prim_hdr *oph, void *_scu) { struct osmo_sccp_user *scu = _scu; + struct osmo_sccp_instance *sccp = NULL; + struct osmo_ss7_instance *ss7 = NULL; struct osmo_scu_prim *scu_prim = (struct osmo_scu_prim *) oph; const uint8_t *data = msgb_l2(oph->msg); unsigned int data_len = msgb_l2len(oph->msg); + char buf_pc[32]; switch (OSMO_PRIM_HDR(&scu_prim->oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): @@ -72,6 +75,15 @@ scu_prim->u.disconnect.conn_id, scu_prim->u.disconnect.cause, scu_prim->u.disconnect.importance); break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION): + sccp = osmo_sccp_get_sccp(scu); + ss7 = osmo_sccp_get_ss7(sccp); + LOGP(DMAIN, LOGL_INFO, "Got N-PCSTATE.ind (affected_pc=%u=%s sp_status=%s remote_sccp_status=%s)\n", + scu_prim->u.pcstate.affected_pc, + osmo_ss7_pointcode_print_buf(buf_pc, sizeof(buf_pc), ss7, scu_prim->u.pcstate.affected_pc), + osmo_sccp_sp_status_name(scu_prim->u.pcstate.sp_status), + osmo_sccp_rem_sccp_status_name(scu_prim->u.pcstate.remote_sccp_status)); + break; default: LOGP(DMAIN, LOGL_NOTICE, "Unknown primitive %s\n", osmo_scu_prim_name(oph)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40301?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: I19ff96c5892af412333ae413d95416c592e87f5c Gerrit-Change-Number: 40301 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>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp_scoc.c: Log SCRC Routing Failure return cause

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40300?usp=email ) Change subject: sccp_scoc.c: Log SCRC Routing Failure return cause ...................................................................... sccp_scoc.c: Log SCRC Routing Failure return cause Change-Id: I75ce13de26c443ca5b496a00618f44e82fcf1cfa --- M src/sccp_scoc.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 4165ca0..c977110 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1603,7 +1603,8 @@ uint32_t conn_id; struct sccp_connection *conn; - LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure for message %s\n", + LOGPSCI(inst, LOGL_NOTICE, "SCRC Routing Failure (%s) for message %s\n", + osmo_sccp_return_cause_name(return_cause), xua_hdr_dump(xua, &xua_dialect_sua)); /* try to dispatch to connection FSM (if any) */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40300?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: I75ce13de26c443ca5b496a00618f44e82fcf1cfa Gerrit-Change-Number: 40300 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>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp_scoc: Match local conn by src_ref, not dest_ref

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40302?usp=email ) Change subject: sccp_scoc: Match local conn by src_ref, not dest_ref ...................................................................... sccp_scoc: Match local conn by src_ref, not dest_ref SCRC Routing Failure is dispatched when a local SCCP Connection Oriented message fails to be routed to a peer. Hence, in order to figure out if the msg belons to a local conn, we need to use the src_ref (the sender), not the dst_ref (the peer's id). As a result, event SCOC_E_RCOC_ROUT_FAIL_IND was potentially being set to the wrong connection FSM. Change-Id: I0090f4088de407b476cfb0a6d652b384af714306 --- M src/sccp_scoc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index c977110..a725a02 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1608,7 +1608,7 @@ xua_hdr_dump(xua, &xua_dialect_sua)); /* try to dispatch to connection FSM (if any) */ - conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF); + conn_id = xua_msg_get_u32(xua, SUA_IEI_SRC_REF); conn = conn_find_by_id(inst, conn_id); if (conn) { osmo_fsm_inst_dispatch(conn->fi, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40302?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: I0090f4088de407b476cfb0a6d652b384af714306 Gerrit-Change-Number: 40302 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>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log