- gerrit-log - lists.osmocom.org

Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586
by OBS Notification 11 Aug '22

11 Aug '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 204s] cc -Ilib/sbi/ogssbi@sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/ogssbi(a)sha/client.c.o' -MF 'lib/sbi/ogssbi(a)sha/client.c.o.d' -o 'lib/sbi/ogssbi(a)sha/client.c.o' -c ../lib/sbi/client.c [ 204s] In file included from /usr/include/i386-linux-gnu/curl/curl.h:2738:0, [ 204s] from ../lib/sbi/client.c:23: [ 204s] ../lib/sbi/client.c: In function ‘ogs_sbi_client_add’: [ 204s] ../lib/sbi/client.c:121:30: error: ‘CURLMOPT_MAX_CONCURRENT_STREAMS’ undeclared (first use in this function); did you mean ‘CURLMOPT_MAXCONNECTS’? [ 204s] curl_multi_setopt(multi, CURLMOPT_MAX_CONCURRENT_STREAMS, [ 204s] ^ [ 204s] ../lib/sbi/client.c:121:30: note: each undeclared identifier is reported only once for each function it appears in [ 204s] [2781/3254] cc -Ilib/sbi/ogssbi@sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/ogssbi(a)sha/nnrf-handler.c.o' -MF 'lib/sbi/ogssbi(a)sha/nnrf-handler.c.o.d' -o 'lib/sbi/ogssbi(a)sha/nnrf-handler.c.o' -c ../lib/sbi/nnrf-handler.c [ 204s] [2782/3254] cc -Ilib/sbi/ogssbi@sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/ogssbi(a)sha/nnrf-build.c.o' -MF 'lib/sbi/ogssbi(a)sha/nnrf-build.c.o.d' -o 'lib/sbi/ogssbi(a)sha/nnrf-build.c.o' -c ../lib/sbi/nnrf-build.c [ 204s] [2783/3254] cc -Ilib/sbi/ogssbi@sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/ogssbi(a)sha/nghttp2-server.c.o' -MF 'lib/sbi/ogssbi(a)sha/nghttp2-server.c.o.d' -o 'lib/sbi/ogssbi(a)sha/nghttp2-server.c.o' -c ../lib/sbi/nghttp2-server.c [ 205s] [2784/3254] cc -Ilib/sbi/ogssbi@sha -Ilib/sbi -I../lib/sbi -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/app -I../lib/app -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DOGS_SBI_COMPILATION -MD -MQ 'lib/sbi/ogssbi(a)sha/context.c.o' -MF 'lib/sbi/ogssbi(a)sha/context.c.o.d' -o 'lib/sbi/ogssbi(a)sha/context.c.o' -c ../lib/sbi/context.c [ 206s] [2785/3254] cc -Isubprojects/freeDiameter/extensions/dict_dcca_3gpp/dict_dcca_3gpp@sha -Isubprojects/freeDiameter/extensions/dict_dcca_3gpp -I../subprojects/freeDiameter/extensions/dict_dcca_3gpp -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Werror -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized -Wno-format-truncation -Wno-stringop-truncation -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'subprojects/freeDiameter/extensions/dict_dcca_3gpp/dict_dcca_3gpp(a)sha/add_avps.c.o' -MF 'subprojects/freeDiameter/extensions/dict_dcca_3gpp/dict_dcca_3gpp(a)sha/add_avps.c.o.d' -o 'subprojects/freeDiameter/extensions/dict_dcca_3gpp/dict_dcca_3gpp(a)sha/add_avps.c.o' -c ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/add_avps.c [ 206s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/add_avps.c: In function ‘add_avps’: [ 206s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/add_avps.c:16:5: note: variable tracking size limit exceeded with -fvar-tracking-assignments, retrying without [ 206s] int add_avps() [ 206s] ^~~~~~~~ [ 206s] ninja: build stopped: subcommand failed. [ 206s] dh_auto_build: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 ninja -j6 -v returned exit code 1 [ 206s] debian/rules:11: recipe for target 'binary' failed [ 206s] make: *** [binary] Error 1 [ 206s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 206s] ### VM INTERACTION START ### [ 206s] [ 197.797451][ T1] sysrq: Power Off [ 206s] [ 197.798938][ T7] reboot: Power down [ 206s] ### VM INTERACTION END ### [ 206s] [ 206s] sheep87 failed "build open5gs_2.4.9.14.ec9fe.202208110052.dsc" at Thu Aug 11 01:09:57 UTC 2022. [ 206s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Build failure of network:osmocom:nightly/open5gs in Debian_10/i586
by OBS Notification 11 Aug '22

11 Aug '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/open5gs failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 165s] (long long)triggeringMessage); [ 165s] ^ [ 165s] ../lib/core/ogs-log.h:45:8: note: in definition of macro ‘ogs_log_message’ [ 165s] 0, __VA_ARGS__) [ 165s] ^~~~~~~~~~~ [ 165s] ../src/mme/s1ap-handler.c:1265:13: note: in expansion of macro ‘ogs_debug’ [ 165s] ogs_debug("triggeringMessage: %lld", [ 165s] ^~~~~~~~~ [ 165s] ../src/mme/s1ap-handler.c:1270:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] [ 165s] (long long)procedureCriticality); [ 165s] ^ [ 165s] ../lib/core/ogs-log.h:45:8: note: in definition of macro ‘ogs_log_message’ [ 165s] 0, __VA_ARGS__) [ 165s] ^~~~~~~~~~~ [ 165s] ../src/mme/s1ap-handler.c:1269:13: note: in expansion of macro ‘ogs_debug’ [ 165s] ogs_debug("procedureCriticality: %lld", [ 165s] ^~~~~~~~~ [ 165s] [2784/3254] cc -Isrc/mme/e6d01c5@@mme@sta -Isrc/mme -I../src/mme -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/metrics -I../lib/metrics -Ilib/sctp -I../lib/sctp -Ilib/s1ap -I../lib/s1ap -Ilib/asn1c/s1ap -I../lib/asn1c/s1ap -Ilib/asn1c/common -I../lib/asn1c/common -Ilib/asn1c/util -I../lib/asn1c/util -Ilib/nas/eps -I../lib/nas/eps -Ilib/nas/common -I../lib/nas/common -Ilib/crypt -I../lib/crypt -Ilib/diameter/s6a -I../lib/diameter/s6a -Ilib/diameter/common -I../lib/diameter/common -Isubprojects/freeDiameter/include -I../subprojects/freeDiameter/include -Isubprojects/freeDiameter -I../subprojects/freeDiameter -Ilib/gtp -I../lib/gtp -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/mme/e6d01c5@@mme@sta/mme-context.c.o' -MF 'src/mme/e6d01c5@@mme@sta/mme-context.c.o.d' -o 'src/mme/e6d01c5@@mme@sta/mme-context.c.o' -c ../src/mme/mme-context.c [ 165s] ninja: build stopped: subcommand failed. [ 165s] dh_auto_build: cd obj-i686-linux-gnu && LC_ALL=C.UTF-8 ninja -j6 -v returned exit code 1 [ 165s] make: *** [debian/rules:11: binary] Error 1 [ 165s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 165s] ### VM INTERACTION START ### [ 166s] [ 155.899202][ T1] sysrq: Power Off [ 166s] [ 155.900907][ T139] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] sheep83 failed "build open5gs_2.4.9.14.ec9fe.202208110052.dsc" at Thu Aug 11 01:07:41 UTC 2022. [ 166s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Set g_osmux_enabled_cn directly in the test
by pespin 10 Aug '22

10 Aug '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29009 ) Change subject: bsc: Set g_osmux_enabled_cn directly in the test ...................................................................... bsc: Set g_osmux_enabled_cn directly in the test We want to add more options later on, and we don't want to be passing all of them as params. Let's simply set the global fields directly in the test and let f_init() use the confgured values. Change-Id: I27b685c2c22cf876b5eba79cf8ad151a2643ecb1 --- M bsc/BSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d8a660c..7f4ce46 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1083,7 +1083,6 @@ } f_vty_transceive(BSCVTY, "exit"); f_vty_transceive(BSCVTY, "exit"); - g_osmux_enabled_cn := allow; } function f_init_vty(charstring id := "foo") runs on test_CT { @@ -1187,7 +1186,7 @@ * \param handler_mode Start an RSL_Emulation_CT component (true) or not (false). * \param nr_msc Number of virtual MSCs to bring up to connect to osmo-bsc. */ -function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux_cn := false, +function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT { var integer bssap_idx; @@ -1200,7 +1199,7 @@ activate(as_Tguard()); f_init_vty("VirtMSC"); - f_vty_allow_osmux_cn(allow_osmux_cn); + f_vty_allow_osmux_cn(g_osmux_enabled_cn); var my_BooleanList allow_attach := { false, false, false }; f_init_statsd("VirtMSC", vc_STATSD, mp_test_ip, mp_bsc_statsd_port); @@ -5262,7 +5261,8 @@ pars.expect_mr_conf_ie := mr_conf; pars.use_osmux_cn := true; - f_init(1, true, true); + g_osmux_enabled_cn := true; + f_init(1, true); f_sleep(1.0); f_vty_amr_start_mode_set(false, "1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29009 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: I27b685c2c22cf876b5eba79cf8ad151a2643ecb1 Gerrit-Change-Number: 29009 Gerrit-PatchSet: 2 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Rename s/use_osmux/use_osmux_cn/
by pespin 10 Aug '22

10 Aug '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29008 ) Change subject: bsc: Rename s/use_osmux/use_osmux_cn/ ...................................................................... bsc: Rename s/use_osmux/use_osmux_cn/ That config is used to control the use of osmux between BSC<->MSC. Since we'll add support for Osmux in BTS<->BSC, we want to test that in a separate way. Let's rename it so that we can add a "use_osmux_bts" later on. Change-Id: I3bde4e6772c18043dd763d7747b5dbe40e0da3b8 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn 3 files changed, 28 insertions(+), 28 deletions(-) Approvals: daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f3e15ef..d8a660c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -632,7 +632,7 @@ var boolean g_initialized := false; /* Osmux is enabled through VTY */ - var boolean g_osmux_enabled := false; + var boolean g_osmux_enabled_cn := false; /*Configure T(tias) over VTY, seconds */ var integer g_bsc_sccp_timer_ias := 7 * 60; @@ -893,17 +893,17 @@ var boolean reset_received := false; timer T := 5.0; BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[bssap_idx].sccp_addr_peer, g_bssap[bssap_idx].sccp_addr_own, - ts_BSSMAP_Reset(0, g_osmux_enabled))); + ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); T.start; alt { [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[bssap_idx].sccp_addr_own, g_bssap[bssap_idx].sccp_addr_peer, - tr_BSSMAP_ResetAck(g_osmux_enabled))) { + tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { log("BSSMAP: Received RESET-ACK in response to RESET, we're ready to go!"); } - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind { + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) -> value ud_ind { log("BSSMAP: Respoding to inbound RESET with RESET-ACK"); BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, - ts_BSSMAP_ResetAck(g_osmux_enabled))); + ts_BSSMAP_ResetAck(g_osmux_enabled_cn))); reset_received := true; repeat; } @@ -1035,15 +1035,15 @@ mtc.stop; } /* always respond with RESET ACK to RESET */ - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) -> value ud_ind { + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) -> value ud_ind { BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress, ud_ind.calledAddress, - ts_BSSMAP_ResetAck(g_osmux_enabled))); + ts_BSSMAP_ResetAck(g_osmux_enabled_cn))); repeat; } } altstep no_bssmap_reset() runs on test_CT { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled))) { + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?, tr_BSSMAP_Reset(g_osmux_enabled_cn))) { setverdict(fail, "unexpected BSSMAP Reset"); mtc.stop; } @@ -1074,7 +1074,7 @@ * contains extra IE (OsmuxSupport) and osmo-bsc will handle AssignReq with * OsmuxCID IE. */ -private function f_vty_allow_osmux(boolean allow) runs on test_CT { +private function f_vty_allow_osmux_cn(boolean allow) runs on test_CT { f_vty_enter_cfg_msc(BSCVTY, 0); if (allow) { f_vty_transceive(BSCVTY, "osmux on"); @@ -1083,7 +1083,7 @@ } f_vty_transceive(BSCVTY, "exit"); f_vty_transceive(BSCVTY, "exit"); - g_osmux_enabled := allow; + g_osmux_enabled_cn := allow; } function f_init_vty(charstring id := "foo") runs on test_CT { @@ -1187,7 +1187,7 @@ * \param handler_mode Start an RSL_Emulation_CT component (true) or not (false). * \param nr_msc Number of virtual MSCs to bring up to connect to osmo-bsc. */ -function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux := false, +function f_init(integer nr_bts := NUM_BTS, boolean handler_mode := false, boolean allow_osmux_cn := false, integer nr_msc := 1, float guard_timeout := 30.0) runs on test_CT { var integer bssap_idx; @@ -1200,7 +1200,7 @@ activate(as_Tguard()); f_init_vty("VirtMSC"); - f_vty_allow_osmux(allow_osmux); + f_vty_allow_osmux_cn(allow_osmux_cn); var my_BooleanList allow_attach := { false, false, false }; f_init_statsd("VirtMSC", vc_STATSD, mp_test_ip, mp_bsc_statsd_port); @@ -1216,7 +1216,7 @@ * MSC-side BSSAP emulation */ if (handler_mode) { var RanOps ranops := MSC_RanOps; - ranops.use_osmux := g_osmux_enabled; + ranops.use_osmux := g_osmux_enabled_cn; f_ran_adapter_init(g_bssap[bssap_idx], mp_bssap_cfg[bssap_idx], "VirtMSC", ranops); connect(self:SCCPLITE_IPA_CTRL, g_bssap[bssap_idx].vc_RAN:CTRL_CLIENT); f_ran_adapter_start(g_bssap[bssap_idx]); @@ -2291,9 +2291,9 @@ IPA_RSL[0][0].clear; /* perform BSSAP RESET, expect RESET ACK and DISC.ind on connection */ - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled))); + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); interleave { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled))) { } + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } [] BSSAP.receive(tr_BSSAP_DISC_ind(dt.sccp_conn_id, ?, ?)) { } } @@ -3559,9 +3559,9 @@ f_pageing_helper('001010123456789'H, cid_list, c_BtsId_all); /* Perform a BSSMAP Reset and wait for ACK */ - BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled))); + BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap[0].sccp_addr_peer, g_bssap[0].sccp_addr_own, ts_BSSMAP_Reset(0, g_osmux_enabled_cn))); alt { - [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled))) { } + [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(g_bssap[0].sccp_addr_own, g_bssap[0].sccp_addr_peer, tr_BSSMAP_ResetAck(g_osmux_enabled_cn))) { } [] BSSAP.receive { repeat; } } @@ -4289,8 +4289,8 @@ } private function f_assignment_codec(charstring id, boolean do_perform_clear := true) runs on MSC_ConnHdlr { - var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux); + var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { @@ -5260,7 +5260,7 @@ pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; pars.expect_mr_conf_ie := mr_conf; - pars.use_osmux := true; + pars.use_osmux_cn := true; f_init(1, true, true); f_sleep(1.0); @@ -10532,8 +10532,8 @@ */ private function f_TC_refuse_mode_modif_to_vamos(charstring id) runs on MSC_ConnHdlr { - var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux); + var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 6074fb2..131c2d4 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -298,8 +298,8 @@ private function f_est_lchan_and_mode_modify_to_vamos() runs on MSC_ConnHdlr { - var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux); - var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux); + var PDU_BSSAP ass_cmd := f_gen_ass_req(g_pars.use_osmux_cn); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(g_pars.use_osmux_cn); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 06f9ebe..d07c912 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -318,7 +318,7 @@ int2str(mgcp_conn.sample_rate))), valueof(ts_SDP_ptime(mgcp_conn.ptime)) } )); var template MgcpResponse mgcp_resp; - if (g_pars.use_osmux and f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) { + if (g_pars.use_osmux_cn and f_MgcpCmd_contains_par(mgcp_cmd, "X-OSMUX")) { osmux_cid := f_MgcpCmd_extract_osmux_cid(mgcp_cmd); mgcp_resp := ts_CRCX_ACK_osmux(mgcp_cmd.line.trans_id, mgcp_conn.conn_id, osmux_cid, sdp); } else { @@ -674,7 +674,7 @@ uint5_t exp_ms_power_level, boolean exp_ms_power_params, boolean aoip, - boolean use_osmux, + boolean use_osmux_cn, charstring host_aoip_tla, TestHdlrParamsMSCPool mscpool, boolean media_mgw_offer_ipv6, @@ -712,7 +712,7 @@ exp_ms_power_level := 7, /* calculated from osmo-bsc.cfg "ms max power" */ exp_ms_power_params := false, aoip := true, - use_osmux := false, + use_osmux_cn := false, host_aoip_tla := "1.2.3.4", mscpool := { bssap_idx := 0, @@ -1506,7 +1506,7 @@ var MgcpEndpoint ep := int2str(cic) & "@mgw"; /* 1: matches value configured in BSC_Tests.ttcn pass in AssignReq */ var MgcpCallId call_id := '51234'H; var SDP_attribute_list attributes := { valueof(ts_SDP_ptime(20)) }; - if (g_pars.use_osmux) { + if (g_pars.use_osmux_cn) { cmd := ts_CRCX_osmux(get_next_trans_id(), ep, "sendrecv", call_id, cic); resp := tr_CRCX_ACK_osmux; } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29008 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: I3bde4e6772c18043dd763d7747b5dbe40e0da3b8 Gerrit-Change-Number: 29008 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bts[master]: Clean up osmo-bts-*/Makefile.am
by pespin 10 Aug '22

10 Aug '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/29031 to look at the new patch set (#3). Change subject: Clean up osmo-bts-*/Makefile.am ...................................................................... Clean up osmo-bts-*/Makefile.am Make them more easy to read and edit by splitting to one lement per line when several elements are present. Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b --- M src/osmo-bts-lc15/Makefile.am M src/osmo-bts-oc2g/Makefile.am M src/osmo-bts-octphy/Makefile.am M src/osmo-bts-omldummy/Makefile.am M src/osmo-bts-sysmo/Makefile.am M src/osmo-bts-virtual/Makefile.am 6 files changed, 305 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/29031/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b Gerrit-Change-Number: 29031 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bts[master]: Clean up osmo-bts-*/Makefile.am
by pespin 10 Aug '22

10 Aug '22

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/29031 to look at the new patch set (#2). Change subject: Clean up osmo-bts-*/Makefile.am ...................................................................... Clean up osmo-bts-*/Makefile.am Make them more easy to read and edit by splitting to one lement per line when several elements are present. Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b --- M src/osmo-bts-lc15/Makefile.am M src/osmo-bts-oc2g/Makefile.am M src/osmo-bts-octphy/Makefile.am M src/osmo-bts-omldummy/Makefile.am M src/osmo-bts-sysmo/Makefile.am M src/osmo-bts-virtual/Makefile.am 6 files changed, 303 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/29031/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b Gerrit-Change-Number: 29031 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-upf[master]: GTP mockup: list active GTP endecaps actions
by neels 10 Aug '22

10 Aug '22

Attention is currently required from: laforge, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28986 ) Change subject: GTP mockup: list active GTP endecaps actions ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: modified the commit log to better explain why the patch is useful -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic09a5ccea24086eb04f46e6af669668e5fade752 Gerrit-Change-Number: 28986 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 10 Aug 2022 18:11:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-upf[master]: GTP mockup: list active GTP endecaps actions
by neels 10 Aug '22

10 Aug '22

Attention is currently required from: neels, laforge, fixeria. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28986 to look at the new patch set (#3). Change subject: GTP mockup: list active GTP endecaps actions ...................................................................... GTP mockup: list active GTP endecaps actions In GTP mockup mode, keep a GTP device (struct upf_gtp_dev) so that the GTP actions activated in mockup mode are listed on VTY. Drop the global GTP mockup mode, and instead allow single GTP devices to be mockup devices. Do not always open the mnl_socket, but only open it when an actual non-mockup GTP device is being opened. (In the presence of non-mockup GTP devices, this still happens directly upon program startup.) The GTP mockup was first introduced for VTY tests during 'make check'. So far, in mockup mode, all GTP tunnel actions were simply cut short, and no tunnels were ever listed as active. TTCN3 tests do query osmo-upf to list currently active tunnels, so the GTP mockup fails these tests. To allow running TTCN3 tests without cap_net_admin privileges, always list (fake) active GTP tunnels. Useful in a lab environment: send PFCP commands to osmo-upf and get a listing of GTP tunnels that would have been active. So far, osmo-upf always uses only the first GTP device configured, but if we add support for multiple GTP devices, this patch allows putting only single devices in mockup mode. Related: SYS#5599 Change-Id: Ic09a5ccea24086eb04f46e6af669668e5fade752 --- M doc/examples/osmo-upf/osmo-upf-mockup.cfg M include/osmocom/upf/upf.h M include/osmocom/upf/upf_gtp.h M src/osmo-upf/osmo_upf_main.c M src/osmo-upf/up_gtp_action.c M src/osmo-upf/upf.c M src/osmo-upf/upf_gtp.c M src/osmo-upf/upf_vty.c M tests/upf.vty 9 files changed, 82 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/86/28986/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ic09a5ccea24086eb04f46e6af669668e5fade752 Gerrit-Change-Number: 28986 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bts[master]: Clean up osmo-bts-*/Makefile.am
by pespin 10 Aug '22

10 Aug '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29031 ) Change subject: Clean up osmo-bts-*/Makefile.am ...................................................................... Clean up osmo-bts-*/Makefile.am Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b --- M src/osmo-bts-lc15/Makefile.am M src/osmo-bts-oc2g/Makefile.am M src/osmo-bts-octphy/Makefile.am M src/osmo-bts-omldummy/Makefile.am M src/osmo-bts-sysmo/Makefile.am M src/osmo-bts-virtual/Makefile.am 6 files changed, 303 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/29031/1 diff --git a/src/osmo-bts-lc15/Makefile.am b/src/osmo-bts-lc15/Makefile.am index bb68efa..607ce35 100644 --- a/src/osmo-bts-lc15/Makefile.am +++ b/src/osmo-bts-lc15/Makefile.am @@ -1,38 +1,99 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(LITECELL15_INCDIR) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(LIBSYSTEMD_CFLAGS) -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(LIBSYSTEMD_CFLAGS) \ + $(NULL) + +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(NULL) AM_CFLAGS += -DENABLE_LC15BTS -EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h misc/lc15bts_led.h \ - misc/lc15bts_temp.h misc/lc15bts_power.h misc/lc15bts_clock.h \ - misc/lc15bts_bid.h misc/lc15bts_nl.h misc/lc15bts_bts.h misc/lc15bts_swd.h \ - hw_misc.h l1_if.h l1_transp.h lc15bts.h utils.h +EXTRA_DIST = \ + misc/lc15bts_mgr.h \ + misc/lc15bts_misc.h \ + misc/lc15bts_par.h \ + misc/lc15bts_led.h \ + misc/lc15bts_temp.h \ + misc/lc15bts_power.h \ + misc/lc15bts_clock.h \ + misc/lc15bts_bid.h \ + misc/lc15bts_nl.h \ + misc/lc15bts_bts.h \ + misc/lc15bts_swd.h \ + hw_misc.h \ + l1_if.h \ + l1_transp.h \ + lc15bts.h \ + utils.h \ + $(NULL) bin_PROGRAMS = osmo-bts-lc15 lc15bts-mgr lc15bts-util -COMMON_SOURCES = main.c lc15bts.c l1_if.c oml.c lc15bts_vty.c tch.c hw_misc.c calib_file.c \ - utils.c misc/lc15bts_par.c misc/lc15bts_bid.c +COMMON_SOURCES = \ + main.c \ + lc15bts.c \ + l1_if.c \ + oml.c \ + lc15bts_vty.c \ + tch.c \ + hw_misc.c \ + calib_file.c \ + utils.c \ + misc/lc15bts_par.c \ + misc/lc15bts_bid.c \ + $(NULL) osmo_bts_lc15_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c -osmo_bts_lc15_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) +osmo_bts_lc15_LDADD = \ + $(top_builddir)/src/common/libbts.a \ + $(COMMON_LDADD) \ + $(NULL) lc15bts_mgr_SOURCES = \ - misc/lc15bts_mgr.c misc/lc15bts_misc.c \ - misc/lc15bts_par.c misc/lc15bts_nl.c \ - misc/lc15bts_temp.c misc/lc15bts_power.c \ - misc/lc15bts_clock.c misc/lc15bts_bid.c \ + misc/lc15bts_mgr.c \ + misc/lc15bts_misc.c \ + misc/lc15bts_par.c \ + misc/lc15bts_nl.c \ + misc/lc15bts_temp.c \ + misc/lc15bts_power.c \ + misc/lc15bts_clock.c \ + misc/lc15bts_bid.c \ misc/lc15bts_mgr_vty.c \ misc/lc15bts_mgr_nl.c \ misc/lc15bts_mgr_temp.c \ misc/lc15bts_mgr_calib.c \ misc/lc15bts_led.c \ misc/lc15bts_bts.c \ - misc/lc15bts_swd.c + misc/lc15bts_swd.c \ + $(NULL) -lc15bts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD) +lc15bts_mgr_LDADD = \ + $(top_builddir)/src/common/libbts.a \ + $(COMMON_LDADD) \ + $(LIBGPS_LIBS) \ + $(NULL) -lc15bts_util_SOURCES = misc/lc15bts_util.c misc/lc15bts_par.c +lc15bts_util_SOURCES = \ + misc/lc15bts_util.c \ + misc/lc15bts_par.c º + $(NULL) lc15bts_util_LDADD = $(LIBOSMOCORE_LIBS) diff --git a/src/osmo-bts-oc2g/Makefile.am b/src/osmo-bts-oc2g/Makefile.am index 7b18e88..9a5994e 100644 --- a/src/osmo-bts-oc2g/Makefile.am +++ b/src/osmo-bts-oc2g/Makefile.am @@ -1,38 +1,101 @@ -AUTOMAKE_OPTIONS = subdir-objects +AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OC2G_INCDIR) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) $(LIBSYSTEMD_CFLAGS) -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(LIBSYSTEMD_CFLAGS) \ + $(ORTP_CFLAGS) \ + $(NULL) + +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(ORTP_LIBS) \ + $(NULL) AM_CFLAGS += -DENABLE_OC2GBTS -EXTRA_DIST = misc/oc2gbts_mgr.h misc/oc2gbts_misc.h misc/oc2gbts_par.h misc/oc2gbts_led.h \ - misc/oc2gbts_temp.h misc/oc2gbts_power.h misc/oc2gbts_clock.h \ - misc/oc2gbts_bid.h misc/oc2gbts_bts.h misc/oc2gbts_nl.h misc/oc2gbts_swd.h \ - hw_misc.h l1_if.h l1_transp.h oc2gbts.h utils.h +EXTRA_DIST = \ + misc/oc2gbts_mgr.h \ + misc/oc2gbts_misc.h \ + misc/oc2gbts_par.h \ + misc/oc2gbts_led.h \ + misc/oc2gbts_temp.h \ + misc/oc2gbts_power.h \ + misc/oc2gbts_clock.h \ + misc/oc2gbts_bid.h \ + misc/oc2gbts_bts.h \ + misc/oc2gbts_nl.h \ + misc/oc2gbts_swd.h \ + hw_misc.h \ + l1_if.h \ + l1_transp.h \ + oc2gbts.h \ + utils.h \ + $(NULL) bin_PROGRAMS = osmo-bts-oc2g oc2gbts-mgr oc2gbts-util -COMMON_SOURCES = main.c oc2gbts.c l1_if.c oml.c oc2gbts_vty.c tch.c hw_misc.c calib_file.c \ - utils.c misc/oc2gbts_par.c misc/oc2gbts_bid.c +COMMON_SOURCES = \ + main.c \ + oc2gbts.c \ + l1_if.c \ + oml.c \ + oc2gbts_vty.c \ + tch.c \ + hw_misc.c \ + calib_file.c \ + utils.c \ + misc/oc2gbts_par.c \ + misc/oc2gbts_bid.c \ + $(NULL) osmo_bts_oc2g_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c -osmo_bts_oc2g_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) +osmo_bts_oc2g_LDADD = \ + $(top_builddir)/src/common/libbts.a \ + $(COMMON_LDADD) \ + $(NULL) oc2gbts_mgr_SOURCES = \ - misc/oc2gbts_mgr.c misc/oc2gbts_misc.c \ - misc/oc2gbts_par.c misc/oc2gbts_nl.c \ - misc/oc2gbts_temp.c misc/oc2gbts_power.c \ - misc/oc2gbts_clock.c misc/oc2gbts_bid.c \ + misc/oc2gbts_mgr.c \ + misc/oc2gbts_misc.c \ + misc/oc2gbts_par.c \ + misc/oc2gbts_nl.c \ + misc/oc2gbts_temp.c \ + misc/oc2gbts_power.c \ + misc/oc2gbts_clock.c \ + misc/oc2gbts_bid.c \ misc/oc2gbts_mgr_vty.c \ misc/oc2gbts_mgr_nl.c \ misc/oc2gbts_mgr_temp.c \ misc/oc2gbts_mgr_calib.c \ misc/oc2gbts_led.c \ misc/oc2gbts_bts.c \ - misc/oc2gbts_swd.c + misc/oc2gbts_swd.c \ + $(NULL) -oc2gbts_mgr_LDADD = $(top_builddir)/src/common/libbts.a $(LIBGPS_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBSYSTEMD_LIBS) $(COMMON_LDADD) +oc2gbts_mgr_LDADD = \ + $(top_builddir)/src/common/libbts.a \ + $(COMMON_LDADD) \ + $(LIBGPS_LIBS) \ + $(NULL) -oc2gbts_util_SOURCES = misc/oc2gbts_util.c misc/oc2gbts_par.c +oc2gbts_util_SOURCES = \ + misc/oc2gbts_util.c \ + misc/oc2gbts_par.c \ + $(NULL) oc2gbts_util_LDADD = $(LIBOSMOCORE_LIBS) diff --git a/src/osmo-bts-octphy/Makefile.am b/src/osmo-bts-octphy/Makefile.am index 43d9cd7..5904c5a 100644 --- a/src/osmo-bts-octphy/Makefile.am +++ b/src/osmo-bts-octphy/Makefile.am @@ -1,12 +1,40 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(OCTSDR2G_INCDIR) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(NULL) + +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(NULL) EXTRA_DIST = l1_if.h l1_oml.h l1_utils.h octphy_hw_api.h octpkt.h bin_PROGRAMS = osmo-bts-octphy -COMMON_SOURCES = main.c l1_if.c l1_oml.c l1_utils.c l1_tch.c octphy_hw_api.c octphy_vty.c octpkt.c +COMMON_SOURCES = \ + main.c \ + l1_if.c \ + l1_oml.c \ + l1_utils.c \ + l1_tch.c \ + octphy_hw_api.c \ + octphy_vty.c \ + octpkt.c \ + $(NULL) osmo_bts_octphy_SOURCES = $(COMMON_SOURCES) osmo_bts_octphy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) diff --git a/src/osmo-bts-omldummy/Makefile.am b/src/osmo-bts-omldummy/Makefile.am index 5a4ce7c..97d5c2b 100644 --- a/src/osmo-bts-omldummy/Makefile.am +++ b/src/osmo-bts-omldummy/Makefile.am @@ -1,6 +1,25 @@ -AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) +AM_CFLAGS = \ + -Wall -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(NULL) + AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl + +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + -ldl \ + $(NULL) bin_PROGRAMS = osmo-bts-omldummy diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index 1faf122..281d17a 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -1,16 +1,61 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include $(SYSMOBTS_INCDIR) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(NULL) -EXTRA_DIST = misc/sysmobts_mgr.h misc/sysmobts_misc.h misc/sysmobts_par.h \ - misc/sysmobts_eeprom.h misc/sysmobts_nl.h femtobts.h hw_misc.h \ +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(NULL) + +EXTRA_DIST = \ + misc/sysmobts_mgr.h \ + misc/sysmobts_misc.h \ + misc/sysmobts_par.h \ + misc/sysmobts_eeprom.h \ + misc/sysmobts_nl.h \ misc/sysmobts-layer1.h \ - l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h + femtobts.h \ + hw_misc.h \ + l1_fwd.h \ + l1_if.h \ + l1_transp.h \ + eeprom.h \ + utils.h \ + $(NULL) bin_PROGRAMS = osmo-bts-sysmo osmo-bts-sysmo-remote l1fwd-proxy sysmobts-mgr sysmobts-util -COMMON_SOURCES = main.c femtobts.c l1_if.c oml.c sysmobts_vty.c tch.c hw_misc.c calib_file.c \ - eeprom.c calib_fixup.c utils.c misc/sysmobts_par.c sysmobts_ctrl.c +COMMON_SOURCES = \ + main.c \ + femtobts.c \ + l1_if.c \ + oml.c \ + sysmobts_vty.c \ + tch.c \ + hw_misc.c \ + calib_file.c \ + eeprom.c \ + calib_fixup.c \ + utils.c \ + misc/sysmobts_par.c \ + sysmobts_ctrl.c \ + $(NULL) + osmo_bts_sysmo_SOURCES = $(COMMON_SOURCES) l1_transp_hw.c osmo_bts_sysmo_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) diff --git a/src/osmo-bts-virtual/Makefile.am b/src/osmo-bts-virtual/Makefile.am index 070efed..50af2d3 100644 --- a/src/osmo-bts-virtual/Makefile.am +++ b/src/osmo-bts-virtual/Makefile.am @@ -1,10 +1,46 @@ -AM_CFLAGS = -Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude -COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) -ldl +AM_CFLAGS = \ + -Wall -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBGPS_CFLAGS) \ + $(NULL) -noinst_HEADERS = l1_if.h osmo_mcast_sock.h virtual_um.h +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Iinclude + +COMMON_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + -ldl \ + $(NULL) + +noinst_HEADERS = \ + l1_if.h \ + osmo_mcast_sock.h \ + virtual_um.h \ + $(NULL) bin_PROGRAMS = osmo-bts-virtual -osmo_bts_virtual_SOURCES = main.c bts_model.c virtualbts_vty.c scheduler_virtbts.c l1_if.c virtual_um.c osmo_mcast_sock.c -osmo_bts_virtual_LDADD = $(top_builddir)/src/common/libl1sched.a $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) +osmo_bts_virtual_SOURCES = \ + main.c \ + bts_model.c \ + virtualbts_vty.c \ + scheduler_virtbts.c \ + l1_if.c \ + virtual_um.c \ + osmo_mcast_sock.c \ + $(NULL) + +osmo_bts_virtual_LDADD = \ + $(top_builddir)/src/common/libl1sched.a \ + $(top_builddir)/src/common/libbts.a \ + $(COMMON_LDADD) \ + $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I24ecfa1167b806dcb3a5a0c00343299df842a78b Gerrit-Change-Number: 29031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: logging: Move category descriptions to be in order with enum
by pespin 10 Aug '22

10 Aug '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/29030 ) Change subject: logging: Move category descriptions to be in order with enum ...................................................................... logging: Move category descriptions to be in order with enum Change-Id: I3a1922fcd695e08ca42ece8cf0a1804d1a00f450 --- M src/common/logging.c 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/30/29030/1 diff --git a/src/common/logging.c b/src/common/logging.c index 9c458e8..c79a58b 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -84,17 +84,6 @@ .loglevel = LOGL_NOTICE, .enabled = 1, }, - [DABIS] = { - .name = "DABIS", - .description = "A-bis Intput Subsystem", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DRTP] = { - .name = "DRTP", - .description = "Realtime Transfer Protocol", - .loglevel = LOGL_NOTICE, - .enabled = 1, - }, [DPCU] = { .name = "DPCU", .description = "PCU interface", @@ -119,6 +108,17 @@ .color = "\033[0;94m", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DABIS] = { + .name = "DABIS", + .description = "A-bis Intput Subsystem", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, + [DRTP] = { + .name = "DRTP", + .description = "Realtime Transfer Protocol", + .loglevel = LOGL_NOTICE, + .enabled = 1, + }, }; static int osmo_bts_filter_fn(const struct log_context *ctx, struct log_target *tgt) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3a1922fcd695e08ca42ece8cf0a1804d1a00f450 Gerrit-Change-Number: 29030 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log