July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: print length of received TCH payloads
by pespin 07 Jul '23

07 Jul '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33643 ) Change subject: BTS_Tests: print length of received TCH payloads ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Is that really needed given that the entire string is printed and hence can be counted? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5848bd8acd220c1c4d2db01b71bb57e785dc9de7 Gerrit-Change-Number: 33643 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 15:20:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-sccp[master]: sccp: Use tdef to implement osmo_sccp_timers
by pespin 07 Jul '23

07 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33644 ) Change subject: sccp: Use tdef to implement osmo_sccp_timers ...................................................................... sccp: Use tdef to implement osmo_sccp_timers Related: OS#4372 Change-Id: I1dbe49a83a1bcddf074d5e638babd065834a0ebd --- M src/sccp_internal.h M src/sccp_scoc.c M src/sccp_user.c M src/sccp_vty.c 4 files changed, 60 insertions(+), 120 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/44/33644/1 diff --git a/src/sccp_internal.h b/src/sccp_internal.h index 3027ae6..be35513 100644 --- a/src/sccp_internal.h +++ b/src/sccp_internal.h @@ -4,6 +4,7 @@ #include <osmocom/core/prim.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/linuxrbtree.h> +#include <osmocom/core/tdef.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/protocol/mtp.h> @@ -25,21 +26,12 @@ OSMO_SCCP_TIMERS_COUNT }; -struct osmo_sccp_timer_val { - uint32_t s; - uint32_t us; -}; - -extern const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[]; +extern const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_COUNT + 1]; extern const struct value_string osmo_sccp_timer_names[]; static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val) { return get_value_string(osmo_sccp_timer_names, val); } -extern const struct value_string osmo_sccp_timer_descriptions[]; -static inline const char *osmo_sccp_timer_description(enum osmo_sccp_timer val) -{ return get_value_string(osmo_sccp_timer_descriptions, val); } - /* an instance of the SCCP stack */ struct osmo_sccp_instance { /* entry in global list of ss7 instances */ @@ -57,7 +49,7 @@ struct osmo_ss7_user ss7_user; - struct osmo_sccp_timer_val timers[OSMO_SCCP_TIMERS_COUNT]; + struct osmo_tdef *tdefs; uint32_t max_optional_data; }; @@ -129,10 +121,6 @@ void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst); -const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, - enum osmo_sccp_timer timer, - bool default_if_unset); - void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst); /* Local Broadcast (LBCS) */ diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index f6caeac..4151300 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -234,6 +234,31 @@ * Timer Handling ***********************************************************************/ +/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite + * unintelligible out of context, for which we have our own description here. */ +const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_COUNT + 1] = { + { .T = OSMO_SCCP_TIMER_CONN_EST, .default_val = 1*60, .unit = OSMO_TDEF_S, + .desc = "Waiting for connection confirm message, 1 to 2 minutes" }, + { .T = OSMO_SCCP_TIMER_IAS, .default_val = 7*60, .unit = OSMO_TDEF_S, + .desc = "Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes" }, /* RFC 3868 Ch. 8. */ + { .T = OSMO_SCCP_TIMER_IAR, .default_val = 15*60, .unit = OSMO_TDEF_S, + .desc = "Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes" }, /* RFC 3868 Ch. 8. */ + { .T = OSMO_SCCP_TIMER_REL, .default_val = 10, .unit = OSMO_TDEF_S, + .desc = "Waiting for release complete message, 10 to 20 seconds" }, + { .T = OSMO_SCCP_TIMER_REPEAT_REL, .default_val = 10, .unit = OSMO_TDEF_S, + .desc = "Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds" }, + { .T = OSMO_SCCP_TIMER_INT, .default_val = 1*60, .unit = OSMO_TDEF_S, + .desc = "Waiting for release complete message; or to release connection resources, freeze the LRN and " + "alert a maintenance function after the initial expiry, extending to 1 minute" }, + { .T = OSMO_SCCP_TIMER_GUARD, .default_val = 23*60, .unit = OSMO_TDEF_S, + .desc = "Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes" }, + { .T = OSMO_SCCP_TIMER_RESET, .default_val = 10, .unit = OSMO_TDEF_S, + .desc = "Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds" }, + { .T = OSMO_SCCP_TIMER_REASSEMBLY, .default_val = 10, .unit = OSMO_TDEF_S, + .desc = "Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds" }, + {} +}; + /* Appendix C.4 of ITU-T Q.714 */ const struct value_string osmo_sccp_timer_names[] = { { OSMO_SCCP_TIMER_CONN_EST, "conn_est" }, @@ -248,93 +273,12 @@ {} }; -/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite - * unintelligible out of context, for which we have our own description here. */ -const struct value_string osmo_sccp_timer_descriptions[] = { - { OSMO_SCCP_TIMER_CONN_EST, - "Waiting for connection confirm message, 1 to 2 minutes" }, - { OSMO_SCCP_TIMER_IAS, - "Send keep-alive: on an idle connection, delay before sending an Idle Timer message," - " 5 to 10 minutes" }, - { OSMO_SCCP_TIMER_IAR, - "Receive keep-alive: on an idle connection, delay until considering a connection as stale," - " 11 to 21 minutes" }, - { OSMO_SCCP_TIMER_REL, - "Waiting for release complete message, 10 to 20 seconds" }, - { OSMO_SCCP_TIMER_REPEAT_REL, - "Waiting for release complete message; or to repeat sending released message after the initial" - " expiry, 10 to 20 seconds" }, - { OSMO_SCCP_TIMER_INT, - "Waiting for release complete message; or to release connection resources, freeze the LRN and" - " alert a maintenance function after the initial expiry, extending to 1 minute" }, - { OSMO_SCCP_TIMER_GUARD, - "Waiting to resume normal procedure for temporary connection sections during the restart" - " procedure, 23 to 25 minutes" }, - { OSMO_SCCP_TIMER_RESET, - "Waiting to release temporary connection section or alert maintenance function after reset" - " request message is sent, 10 to 20 seconds" }, - { OSMO_SCCP_TIMER_REASSEMBLY, - "Waiting to receive all the segments of the remaining segments, single segmented message after" - " receiving the first segment, 10 to 20 seconds" }, - {} -}; - -/* Appendix C.4 of ITU-T Q.714 */ -const struct osmo_sccp_timer_val osmo_sccp_timer_defaults[] = { - [OSMO_SCCP_TIMER_CONN_EST] = { .s = 1 * 60, }, - [OSMO_SCCP_TIMER_IAS] = { .s = 7 * 60, }, /* RFC 3868 Ch. 8. */ - [OSMO_SCCP_TIMER_IAR] = { .s = 15 * 60, }, /* RFC 3868 Ch. 8. */ - [OSMO_SCCP_TIMER_REL] = { .s = 10, }, - [OSMO_SCCP_TIMER_REPEAT_REL] = { .s = 10, }, - [OSMO_SCCP_TIMER_INT] = { .s = 1 * 60, }, - [OSMO_SCCP_TIMER_GUARD] = { .s = 23 * 60, }, - [OSMO_SCCP_TIMER_RESET] = { .s = 10, }, - [OSMO_SCCP_TIMER_REASSEMBLY] = { .s = 10, }, -}; - -osmo_static_assert(ARRAY_SIZE(osmo_sccp_timer_defaults) == OSMO_SCCP_TIMERS_COUNT, - assert_osmo_sccp_timers_count); - -/* Look up an SCCP timer value as configured in the osmo_ss7_instance. - * If no user defined value is set, return the global default from osmo_sccp_timer_defaults instead. - * However, if default_if_unset is passed false, return NULL in case there is no user defined setting, or - * in case it is identical to the global default. */ -const struct osmo_sccp_timer_val *osmo_sccp_timer_get(const struct osmo_sccp_instance *inst, - enum osmo_sccp_timer timer, - bool default_if_unset) -{ - const struct osmo_sccp_timer_val *val; - const struct osmo_sccp_timer_val *def; - - OSMO_ASSERT(timer >= 0 - && timer < ARRAY_SIZE(inst->timers) - && timer < ARRAY_SIZE(osmo_sccp_timer_defaults)); - - val = &inst->timers[timer]; - def = &osmo_sccp_timer_defaults[timer]; - - /* Assert that all timer definitions have a sane global default */ - OSMO_ASSERT(def->s || def->us); - - if (val->s || val->us) { - if (!default_if_unset && val->s == def->s && val->us == def->us) - return NULL; - return val; - } - - if (!default_if_unset) - return NULL; - - /* If unset, use the global default. */ - return def; -} - static void sccp_timer_schedule(const struct sccp_connection *conn, struct osmo_timer_list *timer, enum osmo_sccp_timer timer_name) { - const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(conn->inst, timer_name, true); - osmo_timer_schedule(timer, val->s, val->us); + const unsigned long val_sec = osmo_tdef_get(conn->inst->tdefs, timer_name, OSMO_TDEF_S, -1); + osmo_timer_schedule(timer, val_sec, 0); } /* T(ias) has expired, send a COIT message to the peer */ diff --git a/src/sccp_user.c b/src/sccp_user.c index fb14e75..2acd976 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -238,6 +238,10 @@ inst->ss7_user.priv = inst; inst->max_optional_data = SCCP_MAX_OPTIONAL_DATA; + inst->tdefs = talloc_size(inst, sizeof(osmo_sccp_timer_defaults)); + memcpy(inst->tdefs, osmo_sccp_timer_defaults, sizeof(osmo_sccp_timer_defaults)); + osmo_tdefs_reset(inst->tdefs); + rc = sccp_scmg_init(inst); if (rc < 0) { talloc_free(inst); diff --git a/src/sccp_vty.c b/src/sccp_vty.c index dda3ff0..1d229fb 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -150,7 +150,6 @@ { struct osmo_ss7_instance *ss7 = vty->index; enum osmo_sccp_timer timer = get_string_value(osmo_sccp_timer_names, argv[0]); - struct osmo_sccp_timer_val set_val = { .s = atoi(argv[1]) }; if (timer < 0 || timer >= OSMO_SCCP_TIMERS_COUNT) { vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); @@ -163,7 +162,8 @@ return CMD_WARNING; } - ss7->sccp->timers[timer] = set_val; + OSMO_ASSERT(ss7->sccp->tdefs); + osmo_tdef_set(ss7->sccp->tdefs, timer, atoi(argv[1]), OSMO_TDEF_S); return CMD_SUCCESS; } @@ -197,14 +197,6 @@ return CMD_SUCCESS; } -static const char *osmo_sccp_timer_val_name(const struct osmo_sccp_timer_val *val) -{ - static char buf[16]; - - snprintf(buf, sizeof(buf), "%u", val->s); - return buf; -} - static void gen_sccp_timer_cmd_strs(struct cmd_element *cmd) { int i; @@ -219,19 +211,19 @@ "Configure SCCP timer values, see ITU-T Q.714\n"); for (i = 0; osmo_sccp_timer_names[i].str; i++) { - const struct osmo_sccp_timer_val *def; + const struct osmo_tdef *def; enum osmo_sccp_timer timer; timer = osmo_sccp_timer_names[i].value; - def = &osmo_sccp_timer_defaults[timer]; - OSMO_ASSERT(timer >= 0 && timer < OSMO_SCCP_TIMERS_COUNT); + def = osmo_tdef_get_entry((struct osmo_tdef *)&osmo_sccp_timer_defaults, timer); + OSMO_ASSERT(def); osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "%s%s", i ? "|" : "", - osmo_sccp_timer_name(timer)); - osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %s)\n", - osmo_sccp_timer_description(timer), - osmo_sccp_timer_val_name(def)); + osmo_sccp_timer_names[i].str); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %lu)\n", + def->desc, + def->default_val); } osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999>"); @@ -247,12 +239,14 @@ { int i; - for (i = 0; i < ARRAY_SIZE(inst->timers); i++) { - const struct osmo_sccp_timer_val *val = osmo_sccp_timer_get(inst, i, default_if_unset); - if (!val) + for (i = 0; osmo_sccp_timer_names[i].str; i++) { + const struct osmo_tdef *tdef = osmo_tdef_get_entry(inst->tdefs, osmo_sccp_timer_names[i].value); + if (!tdef) continue; - vty_out(vty, "%ssccp-timer %s %s%s", indent, osmo_sccp_timer_name(i), - osmo_sccp_timer_val_name(val), VTY_NEWLINE); + if (!default_if_unset && tdef->val == tdef->default_val) + continue; + vty_out(vty, "%ssccp-timer %s %lu%s", indent, osmo_sccp_timer_names[i].str, + tdef->val, VTY_NEWLINE); } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1dbe49a83a1bcddf074d5e638babd065834a0ebd Gerrit-Change-Number: 33644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by tnt 07 Jul '23

07 Jul '23

tnt has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... gsm: Fix comment for TCH/F4.8 code Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 --- M utils/conv_codes_gsm.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve tnt: Looks good to me, approved diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index 721e546..62b5a0b 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -77,7 +77,7 @@ name = "tch_f48", description = [ "TCH/F4.8 convolutional code:", - "152 bits blocks, rate 1/3, k = 5", + "148 bits blocks, rate 1/3, k = 5", "G1 = 1 + D + D3 + D4", "G2 = 1 + D2 + D4", "G3 = 1 + D + D2 + D3 + D4", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by tnt 07 Jul '23

07 Jul '23

Attention is currently required from: fixeria. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 15:02:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: print length of received TCH payloads
by fixeria 07 Jul '23

07 Jul '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33643 ) Change subject: BTS_Tests: print length of received TCH payloads ...................................................................... BTS_Tests: print length of received TCH payloads Change-Id: I5848bd8acd220c1c4d2db01b71bb57e785dc9de7 --- M bts/BTS_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/33643/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fddfcca..d2b8ec2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2219,7 +2219,8 @@ private altstep as_l1_tch_loop() runs on ConnHdlr { var L1ctlMessage l1_dl; [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr)) -> value l1_dl { - log("TCH received: ", l1_dl.payload.traffic_ind.data); + var octetstring data := l1_dl.payload.traffic_ind.data; + log("TCH received (len=", lengthof(data), "): ", data); /* occasionaly inject FACCH frames into the uplink */ if (g_pars.l1_pars.facch_enabled == true and l1_dl.dl_info.frame_nr mod 5 == 0) { @@ -8310,7 +8311,8 @@ Td.start(2.0); alt { [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr, frame := pl)) -> value l1_dl { - log("TCH received: ", l1_dl.payload.traffic_ind.data); + var octetstring data := l1_dl.payload.traffic_ind.data; + log("TCH received (len=", lengthof(data), "): ", data); L1CTL.send(ts_L1CTL_TRAFFIC_REQ(g_chan_nr, l1_dl.dl_info.link_id, l1_dl.payload.traffic_ind.data)); setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5848bd8acd220c1c4d2db01b71bb57e785dc9de7 Gerrit-Change-Number: 33643 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: gsm: Improve the TCH/H2.4 coding routines
by fixeria 07 Jul '23

07 Jul '23

Attention is currently required from: tnt. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33641 ) Change subject: gsm: Improve the TCH/H2.4 coding routines ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Patchset: PS2: > FWIW I don't agree with the linter. […] We can remove the V-1 vote and re-add V+1 manually, if others find it more readable. Personally I don't have a strong preference here and for me it's fine either way. This is also an option, which should not trigger the linter: ``` osmo_conv_encode(&gsm0503_tch_h24, &data[0], &cB[0]); osmo_conv_encode(&gsm0503_tch_h24, &data[72], &cB[228]); ``` PS2: Thanks a lot for the patch! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2551ffe2a0ebfd0a6df0e1d288a6f0af7e1eda7 Gerrit-Change-Number: 33641 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:44:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: M3UA/SUA: Don't add empty routing context IE in DUNA/DAVA
by laforge 07 Jul '23

07 Jul '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33642 ) Change subject: M3UA/SUA: Don't add empty routing context IE in DUNA/DAVA ...................................................................... M3UA/SUA: Don't add empty routing context IE in DUNA/DAVA Before this patch, the code generating a DUNA or DAVA message would potentially generate a ROUTE_CTX IE with zero-length content, rather than skipping such an IE altogether if no routing context[s] are given. Change-Id: I19d0382cd2d428a91ac716182b9d86dcdc2c2ebd Related: SYS#6511 --- M src/m3ua.c M src/sua.c 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/42/33642/1 diff --git a/src/m3ua.c b/src/m3ua.c index 8d82522..4c5d8d4 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -827,7 +827,7 @@ xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_DUPU); xua->hdr.version = M3UA_VERSION; - if (rctx) + if (rctx && num_rctx) xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); xua_msg_add_u32(xua, M3UA_IEI_AFFECTED_PC, dpc); diff --git a/src/sua.c b/src/sua.c index a20d751..2a03f22 100644 --- a/src/sua.c +++ b/src/sua.c @@ -838,7 +838,7 @@ xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_DUNA); xua->hdr.version = SUA_VERSION; - if (rctx) + if (rctx && num_rctx) xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); xua_msg_add_u32(xua, SUA_IEI_AFFECTED_PC, dpc); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I19d0382cd2d428a91ac716182b9d86dcdc2c2ebd Gerrit-Change-Number: 33642 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by tnt 07 Jul '23

07 Jul '23

Attention is currently required from: fixeria. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... Patch Set 1: (1 comment) File utils/conv_codes_gsm.py: https://gerrit.osmocom.org/c/libosmocore/+/33640/comment/5a50d6e0_5ef7601b PS1, Line 80: 148 bits blocks > Ah, it might be the same case as in Id86d1aa0fd6791a8be431b5547bb723c74c35757. Yeah, the patch didn't update the comment. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:22:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by fixeria 07 Jul '23

07 Jul '23

Attention is currently required from: tnt. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:20:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: gsm: Improve the TCH/H2.4 coding routines
by tnt 07 Jul '23

07 Jul '23

tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33641 ) Change subject: gsm: Improve the TCH/H2.4 coding routines ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: FWIW I don't agree with the linter. In this specific case keeping the brackets aligned between blocks makes the code more readable IMHO. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2551ffe2a0ebfd0a6df0e1d288a6f0af7e1eda7 Gerrit-Change-Number: 33641 Gerrit-PatchSet: 2 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 07 Jul 2023 14:12:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0