- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sigtran[master]: sccp: Apply SLS on locally-originated transmitted Connection-Oriented...
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39689?usp=email ) Change subject: sccp: Apply SLS on locally-originated transmitted Connection-Oriented messages ...................................................................... sccp: Apply SLS on locally-originated transmitted Connection-Oriented messages Change-Id: I1956acf631867b12b647d14c10057ded20d7fa2f --- M src/sccp_scoc.c 1 file changed, 34 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/89/39689/1 diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index c11dddf..8222bde 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -102,6 +102,11 @@ uint32_t sccp_class; uint32_t release_cause; /* WAIT_CONN_CONF */ + /* SLS to be used to transmit all Connection-oriented messages + * (ITU-T Q.714 1.1.2.3 Protocol class 2). + * SLS is 4 bits, as described in ITU Q.704 Figure 3 */ + uint8_t tx_co_mtp_sls; + struct msgb *opt_data_cache; /* incoming (true) or outgoing (false) */ @@ -450,6 +455,26 @@ #define INIT_TIMER(x, fn, priv) do { (x)->cb = fn; (x)->data = priv; } while (0) +/* Generate an SLS to be used for Connection-oriented messages on this SCCP connection. + * SLS is 4 bits, as described in ITU Q.704 Figure 3. + * ITU-T Q.714 1.1.2.3 Protocol class 2: + * "Messages belonging to a given signalling connection shall contain the same + * value of the SLS field to ensure sequencing as described in 1.1.2.2" + */ +static uint8_t sccp_conn_gen_tx_co_mtp_sls(const struct sccp_connection *conn) +{ + /* Implementation: Derive the SLS from conn->conn_id. */ + const uint32_t id = conn->conn_id; + uint8_t sls; + + /* First shrink it to 1 byte: */ + sls = ((id >> (3*8)) ^ (id >> (2*8)) ^ (id >> (1*8)) ^ (id)) & 0xff; + /* Now shrink it 8 -> 4 bits: */ + sls = ((sls >> 4) ^ sls) & 0x0f; + + return sls; +} + /* allocate + init a SCCP Connection with given ID */ static struct sccp_connection *conn_create_id(struct osmo_sccp_user *user, uint32_t conn_id) { @@ -472,6 +497,8 @@ INIT_TIMER(&conn->t_int, int_tmr_cb, conn); INIT_TIMER(&conn->t_rep_rel, rep_rel_tmr_cb, conn); + conn->tx_co_mtp_sls = sccp_conn_gen_tx_co_mtp_sls(conn); + /* this might change at runtime, as it is not a constant :/ */ sccp_scoc_fsm.log_subsys = DLSCCP; @@ -715,6 +742,13 @@ if (!xua) return NULL; + /* amend this with point code information; Many CO msgs + * includes neither called nor calling party address! */ + xua->mtp.dpc = conn->remote_pc; + + /* Apply SLS calculated for the connection (ITU-T Q.714 1.1.2.3). */ + xua->mtp.sls = conn->tx_co_mtp_sls; + switch (msg_type) { case SUA_CO_CORE: /* Connect Request == SCCP CR */ xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_CORE); @@ -835,9 +869,6 @@ if (!xua) return -ENOMEM; - /* amend this with point code information; Many CO msgs - * includes neither called nor calling party address! */ - xua->mtp.dpc = conn->remote_pc; sccp_scrc_rx_scoc_conn_msg(conn->inst, xua); xua_msg_free(xua); return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39689?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: I1956acf631867b12b647d14c10057ded20d7fa2f Gerrit-Change-Number: 39689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-smlc[master]: Add missing required vty go_parent_cb for libosmo-sigtran
by pespin 04 Mar '25

04 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email ) Change subject: Add missing required vty go_parent_cb for libosmo-sigtran ...................................................................... Add missing required vty go_parent_cb for libosmo-sigtran This callback is required when configuring SS7 network through VTY. Change-Id: Ibab25aa1a9ed4d0680fb61999e79b56b9a7d08dc --- M src/osmo-smlc/smlc_main.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-smlc/smlc_main.c b/src/osmo-smlc/smlc_main.c index f2944f0..f72ec4b 100644 --- a/src/osmo-smlc/smlc_main.c +++ b/src/osmo-smlc/smlc_main.c @@ -35,6 +35,7 @@ #include <osmocom/sigtran/xua_msg.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/smlc/debug.h> #include <osmocom/smlc/smlc_data.h> @@ -170,6 +171,7 @@ "This is free software: you are free to change and redistribute it.\r\n" "There is NO WARRANTY, to the extent permitted by law.\r\n", .version = PACKAGE_VERSION, + .go_parent_cb = osmo_ss7_vty_go_parent, }; static void signal_handler(int signal) -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ibab25aa1a9ed4d0680fb61999e79b56b9a7d08dc Gerrit-Change-Number: 39673 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 0

[XS] Change in osmo-smlc[master]: Add missing required vty go_parent_cb for libosmo-sigtran
by pespin 04 Mar '25

04 Mar '25

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email ) Change subject: Add missing required vty go_parent_cb for libosmo-sigtran ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Merging now to avoid further tests failures tonight. -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/39673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ibab25aa1a9ed4d0680fb61999e79b56b9a7d08dc Gerrit-Change-Number: 39673 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 19:05:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: filesystem: do not decode short TransRecEF records
by fixeria 04 Mar '25

04 Mar '25

Attention is currently required from: dexter. fixeria has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/39670?usp=email ) Change subject: filesystem: do not decode short TransRecEF records ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib1dc4d7ce306f1f0b080bb4b6abc36e72431d3fa Gerrit-Change-Number: 39670 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Mar 2025 18:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-abis[master]: trau_frame encode8_hr: simplify setting of C5 for odd parity
by falconia 04 Mar '25

04 Mar '25

Attention is currently required from: laforge. falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39669?usp=email ) Change subject: trau_frame encode8_hr: simplify setting of C5 for odd parity ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > it will bite us in the butt if we ever want to change anything about this function, and the strange assumption no longer holds true. I am afraid I don't follow. Suppose we decide that no sane user application is going to set only C4 (`fr->c_bits[3]`) while leaving the other 4 C-bits in that group uninitialized/garbage, and we change the function to always use all of `fr->c_bits[]`, like we already do for OSMO_TRAU8_DATA. (In fact, I have a patch that does just that - would you like me to submit it as a merge candidate?) In that case, the local function for computing odd parity *still* goes away just like with the present patch - so I don't see where the "bite in the butt" would happen. But I have no particular attachment to the present patch. I produced it because it seemed like a sensible code simplification/clean-up, but it does not change any functionality or behavior, so if you (and/or other senior maintainers) don't like it, then fine, no big deal. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I30c7dfdaaadd0fd4cb084cf02c66c0f19a40ae42 Gerrit-Change-Number: 39669 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 04 Mar 2025 17:53:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-sip-connector[master]: Drop use of deprecated vty is_config_node() cb
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/39688?usp=email ) Change subject: Drop use of deprecated vty is_config_node() cb ...................................................................... Drop use of deprecated vty is_config_node() cb This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e. Change-Id: I3809f9c0529004ff117e9e79ee81d30dca6e9bc4 --- M src/vty.c 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/88/39688/1 diff --git a/src/vty.c b/src/vty.c index ea76d46..f7fa041 100644 --- a/src/vty.c +++ b/src/vty.c @@ -33,7 +33,6 @@ struct app_config g_app; static int mncc_vty_go_parent(struct vty *vty); -static int mncc_vty_is_config_node(struct vty *vty, int node); static struct cmd_node sip_node = { SIP_NODE, @@ -57,7 +56,6 @@ .name = "OsmoSIPcon", .version = PACKAGE_VERSION, .go_parent_cb = mncc_vty_go_parent, - .is_config_node = mncc_vty_is_config_node, .copyright = "GNU AGPLv3+\n", }; @@ -71,7 +69,7 @@ vty->index = NULL; break; default: - if (mncc_vty_is_config_node(vty, vty->node)) + if (vty->node >= SIP_NODE) vty->node = CONFIG_NODE; else vty->node = ENABLE_NODE; @@ -81,11 +79,6 @@ return vty->node; } -static int mncc_vty_is_config_node(struct vty *vty, int node) -{ - return node >= SIP_NODE; -} - static int config_write_sip(struct vty *vty) { vty_out(vty, "sip%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/39688?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3809f9c0529004ff117e9e79ee81d30dca6e9bc4 Gerrit-Change-Number: 39688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-hlr[master]: Drop use of deprecated vty is_config_node() cb
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39687?usp=email ) Change subject: Drop use of deprecated vty is_config_node() cb ...................................................................... Drop use of deprecated vty is_config_node() cb This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e. Change-Id: I0a77ff4c0a880230116a361651c78c77328db989 --- M include/osmocom/hlr/hlr_vty.h M src/hlr.c M src/hlr_vty.c 3 files changed, 0 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/87/39687/1 diff --git a/include/osmocom/hlr/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h index 8601590..10ea8b7 100644 --- a/include/osmocom/hlr/hlr_vty.h +++ b/include/osmocom/hlr/hlr_vty.h @@ -48,7 +48,6 @@ #define A38_COMP128_KEY_LEN 16 #define MILENAGE_KEY_LEN 16 -int hlr_vty_is_config_node(struct vty *vty, int node); int hlr_vty_go_parent(struct vty *vty); void hlr_vty_init(void *hlr_ctx); void dgsm_vty_init(void); diff --git a/src/hlr.c b/src/hlr.c index a900e23..0cfa09a 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -754,7 +754,6 @@ .name = "OsmoHLR", .version = PACKAGE_VERSION, .copyright = vlr_copyright, - .is_config_node = hlr_vty_is_config_node, .go_parent_cb = hlr_vty_go_parent, }; diff --git a/src/hlr_vty.c b/src/hlr_vty.c index 4694c44..18861d2 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -881,18 +881,6 @@ return vty->node; } -int hlr_vty_is_config_node(struct vty *vty, int node) -{ - switch (node) { - /* add items that are not config */ - case CONFIG_NODE: - return 0; - - default: - return 1; - } -} - void hlr_vty_init(void *hlr_ctx) { cfg_reject_cause_cmd.string = -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I0a77ff4c0a880230116a361651c78c77328db989 Gerrit-Change-Number: 39687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcu[master]: Drop function declaration for non longer existing function
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39686?usp=email ) Change subject: Drop function declaration for non longer existing function ...................................................................... Drop function declaration for non longer existing function Drop use of deprecated vty is_config_node() cb This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e. Change-Id: I999ac55fca21cf942876bc19c19f0eda2754501b Fixes: 1ec29c7324e69a6f294704fb8eeb093a33085aba --- M src/pcu_vty.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/86/39686/1 diff --git a/src/pcu_vty.h b/src/pcu_vty.h index 45d3227..8178e11 100644 --- a/src/pcu_vty.h +++ b/src/pcu_vty.h @@ -9,9 +9,6 @@ PCU_NODE = _LAST_OSMOVTY_NODE + 1, }; -int pcu_vty_go_parent(struct vty *vty); -int pcu_vty_is_config_node(struct vty *vty, int node); - int pcu_vty_init(); extern struct vty_app_info pcu_vty_info; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I999ac55fca21cf942876bc19c19f0eda2754501b Gerrit-Change-Number: 39686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ggsn[master]: Drop use of deprecated vty is_config_node() cb
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/39685?usp=email ) Change subject: Drop use of deprecated vty is_config_node() cb ...................................................................... Drop use of deprecated vty is_config_node() cb This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e. Change-Id: Ief57c4ce98055e5063aafc53cb8330d3bd95d323 --- M ggsn/ggsn_vty.c 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/85/39685/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index b0f07fe..534b3d2 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -1124,17 +1124,6 @@ return 0; } -static int ggsn_vty_is_config_node(struct vty *vty, int node) -{ - switch (node) { - case GGSN_NODE: - case APN_NODE: - return 1; - default: - return 0; - } -} - static int ggsn_vty_go_parent(struct vty *vty) { switch (vty->node) { @@ -1174,5 +1163,4 @@ .version = PACKAGE_VERSION, .copyright = ggsn_copyright, .go_parent_cb = ggsn_vty_go_parent, - .is_config_node = ggsn_vty_is_config_node, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/39685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ief57c4ce98055e5063aafc53cb8330d3bd95d323 Gerrit-Change-Number: 39685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: Drop use of deprecated vty is_config_node() cb
by pespin 04 Mar '25

04 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/39684?usp=email ) Change subject: Drop use of deprecated vty is_config_node() cb ...................................................................... Drop use of deprecated vty is_config_node() cb This callback was drepecated and is not ever called since libosmocore.git 70ce871532ab21955e0955d7e230eae65438f047 (release 1.3.0). See also libosmocore.git d31de237582f6fe3315d61bb9a488d4cda92654e. Change-Id: Id6620095af153781cde926458f54fed5bd51a9e7 --- M src/osmo-msc/msc_main.c 1 file changed, 0 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/84/39684/1 diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 2238e2b..2435029 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -354,29 +354,10 @@ return vty->node; } -static int msc_vty_is_config_node(struct vty *vty, int node) -{ - /* Check if libosmo-sigtran declares the node in - * question as config node */ - if (osmo_ss7_is_config_node(vty, node)) - return 1; - - switch (node) { - /* add items that are not config */ - case SUBSCR_NODE: - case CONFIG_NODE: - return 0; - - default: - return 1; - } -} - static struct vty_app_info msc_vty_info = { .name = "OsmoMSC", .version = PACKAGE_VERSION, .go_parent_cb = msc_vty_go_parent, - .is_config_node = msc_vty_is_config_node, }; #define DEFAULT_M3UA_LOCAL_IP "localhost" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id6620095af153781cde926458f54fed5bd51a9e7 Gerrit-Change-Number: 39684 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log