- gerrit-log - lists.osmocom.org

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite
by fixeria 14 May '25

14 May '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/653c8e2b_9937bd1d?… : PS4, Line 7: testsuite Can you explain why is it a whole new testsuite and not just part of the existing testsuite? -- 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: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 May 2025 07:26:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[L] Change in libosmocore[master]: osmo-config-merge: Fix comments with different indentation creating m...
by laforge 14 May '25

14 May '25

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email ) Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 Gerrit-Change-Number: 40296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 May 2025 07:25:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite
by laforge 14 May '25

14 May '25

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: Code-Review+1 -- 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: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 May 2025 07:24:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite
by pespin 13 May '25

13 May '25

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, 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 (#4). The following approvals got outdated and were removed: Code-Review+1 by laforge, 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,100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/4 -- 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: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmocore[master]: osmo-config-merge: Fix comments with different indentation creating m...
by pespin 13 May '25

13 May '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email ) Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems ...................................................................... osmo-config-merge: Fix comments with different indentation creating merge problems VTY comments are not part of the tree structure, since they can be placed anywhere and are just ignored. Hence, ignore them when generating the tree structure during file read. This has the backside that of course when merging files, comments on the 0-level show up in the end in testB.ok since the content below it in testB.confmerge is now merged (properly) into previous nodes. This can be slightly improved by placing the comments in the proper indentation level, since if a new node is appended from the .confmerge, they will be added in order and hence will show up properly. Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 --- M tests/osmo-config-merge/testA.ok M tests/osmo-config-merge/testB.ok M tests/osmo-config-merge/testB2.ok M utils/osmo-config-merge.c 4 files changed, 156 insertions(+), 128 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/40296/1 diff --git a/tests/osmo-config-merge/testA.ok b/tests/osmo-config-merge/testA.ok index b0768ad..c244bd0 100644 --- a/tests/osmo-config-merge/testA.ok +++ b/tests/osmo-config-merge/testA.ok @@ -15,7 +15,6 @@ logging print level 1 logging timestamp 1 logging color 1 -! logging level set-all notice logging level rsl info logging level meas info @@ -28,6 +27,7 @@ logging level lmib info logging level lmux info ! +! line vty no login bind 127.0.0.1 diff --git a/tests/osmo-config-merge/testB.ok b/tests/osmo-config-merge/testB.ok index 64860f8..0edb5a9 100644 --- a/tests/osmo-config-merge/testB.ok +++ b/tests/osmo-config-merge/testB.ok @@ -54,6 +54,74 @@ local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted + asp asp-sender 9999 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver0 10000 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver1 10001 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-client0 10002 2906 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client60-norctx0 11060 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client61-norctx0 11061 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 + as as-client60-norctx m3ua + routing-key 0 60 + asp asp-client60-norctx0 + as as-client61-norctx m3ua + routing-key 0 61 + asp asp-client61-norctx0 + route-table system + update route 23 16777215 linkset as-sender + update route 42 16777215 linkset as-receiver + update route 55 16777215 linkset as-client + update route 60 16777215 linkset as-client60-norctx + update route 61 16777215 linkset as-client61-norctx + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted ! ! IPA AS/ASP: ! @@ -124,77 +192,9 @@ ! !M3UA AS/ASP: ! - asp asp-sender 9999 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver0 10000 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver1 10001 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-client0 10002 2906 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client60-norctx0 11060 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client61-norctx0 11061 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - as as-sender m3ua - asp asp-sender - routing-key 1023 23 - as as-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 - as as-client60-norctx m3ua - routing-key 0 60 - asp asp-client60-norctx0 - as as-client61-norctx m3ua - routing-key 0 61 - asp asp-client61-norctx0 ! ! ROUTING TABLE: ! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 60 16777215 linkset as-client60-norctx - update route 61 16777215 linkset as-client61-norctx ! !SERVERS: ! - listen m3ua 2905 - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted diff --git a/tests/osmo-config-merge/testB2.ok b/tests/osmo-config-merge/testB2.ok index 6a44388..e206e74 100644 --- a/tests/osmo-config-merge/testB2.ok +++ b/tests/osmo-config-merge/testB2.ok @@ -1,37 +1,4 @@ ! - asp ipa-asp-loadshare-sender0 20000 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - asp ipa-asp-loadshare-sender1 20001 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender0 - asp ipa-asp-loadshare-sender1 - asp ipa-asp-loadshare-receiver0 20002 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - asp ipa-asp-loadshare-receiver1 20003 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 - route-table system - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp - listen ipa 5000 - accept-asp-connections dynamic-permitted ! OsmoSTP (1.1.0.2-3884) configuration saved from vty !! ! @@ -80,13 +47,13 @@ route-table system update route 123 16777215 linkset as-sender-tcp update route 155 16777215 linkset as-client-tcp + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp listen m3ua 2905 tcp local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -! -!M3UA AS/ASP: -! asp asp-sender 9999 2905 m3ua local-ip 127.0.0.1 local-ip ::1 @@ -145,27 +112,43 @@ as as-client61-norctx m3ua routing-key 0 61 asp asp-client61-norctx0 -! -! ROUTING TABLE: -! route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx -! -!SERVERS: -! listen m3ua 2905 local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -cs7 instance 0 -! -! IPA AS/ASP: -! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. -! OVERRIDE: + asp ipa-asp-loadshare-sender0 20000 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + asp ipa-asp-loadshare-sender1 20001 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender0 + asp ipa-asp-loadshare-sender1 + asp ipa-asp-loadshare-receiver0 20002 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-loadshare-receiver1 20003 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 asp ipa-asp-override-sender 20005 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -189,11 +172,29 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 -! DYNAMIC AS: as ipa-as-dynamic-asp ipa routing-key 0 5 point-code override dpc 23 + listen ipa 5000 + accept-asp-connections dynamic-permitted +! +!M3UA AS/ASP: +! ! ! ROUTING TABLE: ! +! !SERVERS: +! +! +! IPA AS/ASP: +! +! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. +! OVERRIDE: +! DYNAMIC AS: +! +! ROUTING TABLE: +! +! +!SERVERS: +! diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index ed2039a..63367f3 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -39,6 +39,7 @@ */ #include <stdio.h> +#include <stdbool.h> #include <string.h> #include <errno.h> @@ -89,16 +90,35 @@ return NULL; } +/* Return pointer to line content, or empty string if only whitspace is found */ +static const char *line_lstrip(const char *line) +{ + OSMO_ASSERT(line); + unsigned int len = strlen(line); + for (unsigned int i = 0; i < len; i++) { + if (line[i] == ' ') + continue; + return &line[i]; + } + /* points to empty string '\0' */ + return &line[len]; +} + /* count the number of spaces / indent level */ static int count_indent(const char *line) { - int i; + const char *content = line_lstrip(line); + return content - line; +} - for (i = 0; i < strlen(line); i++) { - if (line[i] != ' ') - return i; - } - return i; +static bool line_is_comment(const char *line) +{ + const char *content = line_lstrip(line); + if (content[0] == '\0') + return true; + if (content[0] == '!' || line[0] == '#') + return true; + return false; } /* strip any triling CR / LF */ @@ -141,7 +161,9 @@ line_num++; chomp(line); int indent = count_indent(line); + bool coment = line_is_comment(&line[indent]); struct node *n; + if (indent > cur_indent) { if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", @@ -153,20 +175,25 @@ n = node_alloc_child(last); } else if (indent < cur_indent) { int i; + struct node *par = last; for (i = 0; i < cur_indent - indent; i++) { /* go to parent, add another sibling */ - if (last->parent) - last = last->parent; + if (par->parent) + par = par->parent; } - n = node_alloc_child(last->parent); + n = node_alloc_child(par->parent); } else { /* add a new sibling (child of parent) */ n = node_alloc_child(last->parent); } n->line = talloc_strdup(n, line); - last = n; - cur_indent = indent; + /* comments are not part of the indentation structre of the + * file, hence commands after it are not to be affected by them: */ + if (!coment) { + last = n; + cur_indent = indent; + } } fclose(infile); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 Gerrit-Change-Number: 40296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: sccp: SCOC -> SCRC: Delay called addr lookup until needed [2/3]
by pespin 13 May '25

13 May '25

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 990987a..706e01c 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); + +#if 0 + if (/* TODO: Coupling performed (not supported) */) + return scrc_node_2(inst, xua); +#endif + 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I1dda9b9288f3f34dfad6064e3f9fff6dcd6abbd7 Gerrit-Change-Number: 40291 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: sccp: Validate SUA address parsing succeeds [1/3]
by pespin 13 May '25

13 May '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40289?usp=email ) Change subject: sccp: Validate SUA address parsing succeeds [1/3] ...................................................................... sccp: Validate SUA address parsing succeeds [1/3] Make sure sua_addr_parse() is successful everywhere to avoid checking on potentially uninitialized memory otherwise. This patch indeed uncovers a sua_addr_parse() failure in sccp_scrc_rx_scoc_conn_msg() triggered eg. when submitting a RANAP msg over SCCP in osmo-hnbgw. This happens because Connection Oriented messages (!= CREQ) contain no "Called Address". This is issue is fixed in the 2 patches following up this one. Change-Id: I36387eb53e160425844b20a296fa5dc75db1ec54 --- M src/sccp_sclc.c M src/sccp_scrc.c 2 files changed, 73 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c index 9d424fa..7fee2a3 100644 --- a/src/sccp_sclc.c +++ b/src/sccp_sclc.c @@ -44,6 +44,7 @@ */ #include <string.h> +#include <errno.h> #include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> @@ -188,6 +189,7 @@ struct msgb *upmsg; struct osmo_sccp_user *scu; uint32_t protocol_class; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDT without user data?!?\n"); @@ -201,8 +203,23 @@ osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + + rc = sua_addr_parse(&param->called_addr, 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)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->in_sequence_control = xua_msg_get_u32(xua, SUA_IEI_SEQ_CTRL); protocol_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS); param->return_option = protocol_class & 0x80; @@ -210,7 +227,6 @@ scu = sccp_user_find(inst, param->called_addr.ssn, param->called_addr.pc); - if (!scu) { /* FIXME: Send destination unreachable? */ _LOGPSCI(inst, DLSUA, LOGL_NOTICE, "Received SUA message for unequipped SSN %u\n", @@ -237,6 +253,7 @@ struct xua_msg_part *data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA); struct msgb *upmsg; struct osmo_sccp_user *scu; + int rc; if (!data_ie) { LOGPSCI(inst, LOGL_ERROR, "SCCP/SUA CLDR without user data?!?\n"); @@ -251,8 +268,22 @@ OSMO_SCU_PRIM_N_NOTICE, PRIM_OP_INDICATION, upmsg); - sua_addr_parse(&param->called_addr, xua, SUA_IEI_DEST_ADDR); - sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&param->called_addr, 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)); + msgb_free(upmsg); + return -EINVAL; + } + + rc = sua_addr_parse(&param->calling_addr, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + msgb_free(upmsg); + return -EINVAL; + } + param->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE); param->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE); @@ -335,13 +366,14 @@ /* Optional: Data */ xua_msg_copy_part(xua_out, SUA_IEI_DATA, xua_in, SUA_IEI_DATA); - sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR); + OSMO_ASSERT(sua_addr_parse(&called, xua_out, SUA_IEI_DEST_ADDR) == 0); + /* Route on PC + SSN ? */ if (called.ri == OSMO_SCCP_RI_SSN_PC) { /* if no PC, copy OPC into called addr */ if (!(called.presence & OSMO_SCCP_ADDR_T_PC)) { struct osmo_sccp_addr calling; - sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR); + OSMO_ASSERT(sua_addr_parse(&calling, xua_out, SUA_IEI_SRC_ADDR) == 0); called.presence |= OSMO_SCCP_ADDR_T_PC; called.pc = calling.pc; /* Re-encode / replace called address */ diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index abf86e4..990987a 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -21,6 +21,7 @@ */ #include <stdbool.h> +#include <errno.h> #include <osmocom/core/logging.h> #include <osmocom/core/msgb.h> @@ -443,10 +444,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + 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 this a CR message ? */ if (xua->hdr.msg_type != SUA_CO_CORE) @@ -465,10 +472,16 @@ struct xua_msg *xua) { struct osmo_sccp_addr called; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + 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; + } /* Message Type */ if (xua->hdr.msg_type == SUA_CL_CLDR) { @@ -487,12 +500,18 @@ } /* ensure the CallingParty address doesn't just contain SSN, but at least SSN+PC */ -static void ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, +static int ensure_opc_in_calling_ssn(struct osmo_sccp_instance *inst, struct xua_msg *xua) { struct osmo_sccp_addr calling; + int rc; - sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + rc = sua_addr_parse(&calling, xua, SUA_IEI_SRC_ADDR); + if (rc < 0) { + LOGPSCI(inst, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n", + xua_hdr_dump(xua, &xua_dialect_sua)); + return -EINVAL; + } /* if we route on SSN and only have a SSN in the address... */ if (calling.ri == OSMO_SCCP_RI_SSN_PC && @@ -504,6 +523,7 @@ xua_msg_free_tag(xua, SUA_IEI_SRC_ADDR); xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &calling); } + return 0; } /* Figure C.1/Q.714 Sheet 1 of 12, after we converted the @@ -514,6 +534,7 @@ struct osmo_sccp_addr called; uint32_t proto_class; struct xua_msg_part *hop_ctr_part; + int rc; LOGPSCI(inst, LOGL_DEBUG, "%s: %s\n", __func__, xua_msg_dump(xua, &xua_dialect_sua)); /* TODO: SCCP or nodal congestion? */ @@ -528,9 +549,16 @@ /* We only treat connectionless and CR below */ /* ensure we have at least OPC+SSN and not just SSN in CallingParty (OS#5146) */ - ensure_opc_in_calling_ssn(inst, xua); + rc = ensure_opc_in_calling_ssn(inst, xua); + if (rc < 0) + return -EINVAL; - sua_addr_parse(&called, xua, SUA_IEI_DEST_ADDR); + 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; + } /* Route on GT? */ if (called.ri != OSMO_SCCP_RI_GT) { -- 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I36387eb53e160425844b20a296fa5dc75db1ec54 Gerrit-Change-Number: 40289 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de>

1 0

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

13 May '25

pespin has submitted this change. ( 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(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 706e01c..ebc9a11 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I602c5be73d7fe6ef2af1cbfe6888227a9f602562 Gerrit-Change-Number: 40292 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: m3ua: Discard rx MSUs for non-active AS
by pespin 13 May '25

13 May '25

pespin has submitted this change. ( 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(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/m3ua.c b/src/m3ua.c index 35e2bb7..f073c8e 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -625,9 +625,14 @@ if (rc) goto ret_free; - rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); + if (!osmo_ss7_as_active(as)) { + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_DISCARD); + LOGPAS(as, DLM3UA, LOGL_INFO, "Discarding received XUA Message %s, AS state %s\n", + xua_hdr_dump(xua, &xua_dialect_sua), osmo_fsm_inst_state_name(as->fi)); + goto ret_free; + } - /* FIXME: check for AS state == ACTIVE */ + rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); /* store the MTP-level information in the xua_msg for use by * higher layer protocols */ 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ibd3c85b9c5ac24fe1447c82b1f2cff4453105b84 Gerrit-Change-Number: 40294 Gerrit-PatchSet: 5 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: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: Rename files in src: s/osmo_ss7/ss7/g
by pespin 13 May '25

13 May '25

pespin has submitted this change. ( 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(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve 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: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I946f787e7bf7d4948d61f50a6cc8ec9a6253f074 Gerrit-Change-Number: 40293 Gerrit-PatchSet: 4 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: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log