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

[S] Change in osmo-trx[master]: tests: LMSDeviceTest: fix CPPFLAGS vs CXXFLAGS
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31843 ) Change subject: tests: LMSDeviceTest: fix CPPFLAGS vs CXXFLAGS ...................................................................... tests: LMSDeviceTest: fix CPPFLAGS vs CXXFLAGS * AM_CPPFLAGS is for preprocessor flags like '-I' or '-D', * AM_CXXFLAGS is for C++ compiler flags like '-Wall'. Change-Id: I82fc1eb6796f5289f0feff7bee5264bfacd6e733 --- M tests/Transceiver52M/Makefile.am 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/Transceiver52M/Makefile.am b/tests/Transceiver52M/Makefile.am index a5b91f6..473cec6 100644 --- a/tests/Transceiver52M/Makefile.am +++ b/tests/Transceiver52M/Makefile.am @@ -33,5 +33,5 @@ $(COMMON_LA) \ $(LMS_LIBS) \ $(NULL) -LMSDeviceTest_CPPFLAGS = $(AM_CPPFLAGS) $(LMS_CFLAGS) +LMSDeviceTest_CXXFLAGS = $(AM_CFLAGS) $(LMS_CFLAGS) endif -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I82fc1eb6796f5289f0feff7bee5264bfacd6e733 Gerrit-Change-Number: 31843 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: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-msc[master]: mncc_recvmsg(): log caller file,line
by msuraev 13 Mar '23

13 Mar '23

Attention is currently required from: neels. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31701 ) Change subject: mncc_recvmsg(): log caller file,line ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3755eb35b504f2f2580e0ba43dfa41f16087decc Gerrit-Change-Number: 31701 Gerrit-PatchSet: 6 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 20:34:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: tests/Makefile.am: clean up AM_* variables
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31776 ) Change subject: tests/Makefile.am: clean up AM_* variables ...................................................................... tests/Makefile.am: clean up AM_* variables * -I is a preprocessor flag, so it should be in AM_CPPFLAGS * $(LIBOSMOCORE_LDFLAGS) is not defined here, remove it Change-Id: Ice892f848e06b601e67b06a4e1e25c11fb7c4128 --- M tests/Makefile.am 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index c43419b..cc33960 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,6 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g -AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) -no-install +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) -g +AM_LDFLAGS = -no-install LDADD = \ $(top_builddir)/src/libosmonetif.la \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ice892f848e06b601e67b06a4e1e25c11fb7c4128 Gerrit-Change-Number: 31776 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: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: src/Makefile.am: do not overwrite AM_LDFLAGS
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31861 ) Change subject: src/Makefile.am: do not overwrite AM_LDFLAGS ...................................................................... src/Makefile.am: do not overwrite AM_LDFLAGS Change-Id: I7b656c167cceb0657c0362b1237f846b7f3e9770 --- M src/Makefile.am 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/Makefile.am b/src/Makefile.am index 1e89e39..f12085d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libosmonetif.la libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) -libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined +libosmonetif_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ datagram.c \ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7b656c167cceb0657c0362b1237f846b7f3e9770 Gerrit-Change-Number: 31861 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: {utils,tests}/Makefile.am: reorder libraries in LDADD
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31775 ) Change subject: {utils,tests}/Makefile.am: reorder libraries in LDADD ...................................................................... {utils,tests}/Makefile.am: reorder libraries in LDADD Otherwise the linker may pick system-installed libs instead. Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a --- M tests/Makefile.am M utils/Makefile.am 2 files changed, 19 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index a21f0b1..c43419b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,12 @@ AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) -no-install +LDADD = \ + $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + check_PROGRAMS = \ osmux/osmux_test \ osmux/osmux_output_test \ @@ -12,22 +18,11 @@ check_HEADERS = osmux_osmux_test_SOURCES = osmux/osmux_test.c -osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - osmux_osmux_output_test_SOURCES = osmux/osmux_output_test.c -osmux_osmux_output_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - osmux_osmux_input_test_SOURCES = osmux/osmux_input_test.c -osmux_osmux_input_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - stream_stream_test_SOURCES = stream/stream_test.c -stream_stream_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c -jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la - amr_amr_test_SOURCES = amr/amr_test.c -amr_amr_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la if HAVE_PCAP check_PROGRAMS += jibuf/jibuf_tool @@ -45,11 +40,7 @@ osmo-pcap-test/l4_udp.c \ osmo-pcap-test/pcap.c -jibuf_jibuf_tool_LDADD = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(top_builddir)/src/libosmonetif.la \ - -lpcap +jibuf_jibuf_tool_LDADD = $(LDADD) -lpcap endif # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/utils/Makefile.am b/utils/Makefile.am index 5640190..0df792b 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -8,10 +8,10 @@ $(NULL) LDADD = \ + $(top_builddir)/src/libosmonetif.la \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOCODEC_LIBS) \ $(LIBOSMOGSM_LIBS) \ - $(top_builddir)/src/libosmonetif.la \ $(NULL) noinst_PROGRAMS = osmo-amr-inspect -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a Gerrit-Change-Number: 31775 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: {utils,tests}/Makefile.am: reorder libraries in LDADD
by fixeria 13 Mar '23

13 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31775 ) Change subject: {utils,tests}/Makefile.am: reorder libraries in LDADD ...................................................................... Patch Set 2: (1 comment) File tests/Makefile.am: https://gerrit.osmocom.org/c/libosmo-netif/+/31775/comment/a990acdc_a6076f1c PS1, Line 6: $(LIBOSMOCORE_LIBS) \ > these two should be swapped so that GSM is before CORE, to have proper dependency chain. The ordering of external libraries is not really that important. What really matters is that the repository-local libraries are listed first. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a Gerrit-Change-Number: 31775 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 20:32:38 +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-bts[master]: osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan()
by msuraev 13 Mar '23

13 Mar '23

Attention is currently required from: laforge, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31672 ) Change subject: osmo-bts-trx: alloc/free burst buffers in trx_sched_set_lchan() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a5f76023fc492786076a63016f81285b3576c33 Gerrit-Change-Number: 31672 Gerrit-PatchSet: 4 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: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 20:32:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: {utils,tests}/Makefile.am: reorder libraries in LDADD
by fixeria 13 Mar '23

13 Mar '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/31775 ) Change subject: {utils,tests}/Makefile.am: reorder libraries in LDADD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/31775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ia639b1c5460ad9391d2c311b4978ca9374789f7a Gerrit-Change-Number: 31775 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Mar 2023 20:29:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: gprsdecode: Makefile.am: drop -Wno-missing-braces and -O3
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31853 ) Change subject: gprsdecode: Makefile.am: drop -Wno-missing-braces and -O3 ...................................................................... gprsdecode: Makefile.am: drop -Wno-missing-braces and -O3 Do not hard-code these CFLAGs, let the user decide on them. Change-Id: I3a946b853029cc4cff9c2b15aa7339f84b2cb6c9 --- M src/host/gprsdecode/Makefile.am 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/gprsdecode/Makefile.am b/src/host/gprsdecode/Makefile.am index 542d54b..b5c8b12 100644 --- a/src/host/gprsdecode/Makefile.am +++ b/src/host/gprsdecode/Makefile.am @@ -6,8 +6,7 @@ $(NULL) AM_CFLAGS = \ - -Wall -O3 \ - -Wno-missing-braces \ + -Wall \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOCODING_CFLAGS) \ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3a946b853029cc4cff9c2b15aa7339f84b2cb6c9 Gerrit-Change-Number: 31853 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23: fix parsing of command line options
by fixeria 13 Mar '23

13 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31863 ) Change subject: layer23: fix parsing of command line options ...................................................................... layer23: fix parsing of command line options After the recent refactoring, parsing of the command line options is broken for some arguments. Specifically, the value of '-a'/'--arfcn' is ignored and hard-coded ARFCN=871 is used instead. The problem is that l23_app_init(), which allocates an MS state and sets the initial ARFCN, is called *before* handle_options(). So the cfg_test_arfcn is used before it gets overwritten from the argv[]. The usual approach in osmo-* apps is to parse the command line arguments first, and only then execute code which depends on configurable parameters. Let's follow this approach too. Change-Id: I77ca11c14561fa3fcb9add60ccea5b0b847a20c4 --- M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/main.c 2 files changed, 29 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 31e7154..e4a15ee 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -254,14 +254,14 @@ print_copyright(); + handle_options(argc, argv); + rc = l23_app_init(); if (rc < 0) { fprintf(stderr, "Failed during l23_app_init()\n"); exit(1); } - handle_options(argc, argv); - if (l23_app_info.opt_supported & L23_OPT_VTY) { if (_vty_init() < 0) exit(1); diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 3260bff..d24a802 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -255,6 +255,12 @@ print_copyright(); + rc = handle_options(argc, argv); + if (rc) { /* Abort in case of parsing errors */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + return 1; + } + srand(time(NULL)); INIT_LLIST_HEAD(&ms_list); @@ -272,12 +278,6 @@ exit(1); } - rc = handle_options(argc, argv); - if (rc) { /* Abort in case of parsing errors */ - fprintf(stderr, "Error in command line options. Exiting.\n"); - return 1; - } - if (custom_cfg_file) { /* Use full path provided by user */ config_file = talloc_strdup(l23_ctx, custom_cfg_file); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I77ca11c14561fa3fcb9add60ccea5b0b847a20c4 Gerrit-Change-Number: 31863 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: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0