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

[S] Change in libosmo-netif[master]: stream_test: Avoid leaking osmo_stream_srv_link
by daniel 04 Sep '23

04 Sep '23

Attention is currently required from: arehbein, fixeria, osmith, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email ) Change subject: stream_test: Avoid leaking osmo_stream_srv_link ...................................................................... Patch Set 2: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/34289/comment/6f6dc3a8_e04002ea PS1, Line 673: return EXIT_FAILURE; > I guess in theory you would need to destroy it here too Fine, fixed. Though the test would fail anyway if this path was taken. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I43b7327893c220447492d2c36c87b187a414cbdb Gerrit-Change-Number: 34289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 14:50:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_test: Avoid leaking osmo_stream_srv_link
by daniel 04 Sep '23

04 Sep '23

Attention is currently required from: arehbein, fixeria, osmith, pespin. daniel has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email ) The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: stream_test: Avoid leaking osmo_stream_srv_link ...................................................................... stream_test: Avoid leaking osmo_stream_srv_link Change-Id: I43b7327893c220447492d2c36c87b187a414cbdb --- M tests/stream/stream_test.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/89/34289/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I43b7327893c220447492d2c36c87b187a414cbdb Gerrit-Change-Number: 34289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: .gitignore: add include/osmocom/core/socket_compat.h
by pespin 04 Sep '23

04 Sep '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email ) Change subject: .gitignore: add include/osmocom/core/socket_compat.h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34306?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: Id7c245579f5a3288a9ea62589ca802e427e54720 Gerrit-Change-Number: 34306 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: Mon, 04 Sep 2023 11:43:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: tests/{v110,gsm44021}: change naming: 'test_' -> '_test'
by pespin 04 Sep '23

04 Sep '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email ) Change subject: tests/{v110,gsm44021}: change naming: 'test_' -> '_test' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34307?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: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce Gerrit-Change-Number: 34307 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: Mon, 04 Sep 2023 11:43:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: .gitignore: add include/osmocom/core/socket_compat.h
by fixeria 04 Sep '23

04 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34306?usp=email ) Change subject: .gitignore: add include/osmocom/core/socket_compat.h ...................................................................... .gitignore: add include/osmocom/core/socket_compat.h Ensure that this auto-generated file does not show up in `git status`. Change-Id: Id7c245579f5a3288a9ea62589ca802e427e54720 --- M .gitignore 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/34306/1 diff --git a/.gitignore b/.gitignore index d900138..264e739 100644 --- a/.gitignore +++ b/.gitignore @@ -98,6 +98,7 @@ src/gsm/*_gen.c include/osmocom/core/crc*gen.h include/osmocom/core/bit*gen.h +include/osmocom/core/socket_compat.h include/osmocom/gsm/gsm0503.h tests/conv/gsm0503_test_vectors.c -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34306?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: Id7c245579f5a3288a9ea62589ca802e427e54720 Gerrit-Change-Number: 34306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: tests/{v110,gsm44021}: change naming: 'test_' -> '_test'
by fixeria 04 Sep '23

04 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34307?usp=email ) Change subject: tests/{v110,gsm44021}: change naming: 'test_' -> '_test' ...................................................................... tests/{v110,gsm44021}: change naming: 'test_' -> '_test' Ensure that the test binaries do not show up in `git status`: tests/gsm44021/test_frame_csd tests/v110/test_frame tests/v110/test_ra1 The new naming complies to the 'tests/*/*_test' pattern in .gitignore. Change-Id: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce --- M tests/Makefile.am R tests/gsm44021/frame_csd_test.c R tests/gsm44021/frame_csd_test.ok M tests/testsuite.at R tests/v110/frame_test.c R tests/v110/frame_test.ok R tests/v110/ra1_test.c R tests/v110/ra1_test.ok 8 files changed, 47 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/34307/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 8df9d56..5f4914e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -51,9 +51,9 @@ smscb/gsm0341_test \ smscb/cbsp_test \ auth/xor2g_test \ - v110/test_frame \ - v110/test_ra1 \ - gsm44021/test_frame_csd \ + v110/frame_test \ + v110/ra1_test \ + gsm44021/frame_csd_test \ osmo_io/osmo_io_test \ $(NULL) @@ -362,14 +362,14 @@ iuup_iuup_test_SOURCES = iuup/iuup_test.c iuup_iuup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) -v110_test_frame_SOURCES = v110/test_frame.c -v110_test_frame_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) +v110_frame_test_SOURCES = v110/frame_test.c +v110_frame_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) -v110_test_ra1_SOURCES = v110/test_ra1.c -v110_test_ra1_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) +v110_ra1_test_SOURCES = v110/ra1_test.c +v110_ra1_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD) -gsm44021_test_frame_csd_SOURCES = gsm44021/test_frame_csd.c -gsm44021_test_frame_csd_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \ +gsm44021_frame_csd_test_SOURCES = gsm44021/frame_csd_test.c +gsm44021_frame_csd_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \ $(top_builddir)/src/gsm/libosmogsm.la \ $(LDADD) @@ -475,9 +475,9 @@ smscb/smscb_test.ok \ smscb/gsm0341_test.ok \ smscb/cbsp_test.ok \ - v110/test_frame.ok \ - v110/test_ra1.ok \ - gsm44021/test_frame_csd.ok \ + v110/frame_test.ok \ + v110/ra1_test.ok \ + gsm44021/frame_csd_test.ok \ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ $(NULL) @@ -684,12 +684,12 @@ >$(srcdir)/time_cc/time_cc_test.ok iuup/iuup_test \ >$(srcdir)/iuup/iuup_test.ok - v110/test_frame \ - >$(srcdir)/v110/test_frame.ok - v110/test_ra1 \ - >$(srcdir)/v110/test_ra1.ok - gsm44021/test_frame_csd \ - >$(srcdir)/gsm44021/test_frame_csd.ok + v110/frame_test \ + >$(srcdir)/v110/frame_test.ok + v110/ra1_test \ + >$(srcdir)/v110/ra1_test.ok + gsm44021/frame_csd_test \ + >$(srcdir)/gsm44021/frame_csd_test.ok osmo_io/osmo_io_test \ >$(srcdir)/osmo_io/osmo_io_test.ok \ 2>$(srcdir)/osmo_io/osmo_io_test.err diff --git a/tests/gsm44021/test_frame_csd.c b/tests/gsm44021/frame_csd_test.c similarity index 100% rename from tests/gsm44021/test_frame_csd.c rename to tests/gsm44021/frame_csd_test.c diff --git a/tests/gsm44021/test_frame_csd.ok b/tests/gsm44021/frame_csd_test.ok similarity index 100% rename from tests/gsm44021/test_frame_csd.ok rename to tests/gsm44021/frame_csd_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index a2c8845..3366995 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -491,22 +491,22 @@ AT_CHECK([$abs_top_builddir/tests/iuup/iuup_test], [0], [expout], [ignore]) AT_CLEANUP -AT_SETUP([v110_test_frame]) -AT_KEYWORDS([v110_test_frame]) -cat $abs_srcdir/v110/test_frame.ok > expout -AT_CHECK([$abs_top_builddir/tests/v110/test_frame], [], [expout],[]) +AT_SETUP([v110_frame_test]) +AT_KEYWORDS([v110_frame_test]) +cat $abs_srcdir/v110/frame_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/v110/frame_test], [], [expout],[]) AT_CLEANUP -AT_SETUP([v110_test_ra1]) -AT_KEYWORDS([v110_test_ra1]) -cat $abs_srcdir/v110/test_ra1.ok > expout -AT_CHECK([$abs_top_builddir/tests/v110/test_ra1], [], [expout],[]) +AT_SETUP([v110_ra1_test]) +AT_KEYWORDS([v110_ra1_test]) +cat $abs_srcdir/v110/ra1_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/v110/ra1_test], [], [expout],[]) AT_CLEANUP -AT_SETUP([gsm44021_test_frame_csd]) -AT_KEYWORDS([gsm44021_test_frame_csd]) -cat $abs_srcdir/gsm44021/test_frame_csd.ok > expout -AT_CHECK([$abs_top_builddir/tests/gsm44021/test_frame_csd], [], [expout],[]) +AT_SETUP([gsm44021_frame_csd_test]) +AT_KEYWORDS([gsm44021_frame_csd_test]) +cat $abs_srcdir/gsm44021/frame_csd_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm44021/frame_csd_test], [], [expout],[]) AT_CLEANUP AT_SETUP([osmo_io]) diff --git a/tests/v110/test_frame.c b/tests/v110/frame_test.c similarity index 100% rename from tests/v110/test_frame.c rename to tests/v110/frame_test.c diff --git a/tests/v110/test_frame.ok b/tests/v110/frame_test.ok similarity index 100% rename from tests/v110/test_frame.ok rename to tests/v110/frame_test.ok diff --git a/tests/v110/test_ra1.c b/tests/v110/ra1_test.c similarity index 100% rename from tests/v110/test_ra1.c rename to tests/v110/ra1_test.c diff --git a/tests/v110/test_ra1.ok b/tests/v110/ra1_test.ok similarity index 100% rename from tests/v110/test_ra1.ok rename to tests/v110/ra1_test.ok -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34307?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: I7bbcec2ec6887a2e6c9b37e2e5b3d9ee489654ce Gerrit-Change-Number: 34307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_test: Avoid leaking osmo_stream_srv_link
by osmith 04 Sep '23

04 Sep '23

Attention is currently required from: arehbein, daniel, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email ) Change subject: stream_test: Avoid leaking osmo_stream_srv_link ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/34289/comment/f54ca1e7_f0997a81 PS1, Line 673: return EXIT_FAILURE; I guess in theory you would need to destroy it here too -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I43b7327893c220447492d2c36c87b187a414cbdb Gerrit-Change-Number: 34289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 04 Sep 2023 10:22:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: oml: ipacc: Use new packed struct abis_nm_ipacc_att_rlc_cfg from libo...
by pespin 04 Sep '23

04 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34296?usp=email ) Change subject: oml: ipacc: Use new packed struct abis_nm_ipacc_att_rlc_cfg from libosmcore ...................................................................... oml: ipacc: Use new packed struct abis_nm_ipacc_att_rlc_cfg from libosmcore This way it becomes a lot clearer what kind of content is expected to be transmitted over the wire. It is expected that in the future the nowadays hardcoded values will be fed into struct abis_nm_ipacc_att_ns_cfg come from osmo_tdef, etc. Change-Id: I4b4dfac9fd36378b20889fb90135be74f8968d5f Depends: libosmocore.git Change-Id I60e17dedd1fadce0f705616e3ed96cabb318bcec Related: OS#5335 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 43 insertions(+), 19 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index f6cdd0b..d78f23b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -159,7 +159,9 @@ struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts) { struct msgb *msgb; - uint8_t buf[256]; + struct abis_nm_ipacc_att_rlc_cfg rlc_cfg; + struct abis_nm_ipacc_att_rlc_cfg_2 rlc_cfg_2; + uint8_t buf[2]; msgb = msgb_alloc(1024, "nanobts_attr_bts"); if (!msgb) return NULL; @@ -178,16 +180,18 @@ msgb_tl16v_put(msgb, NM_ATT_IPACC_BVCI, 2, buf); /* all timers in seconds, unless otherwise stated */ - buf[0] = 20; /* T3142 */ - buf[1] = 5; /* T3169 */ - buf[2] = 5; /* T3191 */ - buf[3] = 160; /* T3193 (units of 10ms) */ - buf[4] = 5; /* T3195 */ - buf[5] = 10; /* N3101 */ - buf[6] = 4; /* N3103 */ - buf[7] = 8; /* N3105 */ - buf[8] = 15; /* RLC CV countdown */ - msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, 9, buf); + rlc_cfg = (struct abis_nm_ipacc_att_rlc_cfg){ + .t3142 = 20, /* T3142 */ + .t3169 = 5, /* T3169 */ + .t3191 = 5, /* T3191 */ + .t3193_10ms = 160, /* T3193 (units of 10ms) */ + .t3195 = 5, /* T3195 */ + .n3101 = 10, /* N3101 */ + .n3103 = 4, /* N3103 */ + .n3105 = 8, /* N3105 */ + .rlc_cv_countdown = 15, /* RLC CV countdown */ + }; + msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, sizeof(rlc_cfg), (const uint8_t *)&rlc_cfg); if (bts->gprs.mode == BTS_GPRS_EGPRS) { buf[0] = 0x8f; @@ -198,18 +202,21 @@ } msgb_tl16v_put(msgb, NM_ATT_IPACC_CODING_SCHEMES, 2, buf); - buf[0] = 0; /* T downlink TBF extension (0..500, high byte) */ - buf[1] = 250; /* T downlink TBF extension (0..500, low byte) */ - buf[2] = 0; /* T uplink TBF extension (0..500, high byte) */ - buf[3] = 250; /* T uplink TBF extension (0..500, low byte) */ - buf[4] = 2; /* CS2 */ - msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, 5, buf); + rlc_cfg_2 = (struct abis_nm_ipacc_att_rlc_cfg_2){ + .t_dl_tbf_ext_10ms = htons(250), /* 0..500 */ + .t_ul_tbf_ext_10ms = htons(250), /* 0..500 */ + .initial_cs = 2, /* CS2 */ + }; + msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, sizeof(rlc_cfg_2), (const uint8_t *)&rlc_cfg_2); #if 0 /* EDGE model only, breaks older models. * Should inquire the BTS capabilities */ - buf[0] = 2; /* MCS2 */ - msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, 1, buf); + struct abis_nm_ipacc_att_rlc_cfg_3 rlc_cfg_3; + rlc_cfg_3 = (struct abis_nm_ipacc_att_rlc_cfg_3){ + .initial_mcs = 2, /* MCS2 */ + }; + msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, sizeof(rlc_cfg_3), (const uint8_t *)&rlc_cfg_3); #endif return msgb; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b4dfac9fd36378b20889fb90135be74f8968d5f Gerrit-Change-Number: 34296 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: oml: ipacc: Use new packed struct abis_nm_ipacc_att_ns_cfg from libos...
by pespin 04 Sep '23

04 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34295?usp=email ) Change subject: oml: ipacc: Use new packed struct abis_nm_ipacc_att_ns_cfg from libosmcore ...................................................................... oml: ipacc: Use new packed struct abis_nm_ipacc_att_ns_cfg from libosmcore This way it becomes a lot clearer what kind of content is expected to be transmitted over the wire. It is expected that in the future the bts_sm->gprs.nse.timer will disappear and the values fed into struct abis_nm_ipacc_att_ns_cfg come from osmo_tdef, etc. Change-Id: I610ca34babc0b0ac9477622aa7b8360be8f3f59f Depends: libosmocore.git Change-Id Ie477b0e6d79e6d408e0004fd60307afc5feaa3b6 Related: OS#5335 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 31 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index ce368fd..f6cdd0b 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -112,7 +112,8 @@ struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm) { struct msgb *msgb; - uint8_t buf[256]; + uint8_t buf[2]; + struct abis_nm_ipacc_att_ns_cfg ns_cfg; struct abis_nm_ipacc_att_bssgp_cfg bssgp_cfg; struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); msgb = msgb_alloc(1024, "nanobts_attr_bts"); @@ -124,10 +125,17 @@ buf[1] = bts_sm->gprs.nse.nsei & 0xff; msgb_tl16v_put(msgb, NM_ATT_IPACC_NSEI, 2, buf); - /* all timers in seconds */ - OSMO_ASSERT(ARRAY_SIZE(bts_sm->gprs.nse.timer) < sizeof(buf)); - memcpy(buf, bts_sm->gprs.nse.timer, ARRAY_SIZE(bts_sm->gprs.nse.timer)); - msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, 7, buf); + osmo_static_assert(ARRAY_SIZE(bts_sm->gprs.nse.timer) == 7, nse_timer_array_wrong_size); + ns_cfg = (struct abis_nm_ipacc_att_ns_cfg){ + .un_blocking_timer = bts_sm->gprs.nse.timer[0], + .un_blocking_retries = bts_sm->gprs.nse.timer[1], + .reset_timer = bts_sm->gprs.nse.timer[2], + .reset_retries = bts_sm->gprs.nse.timer[3], + .test_timer = bts_sm->gprs.nse.timer[4], + .alive_timer = bts_sm->gprs.nse.timer[5], + .alive_retries = bts_sm->gprs.nse.timer[6], + }; + msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, sizeof(ns_cfg), (const uint8_t *)&ns_cfg); osmo_static_assert(ARRAY_SIZE(bts->gprs.cell.timer) == 11, cell_timer_array_wrong_size); bssgp_cfg = (struct abis_nm_ipacc_att_bssgp_cfg){ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I610ca34babc0b0ac9477622aa7b8360be8f3f59f Gerrit-Change-Number: 34295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: oml: ipacc: Use new packed struct abis_nm_ipacc_att_bssgp_cfg from li...
by pespin 04 Sep '23

04 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34294?usp=email ) Change subject: oml: ipacc: Use new packed struct abis_nm_ipacc_att_bssgp_cfg from libosmcore ...................................................................... oml: ipacc: Use new packed struct abis_nm_ipacc_att_bssgp_cfg from libosmcore This way it becomes a lot clearer what kind of content is expected to be transmitted over the wire. It is expected that in the future the bts->gprs.cell.timer will disappear and the values fed into struct abis_nm_ipacc_att_bssgp_cfg come from osmo_tdef, etc. Depends: libosmocore.git Change-Id Ibfd759cb8a252f801bb3a758ea7960072c96f254 Related: OS#5335 Change-Id: Ie659879c548b29a08eeb8bf3fc023bf3d7d52aa1 --- M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 1 file changed, 34 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index 62a6dfb..ce368fd 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -113,6 +113,7 @@ { struct msgb *msgb; uint8_t buf[256]; + struct abis_nm_ipacc_att_bssgp_cfg bssgp_cfg; struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm); msgb = msgb_alloc(1024, "nanobts_attr_bts"); if (!msgb) @@ -128,9 +129,21 @@ memcpy(buf, bts_sm->gprs.nse.timer, ARRAY_SIZE(bts_sm->gprs.nse.timer)); msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, 7, buf); - OSMO_ASSERT(ARRAY_SIZE(bts->gprs.cell.timer) < sizeof(buf)); - memcpy(buf, bts->gprs.cell.timer, ARRAY_SIZE(bts->gprs.cell.timer)); - msgb_tl16v_put(msgb, NM_ATT_IPACC_BSSGP_CFG, 11, buf); + osmo_static_assert(ARRAY_SIZE(bts->gprs.cell.timer) == 11, cell_timer_array_wrong_size); + bssgp_cfg = (struct abis_nm_ipacc_att_bssgp_cfg){ + .t1_s = bts->gprs.cell.timer[0], + .t1_blocking_retries = bts->gprs.cell.timer[1], + .t1_unblocking_retries = bts->gprs.cell.timer[2], + .t2_s = bts->gprs.cell.timer[3], + .t2_retries = bts->gprs.cell.timer[4], + .t3_100ms = bts->gprs.cell.timer[5], + .t3_retries = bts->gprs.cell.timer[6], + .t4_100ms = bts->gprs.cell.timer[7], + .t4_retries = bts->gprs.cell.timer[8], + .t5_s = bts->gprs.cell.timer[9], + .t5_retries = bts->gprs.cell.timer[10], + }; + msgb_tl16v_put(msgb, NM_ATT_IPACC_BSSGP_CFG, sizeof(bssgp_cfg), (const uint8_t *)&bssgp_cfg); return msgb; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie659879c548b29a08eeb8bf3fc023bf3d7d52aa1 Gerrit-Change-Number: 34294 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0