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

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3]

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?usp=email ) Change subject: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291/comment/6af2cc5c_7ac96… : PS1, Line 464: if (0) { I know you just moved this, but this is commented out code without the actual comments (and also exactly the same code as in the if above). So I'd just remove the code, and change the TOOD(!) note into a comment saying that coupling is not supported (if that is actually the case, I have no idea). -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?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: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 Gerrit-Change-Number: 40291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:24:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Validate SUA address parsing succeeds [1/3]

by daniel

Attention is currently required from: laforge, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email ) Change subject: sccp: Validate SUA address parsing succeeds [1/3] ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?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: I36387eb53e160425844b20a296fa5dc75db1ec54 Gerrit-Change-Number: 40289 Gerrit-PatchSet: 2 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-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 13:19:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by daniel

Attention is currently required from: fixeria, laforge, neels, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?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: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 6 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 12:51:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: m3ua: Discard rx MSUs for non-active AS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?usp=email ) Change subject: m3ua: Discard rx MSUs for non-active AS ...................................................................... m3ua: Discard rx MSUs for non-active AS TODO originally added long time ago in d11fa298c5f179a03307c185b0d433e6ba61d40f. Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 --- M src/m3ua.c M src/ss7_as.c M src/ss7_as.h 3 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/94/40294/1 diff --git a/src/m3ua.c b/src/m3ua.c index 35e2bb7..1180ead 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -622,13 +622,17 @@ } rc = xua_find_as_for_asp(&as, asp, rctx_ie); - if (rc) + if (rc) { goto ret_free; + } + + if (!osmo_ss7_as_active(as)) { + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_DISCARD); + goto ret_free; + } rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); - /* FIXME: check for AS state == ACTIVE */ - /* store the MTP-level information in the xua_msg for use by * higher layer protocols */ dh = data_hdr_from_m3ua(xua); diff --git a/src/ss7_as.c b/src/ss7_as.c index 4dedfc3..fac5ffe 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -58,6 +58,7 @@ #define SS7_AS_CTR_RX_MSU_SLS_STR "Number of MSU received on SLS " #define SS7_AS_CTR_TX_MSU_SLS_STR "Number of MSU transmitted on SLS " static const struct rate_ctr_desc ss7_as_rcd[] = { + [SS7_AS_CTR_RX_MSU_DISCARD] = { "rx:msu:discard", "Total number of incoming MSU discarded" }, [SS7_AS_CTR_RX_MSU_TOTAL] = { "rx:msu:total", "Total number of MSU received" }, [SS7_AS_CTR_RX_MSU_SLS_0] = { "rx:msu:sls:0", SS7_AS_CTR_RX_MSU_SLS_STR "0" }, [SS7_AS_CTR_RX_MSU_SLS_1] = { "rx:msu:sls:1", SS7_AS_CTR_RX_MSU_SLS_STR "1" }, diff --git a/src/ss7_as.h b/src/ss7_as.h index bc17726..5bc3574 100644 --- a/src/ss7_as.h +++ b/src/ss7_as.h @@ -25,6 +25,7 @@ }; enum ss7_as_ctr { + SS7_AS_CTR_RX_MSU_DISCARD, SS7_AS_CTR_RX_MSU_TOTAL, SS7_AS_CTR_RX_MSU_SLS_0, SS7_AS_CTR_RX_MSU_SLS_1, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40294?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: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 Gerrit-Change-Number: 40294 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by pespin

Attention is currently required from: daniel, fixeria, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 6: (1 comment) File src/sccp_scrc.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250/comment/63191475_f4382… : PS3, Line 75: inst > Yes I'm fixing all of this right now, will submit soon. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?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: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 6 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(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: Tue, 13 May 2025 11:55:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: Rename files in src: s/osmo_ss7/ss7/g

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?usp=email ) Change subject: Rename files in src: s/osmo_ss7/ss7/g ...................................................................... Rename files in src: s/osmo_ss7/ss7/g This matches the related internal files, and drops the unnecessary osmo_ prefix from the files. Change-Id: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 --- M src/Makefile.am R src/ss7.c R src/ss7_as.c R src/ss7_asp.c R src/ss7_asp_peer.c R src/ss7_combined_linkset.c R src/ss7_hmrt.c R src/ss7_instance.c R src/ss7_link.c R src/ss7_linkset.c R src/ss7_route.c R src/ss7_route_table.c R src/ss7_user.c R src/ss7_vty.c R src/ss7_xua_srv.c 15 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/93/40293/1 diff --git a/src/Makefile.am b/src/Makefile.am index f108f06..bba3d22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,20 +41,6 @@ libosmo_sigtran_la_SOURCES = \ ipa.c \ m3ua.c \ - osmo_ss7.c \ - osmo_ss7_as.c \ - osmo_ss7_asp.c \ - osmo_ss7_asp_peer.c \ - osmo_ss7_combined_linkset.c \ - osmo_ss7_hmrt.c \ - osmo_ss7_instance.c \ - osmo_ss7_link.c \ - osmo_ss7_linkset.c \ - osmo_ss7_vty.c \ - osmo_ss7_xua_srv.c \ - osmo_ss7_route.c \ - osmo_ss7_route_table.c \ - osmo_ss7_user.c \ sccp2sua.c \ sccp_helpers.c \ sccp_lbcs.c \ @@ -66,6 +52,20 @@ sccp_types.c \ sccp_user.c \ sccp_vty.c \ + ss7.c \ + ss7_as.c \ + ss7_asp.c \ + ss7_asp_peer.c \ + ss7_combined_linkset.c \ + ss7_hmrt.c \ + ss7_instance.c \ + ss7_link.c \ + ss7_linkset.c \ + ss7_vty.c \ + ss7_xua_srv.c \ + ss7_route.c \ + ss7_route_table.c \ + ss7_user.c \ sua.c \ xua_asp_fsm.c \ xua_as_fsm.c \ diff --git a/src/osmo_ss7.c b/src/ss7.c similarity index 100% rename from src/osmo_ss7.c rename to src/ss7.c diff --git a/src/osmo_ss7_as.c b/src/ss7_as.c similarity index 100% rename from src/osmo_ss7_as.c rename to src/ss7_as.c diff --git a/src/osmo_ss7_asp.c b/src/ss7_asp.c similarity index 100% rename from src/osmo_ss7_asp.c rename to src/ss7_asp.c diff --git a/src/osmo_ss7_asp_peer.c b/src/ss7_asp_peer.c similarity index 100% rename from src/osmo_ss7_asp_peer.c rename to src/ss7_asp_peer.c diff --git a/src/osmo_ss7_combined_linkset.c b/src/ss7_combined_linkset.c similarity index 100% rename from src/osmo_ss7_combined_linkset.c rename to src/ss7_combined_linkset.c diff --git a/src/osmo_ss7_hmrt.c b/src/ss7_hmrt.c similarity index 100% rename from src/osmo_ss7_hmrt.c rename to src/ss7_hmrt.c diff --git a/src/osmo_ss7_instance.c b/src/ss7_instance.c similarity index 100% rename from src/osmo_ss7_instance.c rename to src/ss7_instance.c diff --git a/src/osmo_ss7_link.c b/src/ss7_link.c similarity index 100% rename from src/osmo_ss7_link.c rename to src/ss7_link.c diff --git a/src/osmo_ss7_linkset.c b/src/ss7_linkset.c similarity index 100% rename from src/osmo_ss7_linkset.c rename to src/ss7_linkset.c diff --git a/src/osmo_ss7_route.c b/src/ss7_route.c similarity index 100% rename from src/osmo_ss7_route.c rename to src/ss7_route.c diff --git a/src/osmo_ss7_route_table.c b/src/ss7_route_table.c similarity index 100% rename from src/osmo_ss7_route_table.c rename to src/ss7_route_table.c diff --git a/src/osmo_ss7_user.c b/src/ss7_user.c similarity index 100% rename from src/osmo_ss7_user.c rename to src/ss7_user.c diff --git a/src/osmo_ss7_vty.c b/src/ss7_vty.c similarity index 100% rename from src/osmo_ss7_vty.c rename to src/ss7_vty.c diff --git a/src/osmo_ss7_xua_srv.c b/src/ss7_xua_srv.c similarity index 100% rename from src/osmo_ss7_xua_srv.c rename to src/ss7_xua_srv.c -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40293?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: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 Gerrit-Change-Number: 40293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp: Validate SUA address parsing succeeds [1/3]

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email ) Change subject: sccp: Validate SUA address parsing succeeds [1/3] ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?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: I36387eb53e160425844b20a296fa5dc75db1ec54 Gerrit-Change-Number: 40289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 13 May 2025 11:46:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3]

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?usp=email ) Change subject: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] ...................................................................... sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3] Follow more closely the diagrams in Figure C.1/Q.714. This is important because according to ITU Q.714 section 2.2.2, the "Addressing information" is obtained in a different way: * CL msgs (N-UNITDATA.req): Obtained from the "Called address" parameter * CO msgs == CR (N-CONNECT.req): Obtained from the "Called address" parameter * CO msgs != CR (eg. N-DATA.req): Obtained from connection info (DPC + MTP-SAP instance). Change-Id: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 --- M src/sccp_scrc.c 1 file changed, 23 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/91/40291/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 990987a..a99e26d 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -245,12 +245,20 @@ /* "Figure C.1/Q.714 - SCCP routing control procedures (SCRC) (sheet 5 of 12)" * Only used for Connection Oriented messages */ -static int scrc_node_2(struct osmo_sccp_instance *inst, struct xua_msg *xua, - const struct osmo_sccp_addr *called) +static int scrc_node_2(struct osmo_sccp_instance *inst, struct xua_msg *xua) { - /* Node 2 on Sheet 5, only CO */ + struct osmo_sccp_addr called; + int rc; + + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } + /* Is DPC accessible? */ - if (!dpc_accessible(inst, called->pc)) { + if (!dpc_accessible(inst, called.pc)) { /* Error: MTP Failure */ /* Routing Failure SCRC -> SCOC */ sccp_scoc_rx_scrc_rout_fail(inst, xua, @@ -258,14 +266,14 @@ return 0; } /* Is SCCP available? */ - if (!sccp_available(inst, called)) { + if (!sccp_available(inst, &called)) { /* Error: SCCP Failure */ /* Routing Failure SCRC -> SCOC */ sccp_scoc_rx_scrc_rout_fail(inst, xua, SCCP_RETURN_CAUSE_SCCP_FAILURE); return 0; } - return scrc_node_12(inst, xua, called); + return scrc_node_12(inst, xua, &called); } static int scrc_node_7(struct osmo_sccp_instance *inst, @@ -448,6 +456,15 @@ LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); + /* Is this a CR message ? */ + if (xua->hdr.msg_type != SUA_CO_CORE) + return scrc_node_2(inst, xua); + + /* TOOD: Coupling performed (not supported) */ + if (0) { + return scrc_node_2(inst, xua); + } + rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); if (rc < 0) { LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", @@ -455,15 +472,6 @@ return -EINVAL; } - /* Is this a CR message ? */ - if (xua->hdr.msg_type != SUA_CO_CORE) - return scrc_node_2(inst, xua, &called); - - /* TOOD: Coupling performed (not supported) */ - if (0) { - return scrc_node_2(inst, xua, &called); - } - return scrc_local_out_common(inst, xua, &called); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40291?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: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 Gerrit-Change-Number: 40291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp: Improve spec references in code documentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40290?usp=email ) Change subject: sccp: Improve spec references in code documentation ...................................................................... sccp: Improve spec references in code documentation Change-Id: Ie43f9472322e7b6ed3ce8fc91408c074ddb98378 --- M src/sccp_scrc.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/90/40290/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 1ca7cfe..abf86e4 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -242,6 +242,8 @@ return gen_mtp_transfer_req_xua(inst, xua, called); } +/* "Figure C.1/Q.714 - SCCP routing control procedures (SCRC) (sheet 5 of 12)" + * Only used for Connection Oriented messages */ static int scrc_node_2(struct osmo_sccp_instance *inst, struct xua_msg *xua, const struct osmo_sccp_addr *called) { @@ -394,6 +396,9 @@ return 0; } +/* "Figure C.1/Q.714 - SCCP routing control procedures (SCRC) (sheet 1 of 12)", + * Group of blocks on the bottom-right starting from "Call-ed address includes DPC" + */ static int scrc_local_out_common(struct osmo_sccp_instance *inst, struct xua_msg *xua, const struct osmo_sccp_addr *called) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40290?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: Ie43f9472322e7b6ed3ce8fc91408c074ddb98378 Gerrit-Change-Number: 40290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?usp=email ) Change subject: sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR [3/3] ...................................................................... sccp: SCOC -> SCRC: Use DPC provided from conn info in msg_type != CR [3/3] See Q.714 section 2.2 for more info on how the "addressing information" is obtained depending on the msg. Change-Id: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 --- M src/sccp_scrc.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/92/40292/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index a99e26d..c80e917 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -252,7 +252,16 @@ rc = sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); if (rc < 0) { - LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n", + /* Q.714 2.2.2: It is expectd that CO msgs != CREQ have no "Called Address". + * Use MTP DPC info provided by SCOC in xua->mtp.dpc instead. */ + called = (struct osmo_sccp_addr){ + .ri = OSMO_SCCP_RI_SSN_PC, + .presence = OSMO_SCCP_ADDR_T_PC, + .pc = xua->mtp.dpc, + }; + } + if (!(called.presence & OSMO_SCCP_ADDR_T_PC)) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid DPC address information\n", xua_hdr_dump(xua, &xua_dialect_sua)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40292?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: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 Gerrit-Change-Number: 40292 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025