January 2024 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: vty: suppress warnings about len being set but not used
by fixeria 05 Jan '24

05 Jan '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35473?usp=email ) Change subject: vty: suppress warnings about len being set but not used ...................................................................... vty: suppress warnings about len being set but not used This commit fixes the following warning seen with CC=clang: utils.c:376:6: warning: variable 'len' set but not used [-Wunused-but-set-variable] int len = 0, offset = 0, ret, rem; ... and finally allows to build libosmocore with --enable-werror. Change-Id: I0040ef20ba3fc53ee7ccefc4885170f333f80566 --- M src/vty/utils.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/vty/utils.c b/src/vty/utils.c index a651515..0f5a34e 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -415,6 +415,7 @@ if (ret < 0) goto err; OSMO_SNPRINTF_RET(ret, rem, offset, len); + (void)len; /* suppress warnings about len being set but not used */ err: str[size-1] = '\0'; return str; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35473?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0040ef20ba3fc53ee7ccefc4885170f333f80566 Gerrit-Change-Number: 35473 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U}
by fixeria 05 Jan '24

05 Jan '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35480?usp=email ) Change subject: gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U} ...................................................................... gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U} This code predates 2cbe25f4, adding osmo_strbuf API and so using its own append-to-strbuf implementation. Let's use the new generic API. Change-Id: Ifdfd18eeef6a0932995063259f9f179b22e781de --- M src/gsm/gsm0808_utils.c 1 file changed, 28 insertions(+), 31 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 778630d..c9f26d3 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -2075,25 +2075,12 @@ { 0, NULL } }; -#define APPEND_THING(func, args...) do { \ - int remain = buflen - (pos - buf); \ - int l = func(pos, remain, ##args); \ - if (l < 0 || l > remain) \ - pos = buf + buflen; \ - else \ - pos += l; \ - if (l > 0) \ - total_len += l; \ - } while(0) -#define APPEND_STR(fmt, args...) APPEND_THING(snprintf, fmt, ##args) -#define APPEND_CELL_ID_U(DISCR, U) APPEND_THING(gsm0808_cell_id_u_name, DISCR, U) - char *gsm0808_cell_id_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id *cid) { - char *pos = buf; - int total_len = 0; - APPEND_STR("%s:", gsm0808_cell_id_discr_name(cid->id_discr)); - APPEND_CELL_ID_U(cid->id_discr, &cid->id); + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; + + OSMO_STRBUF_PRINTF(sb, "%s:", gsm0808_cell_id_discr_name(cid->id_discr)); + OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name, cid->id_discr, &cid->id); return buf; } @@ -2140,30 +2127,31 @@ */ int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil) { - char *pos = buf; - int total_len = 0; - int i; + struct osmo_strbuf sb = { .buf = buf, .len = buflen }; - APPEND_STR("%s[%u]", gsm0808_cell_id_discr_name(cil->id_discr), cil->id_list_len); + OSMO_STRBUF_PRINTF(sb, "%s[%u]", + gsm0808_cell_id_discr_name(cil->id_discr), + cil->id_list_len); switch (cil->id_discr) { case CELL_IDENT_BSS: case CELL_IDENT_NO_CELL: - return total_len; + return sb.chars_needed; default: break; } - APPEND_STR(":{"); + OSMO_STRBUF_PRINTF(sb, ":{"); - for (i = 0; i < cil->id_list_len; i++) { + for (unsigned int i = 0; i < cil->id_list_len; i++) { if (i) - APPEND_STR(", "); - APPEND_CELL_ID_U(cil->id_discr, &cil->id_list[i]); + OSMO_STRBUF_PRINTF(sb, ", "); + OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name, + cil->id_discr, &cil->id_list[i]); } - APPEND_STR("}"); - return total_len; + OSMO_STRBUF_PRINTF(sb, "}"); + return sb.chars_needed; } /*! Return a human-readable representation of \a cil in a static buffer. @@ -2185,9 +2173,6 @@ return buf; } -#undef APPEND_STR -#undef APPEND_CELL_ID_U - char *gsm0808_channel_type_name_buf(char *buf, size_t buf_len, const struct gsm0808_channel_type *ct) { snprintf(buf, buf_len, "ch_indctr=0x%x ch_rate_type=0x%x perm_spch=%s", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifdfd18eeef6a0932995063259f9f179b22e781de Gerrit-Change-Number: 35480 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in libosmocore[master]: gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U}
by fixeria 05 Jan '24

05 Jan '24

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35480?usp=email ) Change subject: gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifdfd18eeef6a0932995063259f9f179b22e781de Gerrit-Change-Number: 35480 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Jan 2024 15:36:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: core: osmo_tdef_fsm_inst_state_chg(): allow millisecond precision
by pespin 05 Jan '24

05 Jan '24

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35466?usp=email ) Change subject: core: osmo_tdef_fsm_inst_state_chg(): allow millisecond precision ...................................................................... Patch Set 6: (1 comment) Patchset: PS4: > I have always been very skeptical about timers with microsecond granularity. […] That would indeed be handy probably in osmo-modbus, until now I had to rely on setting the timers manually during on_enter() using this helper function: https://gitea.osmocom.org/electronics/osmo-modbus/src/branch/master/src/rtu… I think it may make no sense if we are talking in the order of 4-6 uS, but it makes more sense if we talk about handling for instance 800-900 uS. So if it's not a lot of work, yes, having _uS granularity would be nice. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35466?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4c4ee89e7e32e86f74cd215f5cbfa44ace5426c1 Gerrit-Change-Number: 35466 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(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-Comment-Date: Fri, 05 Jan 2024 13:05:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23: migrate away from gsm48_generate_mid_from_*
by pespin 05 Jan '24

05 Jan '24

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email ) Change subject: layer23: migrate away from gsm48_generate_mid_from_* ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib0d7f76cd635e8d1092ffc1d07ecb29ec0435dda Gerrit-Change-Number: 33318 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 05 Jan 2024 12:58:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: Increase file Code splitting to decrease mem use
by pespin 05 Jan '24

05 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35478?usp=email ) Change subject: regen-makefile.sh: Increase file Code splitting to decrease mem use ...................................................................... regen-makefile.sh: Increase file Code splitting to decrease mem use Building MME_Tests with an 8core host with 16GB of RAM sometimes exhausts the whole available RAM, triggering the OOM killer. Let's increase the variable to generate 8 C++ files for each TTCN3 files, in order to avoid consuming so much memory. Change-Id: If5f54e18384f8a26b281d057e9d9f5c450566422 --- M regen-makefile.sh 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/regen-makefile.sh b/regen-makefile.sh index 67e5df0..09088e0 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -37,7 +37,7 @@ USE_CCACHE=1 fi -ttcn3_makefilegen -g -p -l -U 5 -f $* +ttcn3_makefilegen -g -p -l -U 8 -f $* sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35478?usp=email 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: If5f54e18384f8a26b281d057e9d9f5c450566422 Gerrit-Change-Number: 35478 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: Increase file Code splitting to decrease mem use
by pespin 05 Jan '24

05 Jan '24

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35478?usp=email ) Change subject: regen-makefile.sh: Increase file Code splitting to decrease mem use ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35478?usp=email 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: If5f54e18384f8a26b281d057e9d9f5c450566422 Gerrit-Change-Number: 35478 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 05 Jan 2024 12:54:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: layer23: migrate away from gsm48_generate_mid_from_*
by jolly 05 Jan '24

05 Jan '24

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email ) Change subject: layer23: migrate away from gsm48_generate_mid_from_* ...................................................................... Patch Set 4: (2 comments) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33318/comment/ebc8fb3d_0aad9ea0 PS3, Line 2816: buf[1] = osmo_mobile_identity_encode_buf(buf+2, sizeof(buf)-2, &mi, false); > what if osmo_mobile_identity_encode_buf returns negative (error)? Due to updated patch set this function is not used anymore. File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33318/comment/b4e739f4_c6a6cdde PS4, Line 3044: char buf[32]; > this may be a bit short to print the whole osmo_mobile_identity_to_str_buf() in the case of IMSI? Di […] The longest string would be "IMEI-SV-1234567890123456\0". This is below 32. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib0d7f76cd635e8d1092ffc1d07ecb29ec0435dda Gerrit-Change-Number: 33318 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 Jan 2024 12:49:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-mgw[master]: add fmtp.[hc]
by pespin 05 Jan '24

05 Jan '24

Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35434?usp=email ) Change subject: add fmtp.[hc] ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35434?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3eaea353dbd98c19212199b564342d0ac16cbc07 Gerrit-Change-Number: 35434 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 05 Jan 2024 12:48:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: Add LLC and HLC transcoding to MNCC transcoding functions
by jolly 05 Jan '24

05 Jan '24

Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email ) Change subject: Add LLC and HLC transcoding to MNCC transcoding functions ...................................................................... Patch Set 3: (2 comments) Patchset: PS3: > I guess I agree in general, but I'm not aware we've so far developed some kind of standard/generic " […] The idea for choosing a structure for the new IEs was to change the data buffer into actually parsed fields later. There is no need for that on the network side, but on the mobile side, like osmocom-bb. Expanding MNCC potocol by adding new IEs to the end of the existing MNCC message would make sense, if even more IEs would follow. I would not put new effort in MNCC development, because it is unlikely that it needs to be expanded in the future. File include/osmocom/gsm/mncc.h: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/eca01449_a4d30c13 PS3, Line 37: int len; > this should be unsigned. And probably uint8_t. This makes sense. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de Gerrit-Change-Number: 35391 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(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: Fri, 05 Jan 2024 12:30:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0