Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 82s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o remsim_server.o remsim_server.c [ 82s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_server.o rspro_server.c [ 82s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rest_api.o rest_api.c [ 82s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 82s] In file included from rest_api.c:7: [ 82s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 82s]49 | #include [ 82s] |^~~~ [ 82s] compilation terminated. [ 82s] make[3]: *** [Makefile:461: rest_api.o] Error 1 [ 82s] make[3]: *** Waiting for unfinished jobs [ 82s] make[3]: Leaving directory
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.1/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 81s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o remsim_server.o remsim_server.c [ 81s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_server.o rspro_server.c [ 81s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rest_api.o rest_api.c [ 81s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 81s] In file included from rest_api.c:7:0: [ 81s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 81s]#include [ 81s] ^~~~ [ 81s] compilation terminated. [ 81s] make[3]: *** [Makefile:451: rest_api.o] Error 1 [ 81s] make[3]: *** Waiting for
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.2/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 115s] (cd ../../src && make libosmo-rspro.la) [ 115s] make[4]: Entering directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 115s] make[4]: 'libosmo-rspro.la' is up to date. [ 115s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 115s] In file included from rest_api.c:7:0: [ 115s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 115s]#include [ 115s] ^~~~ [ 115s] compilation terminated. [ 115s] make[3]: *** [Makefile:451: rest_api.o] Error 1 [ 115s] make[3]: *** Waiting for unfinished jobs [ 116s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src/server' [ 116s] make[2]: *** [Makefile:534: all-recursive] Error 1 [ 116s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 116s] make[1]: *** [Makefile:482: all-recursive] Error 1 [ 116s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34' [ 116s] make: *** [Makefile:406: all] Error 2 [ 116s] error: Bad exit status from /var/tmp/rpm-tmp.lEO2Ay (%build) [ 116s] [ 116s] [ 116s] RPM build errors: [ 116s] Bad exit status from /var/tmp/rpm-tmp.lEO2Ay (%build) [ 116s] ### VM INTERACTION START ### [ 119s] [ 94.615519] sysrq: Power Off [ 119s] [ 94.644534] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb03 failed "build osmo-remsim.spec" at Wed Dec 9 03:03:17 UTC 2020. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: gprs_ns2_sns: rework IP-SNS initial remote
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21573 to look at the new patch set (#2). Change subject: gprs_ns2_sns: rework IP-SNS initial remote .. gprs_ns2_sns: rework IP-SNS initial remote The IP-SNS requires at least one initial remote address of the SGSN. However it should be multiple initial remote address instead of a single in case the interface might fail. Rework the SNS to support multiple initial remote addresses. Change-Id: I71cdbfb53e361e6112fed5e2712236d797ef3ab2 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_udp.c M src/gb/libosmogb.map 6 files changed, 334 insertions(+), 190 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/21573/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21573 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71cdbfb53e361e6112fed5e2712236d797ef3ab2 Gerrit-Change-Number: 21573 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: WIP: gprs_ns2_vty2: improve ip-sns implementation
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21576 to look at the new patch set (#2). Change subject: WIP: gprs_ns2_vty2: improve ip-sns implementation .. WIP: gprs_ns2_vty2: improve ip-sns implementation Change-Id: I741f21c36f1074e99304d51d96e1c00be24cf3c6 --- M src/gb/gprs_ns2_sns.c M src/gb/gprs_ns2_vty2.c 2 files changed, 27 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/21576/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21576 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I741f21c36f1074e99304d51d96e1c00be24cf3c6 Gerrit-Change-Number: 21576 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Tumbleweed/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 65s] (cd ../../src && make libosmo-rspro.la) [ 65s] make[4]: Entering directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 65s] make[4]: 'libosmo-rspro.la' is up to date. [ 65s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 65s] In file included from rest_api.c:7: [ 65s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 65s]49 | #include [ 65s] |^~~~ [ 65s] compilation terminated. [ 65s] make[3]: *** [Makefile:461: rest_api.o] Error 1 [ 65s] make[3]: *** Waiting for unfinished jobs [ 65s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src/server' [ 65s] make[2]: *** [Makefile:542: all-recursive] Error 1 [ 65s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 65s] make[1]: *** [Makefile:482: all-recursive] Error 1 [ 65s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34' [ 65s] make: *** [Makefile:406: all] Error 2 [ 65s] error: Bad exit status from /var/tmp/rpm-tmp.ElS8xn (%build) [ 65s] [ 65s] [ 65s] RPM build errors: [ 65s] Bad exit status from /var/tmp/rpm-tmp.ElS8xn (%build) [ 65s] ### VM INTERACTION START ### [ 68s] [ 60.735724] sysrq: Power Off [ 68s] [ 60.745328] reboot: Power down [ 68s] ### VM INTERACTION END ### [ 68s] [ 68s] lamb76 failed "build osmo-remsim.spec" at Wed Dec 9 02:32:20 UTC 2020. [ 68s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 325s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 326s] [COMPILING libboard/qmod/source/card_pres.c] [ 326s] [COMPILING libboard/qmod/source/wwan_led.c] [ 326s] [COMPILING libboard/qmod/source/i2c.c] [ 326s] [COMPILING libboard/qmod/source/board_qmod.c] [ 326s] [COMPILING apps/dfu/main.c] [ 326s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 326s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 326s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 327s] Memory region Used Size Region Size %age Used [ 327s] rom: 16588 B16 KB101.25% [ 327s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 327s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 327s] collect2: error: ld returned 1 exit status [ 327s] % [ 327s] make[2]: *** [Makefile:234: flash] Error 1 [ 327s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 327s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 327s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 327s] dh_auto_build: error: make -j1 returned exit code 2 [ 327s] make: *** [debian/rules:16: build] Error 25 [ 327s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 327s] ### VM INTERACTION START ### [ 330s] [ 316.278535] sysrq: Power Off [ 330s] [ 316.284293] reboot: Power down [ 330s] ### VM INTERACTION END ### [ 330s] [ 330s] lamb03 failed "build simtrace2_0.7.0.69.aadd.dsc" at Wed Dec 9 02:29:39 UTC 2020. [ 330s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 173s] [COMPILING apps/dfu/main.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 173s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 173s] Memory region Used Size Region Size %age Used [ 173s] rom: 16580 B16 KB101.20% [ 173s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 173s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 173s] collect2: error: ld returned 1 exit status [ 173s] % [ 173s] make[2]: *** [Makefile:234: flash] Error 1 [ 173s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 173s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 173s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 173s] dh_auto_build: error: make -j1 returned exit code 2 [ 174s] make: *** [debian/rules:16: build] Error 25 [ 174s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 174s] ### VM INTERACTION START ### [ 177s] [ 163.932881] sysrq: Power Off [ 177s] [ 163.940419] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] lamb56 failed "build simtrace2_0.7.0.69.aadd.dsc" at Wed Dec 9 02:27:59 UTC 2020. [ 177s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Factory_ARM/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 90s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o remsim_server.o remsim_server.c [ 90s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_server.o rspro_server.c [ 90s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rest_api.o rest_api.c [ 90s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 90s] In file included from rest_api.c:7: [ 90s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 90s]49 | #include [ 90s] |^~~~ [ 90s] compilation terminated. [ 90s] make[3]: *** [Makefile:461: rest_api.o]
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.1_ARM/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 96s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o remsim_server.o remsim_server.c [ 96s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_server.o rspro_server.c [ 96s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rest_api.o rest_api.c [ 96s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 96s] In file included from rest_api.c:7:0: [ 96s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 96s]#include [ 96s] ^~~~ [ 96s] compilation terminated. [ 96s] make[3]: *** [Makefile:451: rest_api.o] Error 1 [ 96s] make[3]: *** Waiting
Change in osmo-ttcn3-hacks[master]: pcu: SNS: fix typo
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21622 )
Change subject: pcu: SNS: fix typo
..
pcu: SNS: fix typo
Change-Id: Iedb6b3f38d87ea3ac29c4bcaaf50e771b0b8a750
---
M pcu/PCU_Tests_SNS.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/22/21622/1
diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn
index 937e30e..aed363b 100644
--- a/pcu/PCU_Tests_SNS.ttcn
+++ b/pcu/PCU_Tests_SNS.ttcn
@@ -407,7 +407,7 @@
testcase TC_sns_add() runs on RAW_Test_CT {
f_sns_bringup_1c1u();
- /* crate another NS codec port on the tester side */
+ /* create another NS codec port on the tester side */
f_init_ns_codec(mp_nsconfig, 2);
f_outgoing_sns_add(idx_add := 2, w_sig := 0, w_user := 1, idx := 0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21622
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: Iedb6b3f38d87ea3ac29c4bcaaf50e771b0b8a750
Gerrit-Change-Number: 21622
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: SNS: remove TODO expect FLOW-CONTROL BVC
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21620 ) Change subject: pcu: SNS: remove TODO expect FLOW-CONTROL BVC .. pcu: SNS: remove TODO expect FLOW-CONTROL BVC It should not be expected in a new NSVC. Change-Id: I142c87d496f08d603ab8e1e13c5a29ebe6596bb0 --- M pcu/PCU_Tests_SNS.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/21620/1 diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn index 40a0877..5c03b94 100644 --- a/pcu/PCU_Tests_SNS.ttcn +++ b/pcu/PCU_Tests_SNS.ttcn @@ -417,7 +417,6 @@ activate(as_rx_alive_tx_ack(idx := 2)); f_outgoing_ns_alive(2); - /* TODO: Should we expect FLOW-CONTROL BVC here too? */ setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21620 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: I142c87d496f08d603ab8e1e13c5a29ebe6596bb0 Gerrit-Change-Number: 21620 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: SNS: add TC_sns_add_existent
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21621 )
Change subject: pcu: SNS: add TC_sns_add_existent
..
pcu: SNS: add TC_sns_add_existent
Try to add via SNS an already existent NSVC which should
fail.
Change-Id: I096bcbe38d82d08a150a2f8e56f6bc02353273a1
---
M pcu/PCU_Tests_SNS.ttcn
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/21/21621/1
diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn
index 5c03b94..937e30e 100644
--- a/pcu/PCU_Tests_SNS.ttcn
+++ b/pcu/PCU_Tests_SNS.ttcn
@@ -143,7 +143,7 @@
rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);
}
-function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t
w_user := 1, integer idx := 0)
+function f_outgoing_sns_add(integer idx_add, uint8_t w_sig := 1, uint8_t
w_user := 1, integer idx := 0, template (omit) NsCause cause := omit)
runs on RAW_NS_CT {
log("f_outgoing_sns_add(idx_add=", idx_add, ")");
var PDU_NS rx;
@@ -153,13 +153,13 @@
nsvc_cfg.provider.ip.local_udp_port,
w_sig,
w_user) };
NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx],
ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4)));
- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, v4));
+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, cause, v4));
} else {
var template (omit) IP6_Elements v6 := {
ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,
nsvc_cfg.provider.ip.local_udp_port,
w_sig,
w_user) };
NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx],
ts_SNS_ADD(g_nsconfig[idx].nsei, 23, omit, v6)));
- rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, omit,
v6));
+ rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, cause,
omit, v6));
}
}
@@ -420,6 +420,14 @@
setverdict(pass);
}
+/* Test adding an already present IP endpoint at runtime */
+testcase TC_sns_add_nack() runs on RAW_Test_CT {
+ f_sns_bringup_1c1u();
+
+ f_outgoing_sns_add(idx_add := 0, w_sig := 0, w_user := 1, idx := 0,
cause := NS_CAUSE_PROTOCOL_ERROR_UNSPEIFIED);
+ setverdict(pass);
+}
+
/* Test deleting IP endpoints at runtime */
testcase TC_sns_del() runs on RAW_Test_CT {
f_sns_bringup_1c1u();
@@ -473,6 +481,7 @@
execute( TC_sns_1c1u_so_bvc_reset() );
execute( TC_sns_1c1u_so_bvc_reset_too_early() );
execute( TC_sns_add() );
+ execute( TC_sns_add_nack() );
execute( TC_sns_del() );
execute( TC_sns_chg_weight() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21621
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: I096bcbe38d82d08a150a2f8e56f6bc02353273a1
Gerrit-Change-Number: 21621
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: TC_sns_add: fix wrong udp port in SNS ADD message
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21619 )
Change subject: pcu: TC_sns_add: fix wrong udp port in SNS ADD message
..
pcu: TC_sns_add: fix wrong udp port in SNS ADD message
When sending the SNS ADD in the test case the ip/port to add must be different
from the current NSVCs.
Fixes: 90f1974fb040 ("NS_Emulation: Support multiple NS-VC within one NSE
(NS-VCG)")
Change-Id: I9bbbf1431468a452df324a7559518496e3eb48e3
---
M pcu/PCU_Tests_SNS.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/19/21619/1
diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn
index cd0cc67..40a0877 100644
--- a/pcu/PCU_Tests_SNS.ttcn
+++ b/pcu/PCU_Tests_SNS.ttcn
@@ -147,7 +147,7 @@
runs on RAW_NS_CT {
log("f_outgoing_sns_add(idx_add=", idx_add, ")");
var PDU_NS rx;
- var NSVCConfiguration nsvc_cfg := g_nsconfig[idx].nsvc[0];
+ var NSVCConfiguration nsvc_cfg := g_nsconfig[idx_add].nsvc[0];
if (nsvc_cfg.provider.ip.address_family == AF_INET) {
var template (omit) IP4_Elements v4 := {
ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,
nsvc_cfg.provider.ip.local_udp_port,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21619
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: I9bbbf1431468a452df324a7559518496e3eb48e3
Gerrit-Change-Number: 21619
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2_sns: correct dynamic calculation
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/21618 )
Change subject: gprs_ns2_sns: correct dynamic calculation
..
gprs_ns2_sns: correct dynamic calculation
The wrong argument was used to multiply by 4. However it was still
compliant because the SNS code would always supports 16 NSVCs.
Use the correct multiplier.
Fixes: ttnc3 pcu sns test cases
Fixes: 42ad54915285 ("gprs_ns2_sns: dynamic calculate the maximum NS-VCs")
Change-Id: I58d706c6fffb4237b90b37cade4dc00c6aba6ac9
---
M src/gb/gprs_ns2_sns.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/21618/1
diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c
index d13d920..5d18d04 100644
--- a/src/gb/gprs_ns2_sns.c
+++ b/src/gb/gprs_ns2_sns.c
@@ -1320,7 +1320,7 @@
gss->num_ip4_local = count;
gss->num_max_ip4_remote = 4;
- gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote * 4, 8);
+ gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote *
gss->num_ip4_local, 8);
break;
case IPv6:
/* IPv6 */
@@ -1359,7 +1359,7 @@
}
gss->num_ip6_local = count;
gss->num_max_ip6_remote = 4;
- gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote * 4, 8);
+ gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote *
gss->num_ip6_local, 8);
break;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21618
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I58d706c6fffb4237b90b37cade4dc00c6aba6ac9
Gerrit-Change-Number: 21618
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 ) Change subject: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 .. Patch Set 1: Code-Review-1 This can be merged *after* gbproxy uses ns2 vty2. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 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: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 Gerrit-Change-Number: 21617 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Dec 2020 00:04:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2
lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 ) Change subject: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 .. gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 All test case (except 3 which fails on jenkins as well) succeed. Change-Id: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 --- M gbproxy/osmo-gbproxy.cfg 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/21617/1 diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg index 350ddf5..92560e2 100644 --- a/gbproxy/osmo-gbproxy.cfg +++ b/gbproxy/osmo-gbproxy.cfg @@ -8,11 +8,11 @@ gbproxy sgsn nsei 101 ns - nse 101 nsvci 101 - nse 101 remote-role sgsn - nse 101 encapsulation udp - nse 101 remote-ip 127.0.0.1 - nse 101 remote-port + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess + nse 101 + nsvc ipa local nsvci 101 127.0.0.1 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 @@ -20,6 +20,3 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 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: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 Gerrit-Change-Number: 21617 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange
Change in libosmocore[master]: tlv.h: Add msgb_tvlv_put_{16,32}be()
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21609 )
Change subject: tlv.h: Add msgb_tvlv_put_{16,32}be()
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21609
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
Gerrit-Change-Number: 21609
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Tue, 08 Dec 2020 22:29:04 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608 )
Change subject: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
..
BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
Currently osmo-bts seems to be sending IPA RSL Connect ACK
unconditionally, even if the remote peer is not reachable.
Change-Id: Ibfa58f670401907801f610578dd9b4ebf155a83a
---
M bts/BTS_Tests_OML.ttcn
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn
index 396ed38..6770dab 100644
--- a/bts/BTS_Tests_OML.ttcn
+++ b/bts/BTS_Tests_OML.ttcn
@@ -589,6 +589,30 @@
}
}
+/* Make sure that the IUT sends RSL Connect NACK when the remote is not
reachable. */
+testcase TC_ipa_rsl_connect_nack() runs on BSC_OML_CT {
+ timer T := 2.0;
+
+ f_init_oml(testcasename());
+
+ /* Most likely, nobody is listening to this port */
+ OML.send(ts_OML_IPA_RslConnect(0, 65535));
+
+ T.start;
+ alt {
+ [] OML.receive(tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT_NACK)) {
+ setverdict(pass);
+ }
+ [] OML.receive(tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT_ACK)) {
+ setverdict(fail, "RSL Connect ACK is not expected");
+ }
+ [] OML.receive { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for RSL Connect NACK");
+ }
+ }
+}
+
control {
execute( TC_wrong_mdisc() );
@@ -606,6 +630,7 @@
execute( TC_ts_opstart() );
execute( TC_ts_opstart_noattr() );
execute( TC_initial_state_reports() );
+ execute( TC_ipa_rsl_connect_nack() );
}
/* BTS:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608
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: Ibfa58f670401907801f610578dd9b4ebf155a83a
Gerrit-Change-Number: 21608
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 ) Change subject: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now .. bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now Change-Id: I872111dae761bda038d2e881ab5f4e6b7f52ec90 --- M bts/expected-results.xml 1 file changed, 1 insertion(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 4fd704c..6142e40 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -16,12 +16,7 @@ BTS_Tests.ttcn:MASKED TC_sacch_chan_act_ho_async testcase - -"BTS_Tests.ttcn:MASKED : Unexpected RSL message received" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_sacch_chan_act_ho_sync testcase - - + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 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: I872111dae761bda038d2e881ab5f4e6b7f52ec90 Gerrit-Change-Number: 21606 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 ) Change subject: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations .. bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations Change-Id: I903ede1c78e103d24a93f2e6b0e1acd136405099 --- M bts/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a50cf6d..4fd704c 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -157,6 +157,16 @@ + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 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: I903ede1c78e103d24a93f2e6b0e1acd136405099 Gerrit-Change-Number: 21605 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608 ) Change subject: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608 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: Ibfa58f670401907801f610578dd9b4ebf155a83a Gerrit-Change-Number: 21608 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 22:02:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 ) Change subject: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 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: I872111dae761bda038d2e881ab5f4e6b7f52ec90 Gerrit-Change-Number: 21606 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 22:01:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 ) Change subject: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 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: I903ede1c78e103d24a93f2e6b0e1acd136405099 Gerrit-Change-Number: 21605 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 22:01:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21597 ) Change subject: logging: Introduce DLBSSGP logging constant .. Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 Gerrit-Change-Number: 21597 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21597 ) Change subject: logging: Introduce DLBSSGP logging constant .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 Gerrit-Change-Number: 21597 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 22:01:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: tlv.h: Add msgb_tvlv_put_{16,32}be()
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21609 )
Change subject: tlv.h: Add msgb_tvlv_put_{16,32}be()
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21609
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
Gerrit-Change-Number: 21609
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Tue, 08 Dec 2020 22:00:43 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Log FSM timeouts
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21592 ) Change subject: gbproxy: Log FSM timeouts .. gbproxy: Log FSM timeouts Change-Id: I5c48e42083ab6f8622808457ca3f017adf35cdff --- M src/gbproxy/gb_proxy.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c index 8be67f7..ecb74c0 100644 --- a/src/gbproxy/gb_proxy.c +++ b/src/gbproxy/gb_proxy.c @@ -989,6 +989,7 @@ return -1; } osmo_clock_gettime(CLOCK_REALTIME, ); + osmo_fsm_log_timeouts(true); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5c48e42083ab6f8622808457ca3f017adf35cdff Gerrit-Change-Number: 21592 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21591 )
Change subject: gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs
..
gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs
We recently introduced code to libosmocore which allows us to validate
the mandatory IE presence (and length) in a generic way. Let's use it.
Change-Id: I0ea3f5f9566d9bf5a8429c3ee748e3e90cda6cd7
Depends: libosmocore.git I7e4226463f3c935134b5c2c737696fbfd1dd5815
---
M src/gbproxy/gb_proxy.c
1 file changed, 45 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index a90030e..8be67f7 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -104,6 +104,20 @@
return 1;
}
+/* generate BVC-STATUS message with cause value derived from TLV-parser error
*/
+static int tx_status_from_tlvp(enum osmo_tlv_parser_error tlv_p_err, struct
msgb *orig_msg)
+{
+ uint8_t bssgp_cause;
+ switch (tlv_p_err) {
+ case OSMO_TLVP_ERR_MAND_IE_MISSING:
+ bssgp_cause = BSSGP_CAUSE_MISSING_MAND_IE;
+ break;
+ default:
+ bssgp_cause = BSSGP_CAUSE_PROTO_ERR_UNSPEC;
+ }
+ return bssgp_tx_status(bssgp_cause, NULL, orig_msg);
+}
+
/* strip off the NS header */
static void strip_ns_hdr(struct msgb *msg)
{
@@ -423,26 +437,34 @@
int data_len = msgb_bssgp_len(msg) - sizeof(*bgph);
struct gbproxy_bvc *from_bvc = NULL;
struct gprs_ra_id raid;
+ char log_pfx[32];
int rc;
+ snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/BSS)", nsei);
+
if (ns_bvci != 0 && ns_bvci != 1) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) BVCI=%05u is not
signalling\n", nsei, ns_bvci);
+ LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n",
log_pfx, ns_bvci);
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) %s not allowed in
signalling BVC\n",
-nsei, osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
+ LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling
BVC\n", log_pfx,
+osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_UL)) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) %s not allowed in
uplink direction\n",
-nsei, osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
+ LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in uplink
direction\n", log_pfx,
+osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
- bssgp_tlv_parse(, bgph->data, data_len);
+ rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1, pdu_type,
bgph->data, data_len, 0, 0,
+DGPRS, log_pfx);
+ if (rc < 0) {
+ rate_ctr_inc(>ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);
+ return tx_status_from_tlvp(rc, msg);
+ }
switch (pdu_type) {
case BSSGP_PDUT_SUSPEND:
@@ -626,24 +648,27 @@
struct gbproxy_bvc *bvc;
uint16_t bvci;
struct msgb *msg;
+ char log_pfx[32];
int rc = 0;
int cause;
int i;
+ snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/SGSN)", nsei);
+
if (ns_bvci != 0 && ns_bvci != 1) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) BVCI=%05u is not
signalling\n", nsei, ns_bvci);
+ LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n",
log_pfx, ns_bvci);
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) %s not allowed in
signalling BVC\n",
-nsei, osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
+ LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling
BVC\n", log_pfx,
+osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_DL)) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/SGSN) %s not allowed in
downlink direction\n",
-nsei, osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
+ LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink
direction\n", log_pfx,
+osmo_tlv_prot_msg_name(_pdef_bssgp,
Change in osmo-sgsn[master]: gbproxy: use gbprox_relay2peer() whenever possible
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21561 )
Change subject: gbproxy: use gbprox_relay2peer() whenever possible
..
gbproxy: use gbprox_relay2peer() whenever possible
gbprox_relay2peer() is a small wrapper around gbprox_relay2nse(),
but as it manages the transmit error counter, we should use it whenever
possible.
Change-Id: I85ab49ca0a25dd7c54b88c4fdc8838843e6d2209
---
M src/gbproxy/gb_proxy.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index a30f5ad..a90030e 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -519,7 +519,7 @@
hash_for_each(nse->bvcs, j, bvc, list) {
if (!memcmp(bvc->ra, TLVP_VAL(tp,
BSSGP_IE_ROUTEING_AREA), 6)) {
LOGPNSE(nse, LOGL_INFO, "routing to NSE
(RAI match)\n");
- gbprox_relay2nse(msg, nse, ns_bvci);
+ gbprox_relay2peer(msg, bvc, ns_bvci);
n_nses++;
/* Only send it once to each NSE */
break;
@@ -533,7 +533,7 @@
hash_for_each(nse->bvcs, j, bvc, list) {
if (!memcmp(bvc->ra, TLVP_VAL(tp,
BSSGP_IE_LOCATION_AREA), 5)) {
LOGPNSE(nse, LOGL_INFO, "routing to NSE
(LAI match)\n");
- gbprox_relay2nse(msg, nse, ns_bvci);
+ gbprox_relay2peer(msg, bvc, ns_bvci);
n_nses++;
/* Only send it once to each NSE */
break;
@@ -545,7 +545,7 @@
hash_for_each(cfg->bss_nses, i, nse, list) {
hash_for_each(nse->bvcs, j, bvc, list) {
LOGPNSE(nse, LOGL_INFO, "routing to NSE
(broadcast)\n");
- gbprox_relay2nse(msg, nse, ns_bvci);
+ gbprox_relay2peer(msg, bvc, ns_bvci);
n_nses++;
/* Only send it once to each NSE */
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21561
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I85ab49ca0a25dd7c54b88c4fdc8838843e6d2209
Gerrit-Change-Number: 21561
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-sgsn[master]: gb_proxy: Introduce more validation / constraint checks
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21560 )
Change subject: gb_proxy: Introduce more validation / constraint checks
..
gb_proxy: Introduce more validation / constraint checks
* ensure the BSSGP PDU header length before reading pdu_type field
* ensure we never process uplink PDUs in downlink and vice-versa
* ensure we never proceses PTP PDUs on SIGNALING BVCI and vice-versa
Change-Id: I6e40aed0283f1a0860ab273606605f7fb28717cf
Depends: libosmocore.git I7e4226463f3c935134b5c2c737696fbfd1dd5815
---
M src/gbproxy/gb_proxy.c
1 file changed, 63 insertions(+), 23 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 98fa928..a30f5ad 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -249,8 +249,26 @@
struct msgb *msg, uint16_t nsei,
uint16_t ns_bvci)
{
+ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
struct gbproxy_bvc *bvc;
+ if (ns_bvci == 0 && ns_bvci == 1) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) BVCI=%05u is not
PTP\n", nsei, ns_bvci);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
+ if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/%05u) %s not allowed in PTP
BVC\n",
+nsei, ns_bvci, osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type));
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
+ if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_UL)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/%05u) %s not allowed in
uplink direction\n",
+nsei, ns_bvci, osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type));
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
bvc = gbproxy_bvc_by_bvci(cfg, ns_bvci);
if (!bvc) {
LOGP(DGPRS, LOGL_NOTICE, "BVC(%05u/??) Didn't find bvc "
@@ -272,12 +290,27 @@
struct msgb *msg, uint16_t nsei,
uint16_t ns_bvci)
{
+ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
struct gbproxy_bvc *bvc;
+ if (ns_bvci == 0 && ns_bvci == 1) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) BVCI=%05u is not
PTP\n", nsei, ns_bvci);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
+ if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_PTP)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/%05u) %s not allowed in PTP
BVC\n",
+nsei, ns_bvci, osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type));
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
+ if (!(bssgp_pdu_type_flags(bgph->pdu_type) & BSSGP_PDUF_DL)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/%05u) %s not allowed in
downlink direction\n",
+nsei, ns_bvci, osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type));
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
bvc = gbproxy_bvc_by_bvci(cfg, ns_bvci);
-
- /* Send status messages before patching */
-
if (!bvc) {
LOGP(DGPRS, LOGL_INFO, "BVC(%05u/??) Didn't find bvc for "
"for message from NSE(%05u/SGSN)\n",
@@ -393,18 +426,20 @@
int rc;
if (ns_bvci != 0 && ns_bvci != 1) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) BVCI=%05u is not
signalling\n",
- nsei, ns_bvci);
- return -EINVAL;
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) BVCI=%05u is not
signalling\n", nsei, ns_bvci);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
- /* we actually should never see those two for BVCI == 0, but
double-check
-* just to make sure */
- if (pdu_type == BSSGP_PDUT_UL_UNITDATA ||
- pdu_type == BSSGP_PDUT_DL_UNITDATA) {
- LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u) UNITDATA not allowed in "
- "signalling\n", nsei);
- return -EINVAL;
+ if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) %s not allowed in
signalling BVC\n",
+nsei, osmo_tlv_prot_msg_name(_pdef_bssgp, pdu_type));
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
+ }
+
+ if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_UL)) {
+ LOGP(DGPRS, LOGL_NOTICE, "NSE(%05u/BSS) %s not allowed in
uplink
Change in osmo-sgsn[master]: gbproxy: Delete gbproxy_test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21590 ) Change subject: gbproxy: Delete gbproxy_test .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21590 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I053aebab6bf5d0ee955f2221bf27925b36140cf3 Gerrit-Change-Number: 21590 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 21:59:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gb_proxy: Introduce more validation / constraint checks
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21560 ) Change subject: gb_proxy: Introduce more validation / constraint checks .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I6e40aed0283f1a0860ab273606605f7fb28717cf Gerrit-Change-Number: 21560 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 21:59:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: use gbprox_relay2peer() whenever possible
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21561 ) Change subject: gbproxy: use gbprox_relay2peer() whenever possible .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I85ab49ca0a25dd7c54b88c4fdc8838843e6d2209 Gerrit-Change-Number: 21561 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 21:59:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21591 ) Change subject: gb_proxy: Use osmo_tlv_prot_parse() to validate mandatory IEs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0ea3f5f9566d9bf5a8429c3ee748e3e90cda6cd7 Gerrit-Change-Number: 21591 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 21:59:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Log FSM timeouts
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21592 ) Change subject: gbproxy: Log FSM timeouts .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21592 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I5c48e42083ab6f8622808457ca3f017adf35cdff Gerrit-Change-Number: 21592 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 21:59:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: gbproxy: Implement handling of BVC Flow Control
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21616 )
Change subject: gbproxy: Implement handling of BVC Flow Control
..
gbproxy: Implement handling of BVC Flow Control
We must locally terminate + acknowledge any inbound BSSGP-FC-BVC,
and ourselves trigger the transmission of BSSGP-FC-BVC to each
SGSN in the pool.
Related: OS#4891
Depends: libosmcoore.git Ie59be6761177c43456898be9148727f15861a622
Change-Id: Ib6495e5de4bfcf748a98e08743d1a8f2565f8b69
---
M src/gbproxy/gb_proxy.c
1 file changed, 50 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/16/21616/1
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index 8167880..2ffeaca 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -291,6 +291,8 @@
rate_ctr_inc(>cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);
return tx_status_from_tlvp(rc, msg);
}
+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch
*/
+ msgb_bcid(msg) = (void *)
switch (bgph->pdu_type) {
case BSSGP_PDUT_UL_UNITDATA:
@@ -331,9 +333,7 @@
LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n",
pdut_name);
break;
case BSSGP_PDUT_FLOW_CONTROL_BVC:
- /* TODO: Implement via FSM */
- //rc = osmo_fsm_inst_dispatch(bss_bvc->fi, FIXME, );
- LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n",
pdut_name);
+ osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC,
msg);
break;
case BSSGP_PDUT_STATUS:
/* TODO: Implement by inspecting the contained PDU */
@@ -352,7 +352,9 @@
struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
const char *pdut_name = osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type);
struct gbproxy_bvc *sgsn_bvc, *bss_bvc;
+ struct tlv_parsed tp;
char log_pfx[32];
+ int rc;
snprintf(log_pfx, sizeof(log_pfx), "NSE(%05u/SGSN)-BVC(%05u/??)",
nse->nsei, ns_bvci);
@@ -386,10 +388,39 @@
rate_ctr_inc(_bvc->ctrg->ctr[GBPROX_PEER_CTR_DROPPED]);
return bssgp_tx_status(BSSGP_CAUSE_BVCI_BLOCKED, _bvci, msg);
}
+
+ /* DL_UNITDATA has a different header than all other uplink PDUs */
+ if (bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) {
+ const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *)
msgb_bssgph(msg);
+ if (msgb_bssgp_len(msg) < sizeof(*budh))
+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL,
msg);
+ rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1,
bgph->pdu_type, budh->data,
+msgb_bssgp_len(msg) - sizeof(*budh),
0, 0, DGPRS, log_pfx);
+ /* populate TLLI from the fixed headser into the TLV-parsed
array so later code
+* doesn't have to worry where the TLLI came from */
+ tp.lv[BSSGP_IE_TLLI].len = 4;
+ tp.lv[BSSGP_IE_TLLI].val = (const uint8_t *) >tlli;
+ } else {
+ rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1,
bgph->pdu_type, bgph->data,
+msgb_bssgp_len(msg) - sizeof(*bgph),
0, 0, DGPRS, log_pfx);
+ }
+ if (rc < 0) {
+
rate_ctr_inc(>cfg->ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_BSS]);
+ return tx_status_from_tlvp(rc, msg);
+ }
+ /* hack to get both msg + tlv_parsed passed via osmo_fsm_inst_dispatch
*/
+ msgb_bcid(msg) = (void *)
+
OSMO_ASSERT(sgsn_bvc->cell);
bss_bvc = sgsn_bvc->cell->bss_bvc;
- return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);
+ switch (bgph->pdu_type) {
+ case BSSGP_PDUT_FLOW_CONTROL_BVC_ACK:
+ return osmo_fsm_inst_dispatch(sgsn_bvc->fi,
BSSGP_BVCFSM_E_RX_FC_BVC_ACK, msg);
+ default:
+ return gbprox_relay2peer(msg, bss_bvc, bss_bvc->bvci);
+ }
+
}
/***
@@ -532,9 +563,24 @@
}
}
+/* BVC FSM informs us about BVC-FC PDU receive */
+static void bss_ptp_bvc_fc_bvc(uint16_t nsei, uint16_t bvci, const struct
bssgp2_flow_ctrl *fc, void *priv)
+{
+ struct gbproxy_bvc *bss_bvc = priv;
+ struct gbproxy_cell *cell = bss_bvc->cell;
+
+ if (!cell)
+ return;
+
+ /* FIXME: actually split the bandwidth among the SGSNs! */
+
+ dispatch_to_all_sgsn_bvc(cell, BSSGP_BVCFSM_E_REQ_FC_BVC, (void *) fc);
+}
+
static const struct bssgp_bvc_fsm_ops bss_ptp_bvc_fsm_ops = {
.reset_notification = bss_ptp_bvc_reset_notif,
.state_chg_notification = bss_ptp_bvc_state_chg_notif,
+ .rx_fc_bvc = bss_ptp_bvc_fc_bvc,
};
/* BVC FSM informs
Change in osmo-sgsn[master]: gbproxy: Introduce new DOBJ log category; log object allocation/release
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21614 )
Change subject: gbproxy: Introduce new DOBJ log category; log object
allocation/release
..
gbproxy: Introduce new DOBJ log category; log object allocation/release
Related: OS#4472
Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484
---
M include/osmocom/sgsn/debug.h
M include/osmocom/sgsn/gb_proxy.h
M src/gbproxy/gb_proxy_main.c
M src/gbproxy/gb_proxy_peer.c
4 files changed, 29 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/14/21614/1
diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h
index 29d500d..4e11639 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -40,6 +40,7 @@
DIUCS,
DSIGTRAN,
DGTP,
+ DOBJ,
Debug_LastEntry,
};
diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index e61b991..8892cf4 100644
--- a/include/osmocom/sgsn/gb_proxy.h
+++ b/include/osmocom/sgsn/gb_proxy.h
@@ -142,6 +142,11 @@
#define LOGPBVC(BVC, LEVEL, FMT, ARGS...) \
LOGPBVC_CAT(BVC, DGPRS, LEVEL, FMT, ## ARGS)
+#define LOGPCELL_CAT(CELL, SUBSYS, LEVEL, FMT, ARGS...) \
+ LOGP(SUBSYS, LEVEL, "CELL(%05u) " FMT, (CELL)->bvci, ## ARGS)
+#define LOGPCELL(CELL, LEVEL, FMT, ARGS...) \
+ LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS)
+
/* gb_proxy_vty .c */
int gbproxy_vty_init(void);
diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c
index 52b1042..9c1daa1 100644
--- a/src/gbproxy/gb_proxy_main.c
+++ b/src/gbproxy/gb_proxy_main.c
@@ -214,6 +214,12 @@
.description = "GPRS BSS Gateway Protocol (BSSGP)",
.enabled = 1, .loglevel = LOGL_DEBUG,
},
+ [DOBJ] = {
+ .name = "DOBJ",
+ .description = "GbProxy object allocation/release",
+ .enabled = 1,
+ .color = "\033[38;5;121m"
+ },
};
static const struct log_info gprs_log_info = {
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index ed7df32..c38b2f7 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -86,6 +86,11 @@
hash_add(nse->bvcs, >list, bvc->bvci);
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Created\n");
+
+ /* We leave allocating the bvc->fi to the caller, as the FSM details
depend
+* on the type of BVC (SIG/PTP) and role (SGSN/BSS) */
+
return bvc;
}
@@ -96,6 +101,8 @@
if (!bvc)
return;
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_INFO, "BVC Destroying\n");
+
hash_del(>list);
rate_ctr_group_free(bvc->ctrg);
@@ -167,6 +174,8 @@
hash_add(cfg->cells, >list, cell->bvci);
+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Created\n");
+
return cell;
}
@@ -201,6 +210,8 @@
if (!cell)
return;
+ LOGPCELL_CAT(cell, DOBJ, LOGL_INFO, "CELL Destroying\n");
+
/* remove from cfg.cells */
hash_del(>list);
@@ -225,6 +236,8 @@
for (i = 0; i < ARRAY_SIZE(cell->sgsn_bvc); i++) {
if (!cell->sgsn_bvc[i]) {
cell->sgsn_bvc[i] = bvc;
+ LOGPCELL_CAT(cell, DOBJ, LOGL_DEBUG, "CELL linked to
SGSN\n");
+ LOGPBVC_CAT(bvc, DOBJ, LOGL_DEBUG, "BVC linked to
CELL\n");
return true;
}
}
@@ -255,6 +268,8 @@
hash_init(nse->bvcs);
+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Created\n");
+
return nse;
}
@@ -267,6 +282,8 @@
if (!nse)
return;
+ LOGPNSE_CAT(nse, DOBJ, LOGL_INFO, "NSE Destroying\n");
+
hash_del(>list);
hash_for_each_safe(nse->bvcs, i, tmp, bvc, list)
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21614
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I43bcbcda8667d193e7a17fd8e8e9109597b01484
Gerrit-Change-Number: 21614
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: gbproxy: Don't create an extra msgb copy for SGSN DL SIG
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21615 )
Change subject: gbproxy: Don't create an extra msgb copy for SGSN DL SIG
..
gbproxy: Don't create an extra msgb copy for SGSN DL SIG
That copy may have made sense while we were doing patching/buffering,
but we're not doing any of that anymore.
Related: OS#4472
Change-Id: I207a869ffac8bf60104f80f9ed58faf0021e5e95
---
M src/gbproxy/gb_proxy.c
1 file changed, 9 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/15/21615/1
diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index a920906..8167880 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -886,9 +886,9 @@
}
/* Receive an incoming signalling message from the SGSN-side NS-VC */
-static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb
*orig_msg, uint16_t ns_bvci)
+static int gbprox_rx_sig_from_sgsn(struct gbproxy_nse *nse, struct msgb *msg,
uint16_t ns_bvci)
{
- struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(orig_msg);
+ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)
msgb_bssgph(msg);
uint8_t pdu_type = bgph->pdu_type;
const char *pdut_name = osmo_tlv_prot_msg_name(_pdef_bssgp,
bgph->pdu_type);
struct gbproxy_config *cfg = nse->cfg;
@@ -896,7 +896,6 @@
struct tlv_parsed tp;
int data_len;
uint16_t bvci;
- struct msgb *msg;
char log_pfx[32];
int rc = 0;
int cause;
@@ -908,23 +907,20 @@
if (ns_bvci != 0 && ns_bvci != 1) {
LOGP(DGPRS, LOGL_NOTICE, "%s BVCI=%05u is not signalling\n",
log_pfx, ns_bvci);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_SIG)) {
LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in signalling
BVC\n", log_pfx, pdut_name);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
if (!(bssgp_pdu_type_flags(pdu_type) & BSSGP_PDUF_DL)) {
LOGP(DGPRS, LOGL_NOTICE, "%s %s not allowed in downlink
direction\n", log_pfx, pdut_name);
- return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
}
- msg = bssgp_msgb_copy(orig_msg, "rx_sig_from_sgsn");
- /* Update message info */
- bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);
- data_len = msgb_bssgp_len(orig_msg) - sizeof(*bgph);
+ data_len = msgb_bssgp_len(msg) - sizeof(*bgph);
rc = osmo_tlv_prot_parse(_pdef_bssgp, , 1, pdu_type,
bgph->data, data_len, 0, 0,
DGPRS, log_pfx);
@@ -1017,24 +1013,22 @@
case BSSGP_PDUT_RAN_INFO_ERROR:
case BSSGP_PDUT_RAN_INFO_APP_ERROR:
/* FIXME: route based in RIM Routing IE */
- rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL,
orig_msg);
+ rc = bssgp_tx_status(BSSGP_CAUSE_PDU_INCOMP_FEAT, NULL, msg);
break;
default:
LOGPNSE(nse, LOGL_NOTICE, "Rx %s: Not supported\n", pdut_name);
rate_ctr_inc(>ctrg->ctr[GBPROX_GLOB_CTR_PROTO_ERR_SGSN]);
- rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL,
orig_msg);
+ rc = bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, msg);
break;
}
- msgb_free(msg);
-
return rc;
err_no_bvc:
LOGPNSE(nse, LOGL_ERROR, "Rx %s: Cannot find BVC\n", pdut_name);
rate_ctr_inc(>ctrg-> ctr[GBPROX_GLOB_CTR_INV_RAI]);
msgb_free(msg);
- return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, orig_msg);
+ return bssgp_tx_status(BSSGP_CAUSE_INV_MAND_INF, NULL, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21615
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I207a869ffac8bf60104f80f9ed58faf0021e5e95
Gerrit-Change-Number: 21615
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21613 )
Change subject: gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
..
gbproxy: Use "(nsei << 16) | bvci" as rate_ctr_group index
As we now have gbproxy_bvc on both the SGSN and the BSS side
with the same BVCI, using the BVCI alone will no longer render
unique indexes.
Related: OS#4472
Change-Id: I13f3c9e69562a56ad7d3742fdeb2ba48f134fdaa
---
M src/gbproxy/gb_proxy_peer.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/13/21613/1
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index a0586fe..ed7df32 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -77,7 +77,7 @@
return NULL;
bvc->bvci = bvci;
- bvc->ctrg = rate_ctr_group_alloc(bvc, _ctrg_desc, bvci);
+ bvc->ctrg = rate_ctr_group_alloc(bvc, _ctrg_desc, (nse->nsei << 16)
| bvci);
if (!bvc->ctrg) {
talloc_free(bvc);
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21613
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I13f3c9e69562a56ad7d3742fdeb2ba48f134fdaa
Gerrit-Change-Number: 21613
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21611 to look at the new patch set (#4). Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. bssgp_bvc_fsm: Add basic BVC flow control rx/tx support The FSM doesn't actually implement the flow control logic, it only decodes / dispatches and encodes messages. Related: OS#4891 Change-Id: Ie59be6761177c43456898be9148727f15861a622 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21611 to look at the new patch set (#3). Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. bssgp_bvc_fsm: Add basic BVC flow control rx/tx support The FSM doesn't actually implement the flow control logic, it only decodes / dispatches and encodes messages. Change-Id: Ie59be6761177c43456898be9148727f15861a622 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21598 to look at the new patch set (#6). Change subject: gb: Add beginnings of a new BSSGP implementation .. gb: Add beginnings of a new BSSGP implementation Similar to ns2 superseding ns, we now also intoduce a next generation of BSSGP related code to libosmogb. However, this is not aiming to be a full implementation yet, but simply those parts that we currently need from the revamped osmo-gbproxy. The gprs_bssgp2.[ch] differs in two ways from the old code: * it separates message encoding from message transmission * it supports more recent specs / IEs bssgp_bvc_fsm.c is a genric implementation of the BSSGP BVC RESET/BLOCK/UNBLOCK logic with support for both PTP and signaling, both on the SGSN side and the BSS side. Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a --- M include/Makefile.am A include/osmocom/gprs/bssgp_bvc_fsm.h A include/osmocom/gprs/gprs_bssgp2.h M src/gb/Makefile.am A src/gb/bssgp_bvc_fsm.c A src/gb/gprs_bssgp2.c M src/gb/libosmogb.map 7 files changed, 1,100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/21598/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21611 to look at the new patch set (#2). Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. bssgp_bvc_fsm: Add basic BVC flow control rx/tx support The FSM doesn't actually implement the flow control logic, it only decodes / dispatches and encodes messages. Change-Id: Ie59be6761177c43456898be9148727f15861a622 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/21611 )
Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
..
bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
The FSM doesn't actually implement the flow control logic,
it only decodes / dispatches and encodes messages.
Change-Id: Ie59be6761177c43456898be9148727f15861a622
---
M include/osmocom/gprs/bssgp_bvc_fsm.h
M src/gb/bssgp_bvc_fsm.c
2 files changed, 41 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/1
diff --git a/include/osmocom/gprs/bssgp_bvc_fsm.h
b/include/osmocom/gprs/bssgp_bvc_fsm.h
index 7c6fdeb..e69c205 100644
--- a/include/osmocom/gprs/bssgp_bvc_fsm.h
+++ b/include/osmocom/gprs/bssgp_bvc_fsm.h
@@ -4,6 +4,7 @@
struct gprs_ns2_inst;
struct osmo_fsm_inst;
struct gprs_ra_id;
+struct bssgp2_flow_ctrl;
enum bssp_ptp_bvc_fsm_state {
BSSGP_BVCFSM_S_NULL,
@@ -22,10 +23,13 @@
BSSGP_BVCFSM_E_RX_UNBLOCK_ACK,
BSSGP_BVCFSM_E_RX_RESET,
BSSGP_BVCFSM_E_RX_RESET_ACK,
+ BSSGP_BVCFSM_E_RX_FC_BVC,
+ BSSGP_BVCFSM_E_RX_FC_BVC_ACK,
/* Requests of the local user */
BSSGP_BVCFSM_E_REQ_BLOCK, /* data: uint8_t *cause */
BSSGP_BVCFSM_E_REQ_UNBLOCK,
BSSGP_BVCFSM_E_REQ_RESET, /* data: uint8_t *cause */
+ BSSGP_BVCFSM_E_REQ_FC_BVC, /* data: struct bssgp2_flow_ctrl */
};
struct bssgp_bvc_fsm_ops {
@@ -35,6 +39,7 @@
/* call-back notifying the user of a BVC-RESET event */
void (*reset_notification)(uint16_t nsei, uint16_t bvci, const struct
gprs_ra_id *ra_id,
uint16_t cell_id, uint8_t cause, void *priv);
+ void (*rx_fc_bvc)(uint16_t nsei, uint16_t bvci, const struct
bssgp2_flow_ctrl *fc, void *priv);
};
struct osmo_fsm_inst *
diff --git a/src/gb/bssgp_bvc_fsm.c b/src/gb/bssgp_bvc_fsm.c
index a0e4b01..2224eba 100644
--- a/src/gb/bssgp_bvc_fsm.c
+++ b/src/gb/bssgp_bvc_fsm.c
@@ -86,6 +86,8 @@
{ BSSGP_BVCFSM_E_REQ_BLOCK, "REQ-BLOCK" },
{ BSSGP_BVCFSM_E_REQ_UNBLOCK, "REQ-UNBLOCK" },
{ BSSGP_BVCFSM_E_REQ_RESET, "REQ-RESET" },
+ { BSSGP_BVCFSM_E_RX_FC_BVC, "RX-FLOW-CONTROL-BVC" },
+ { BSSGP_BVCFSM_E_RX_FC_BVC_ACK, "RX-FLOW-CONTROL-BVC-ACK" },
{ 0, NULL }
};
@@ -114,6 +116,8 @@
uint32_t advertised;
uint32_t received;
uint32_t negotiated;
+ /* only used if BSSGP_XFEAT_GBIT is negotiated */
+ enum bssgp_fc_granularity fc_granularity;
} features;
/* Cell Identification used by BSS when
@@ -372,9 +376,11 @@
static void bssgp_bvc_fsm_unblocked(struct osmo_fsm_inst *fi, uint32_t event,
void *data)
{
+ struct bssgp2_flow_ctrl rx_fc, *tx_fc;
struct bvc_fsm_priv *bfp = fi->priv;
const struct tlv_parsed *tp = NULL;
struct msgb *rx = NULL, *tx;
+ int rc;
switch (event) {
case BSSGP_BVCFSM_E_RX_UNBLOCK_ACK:
@@ -440,6 +446,33 @@
fi_tx_sig(fi, tx);
osmo_fsm_inst_state_chg(fi, BSSGP_BVCFSM_S_BLOCKED, T1_SECS,
T1);
break;
+ case BSSGP_BVCFSM_E_RX_FC_BVC:
+ rx = data;
+ tp = (const struct tlv_parsed *) msgb_bcid(rx);
+ /* we assume osmo_tlv_prot_* has been used before calling here
to ensure this */
+ OSMO_ASSERT(bfp->role_sgsn);
+ rc = bssgp2_dec_fc_bvc(_fc, tp);
+ if (rc < 0) {
+ _tx_status(fi, BSSGP_CAUSE_SEM_INCORR_PDU, rx);
+ break;
+ }
+ if (bfp->ops->rx_fc_bvc)
+ bfp->ops->rx_fc_bvc(bfp->nsei, bfp->bvci, _fc,
bfp->ops_priv);
+ tx = bssgp2_enc_fc_bvc_ack(rx_fc.tag);
+ fi_tx_sig(fi, tx);
+ break;
+ case BSSGP_BVCFSM_E_RX_FC_BVC_ACK:
+ rx = data;
+ tp = (const struct tlv_parsed *) msgb_bcid(rx);
+ /* we assume osmo_tlv_prot_* has been used before calling here
to ensure this */
+ OSMO_ASSERT(!bfp->role_sgsn);
+ break;
+ case BSSGP_BVCFSM_E_REQ_FC_BVC:
+ tx_fc = data;
+ tx = bssgp2_enc_fc_bvc(tx_fc, bfp->features.negotiated &
(BSSGP_XFEAT_GBIT << 8) ?
+ >features.fc_granularity : NULL);
+ fi_tx_sig(fi, tx);
+ break;
}
}
@@ -561,7 +594,9 @@
.in_event_mask = S(BSSGP_BVCFSM_E_RX_BLOCK) |
S(BSSGP_BVCFSM_E_RX_UNBLOCK) |
S(BSSGP_BVCFSM_E_RX_UNBLOCK_ACK) |
-S(BSSGP_BVCFSM_E_REQ_BLOCK),
+S(BSSGP_BVCFSM_E_REQ_BLOCK) |
+
Change in libosmocore[master]: bssgp2: Encoding + Decoding functions for BVC and MS flow control
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/21610 )
Change subject: bssgp2: Encoding + Decoding functions for BVC and MS flow
control
..
bssgp2: Encoding + Decoding functions for BVC and MS flow control
Change-Id: I9c89bb1c03550930c07aad7ff8f67129ee7a6320
Related: OS#4891
---
M include/osmocom/gprs/gprs_bssgp2.h
M include/osmocom/gprs/protocol/gsm_08_18.h
M src/gb/gprs_bssgp2.c
M src/gb/libosmogb.map
4 files changed, 259 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/10/21610/1
diff --git a/include/osmocom/gprs/gprs_bssgp2.h
b/include/osmocom/gprs/gprs_bssgp2.h
index 0ab3619..bf814cb 100644
--- a/include/osmocom/gprs/gprs_bssgp2.h
+++ b/include/osmocom/gprs/gprs_bssgp2.h
@@ -4,10 +4,41 @@
#include
#include
+struct bssgp2_flow_ctrl;
struct gprs_ns2_inst;
struct gprs_ra_id;
struct msgb;
+struct bssgp2_flow_ctrl {
+ uint8_t tag;
+ /* maximum bucket size (Bmax) in bytes */
+ uint64_t bucket_size_max;
+ /*! bucket leak rate in _bytes_ per second */
+ uint64_t bucket_leak_rate;
+ /* percentage how full the given bucket is */
+ uint8_t bucket_full_ratio;
+ bool bucket_full_ratio_present;
+ union {
+ /*! FC-BVC specifi members */
+ struct {
+ /*! default maximum bucket size per MS in bytes */
+ uint64_t bmax_default_ms;
+ /*! default bucket leak rate (R) for MS flow control
bucket */
+ uint64_t r_default_ms;
+
+ /*! average milliseconds of queueing delay for a BVC */
+ uint32_t measurement;
+ bool measurement_present;
+ } bvc;
+ /*! FC-MS specifi members */
+ struct {
+ /*! TLLI of the MS */
+ uint32_t tlli;
+ } ms;
+ } u;
+};
+
+
int bssgp2_nsi_tx_ptp(struct gprs_ns2_inst *nsi, uint16_t nsei, uint16_t bvci,
struct msgb *msg, uint32_t lsp);
@@ -29,3 +60,11 @@
const uint8_t *feat_bm, const uint8_t
*ext_feat_bm);
struct msgb *bssgp2_enc_status(uint8_t cause, const uint16_t *bvci, const
struct msgb *orig_msg);
+
+
+int bssgp2_dec_fc_bvc(struct bssgp2_flow_ctrl *fc, const struct tlv_parsed
*tp);
+struct msgb *bssgp2_enc_fc_bvc(const struct bssgp2_flow_ctrl *fc, enum
bssgp_fc_granularity *gran);
+struct msgb *bssgp2_enc_fc_bvc_ack(uint8_t tag);
+int bssgp2_dec_fc_ms(struct bssgp2_flow_ctrl *fc, struct tlv_parsed *tp);
+struct msgb *bssgp2_enc_fc_ms(const struct bssgp2_flow_ctrl *fc, enum
bssgp_fc_granularity *gran);
+struct msgb *bssgp2_enc_fc_ms_ack(uint32_t tlli, uint8_t tag);
diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h
b/include/osmocom/gprs/protocol/gsm_08_18.h
index 0ce28f5..466b0c5 100644
--- a/include/osmocom/gprs/protocol/gsm_08_18.h
+++ b/include/osmocom/gprs/protocol/gsm_08_18.h
@@ -341,3 +341,11 @@
#defineBSSGP_XFEAT_DCN 0x20/* Dedicated CN */
#defineBSSGP_XFEAT_eDRX0x40/* eDRX */
#defineBSSGP_XFEAT_MSAD0x80/* MS-assisted Dedicated CN
selection */
+
+/* Flow Control Granularity (Section 11.3.102) */
+enum bssgp_fc_granularity {
+ BSSGP_FC_GRAN_100 = 0,
+ BSSGP_FC_GRAN_1000 = 1,
+ BSSGP_FC_GRAN_1 = 2,
+ BSSGP_FC_GRAN_10= 3,
+};
diff --git a/src/gb/gprs_bssgp2.c b/src/gb/gprs_bssgp2.c
index ec2199a..70d5bba 100644
--- a/src/gb/gprs_bssgp2.c
+++ b/src/gb/gprs_bssgp2.c
@@ -219,3 +219,209 @@
return msg;
}
+
+static const unsigned int bssgp_fc_gran_tbl[] = {
+ [BSSGP_FC_GRAN_100] = 100,
+ [BSSGP_FC_GRAN_1000]= 1000,
+ [BSSGP_FC_GRAN_1] = 1,
+ [BSSGP_FC_GRAN_10] = 10,
+};
+
+/*! Decode a FLOW-CONTROL-BVC PDU as per TS 48.018 Section 10.4.4.
+ * \param[out] fc caller-allocated memory for parsed output
+ * \param[in] tp pre-parsed TLVs; caller must ensure mandatory IE
presence/length
+ * \returns 0 on success; negative in case of error */
+int bssgp2_dec_fc_bvc(struct bssgp2_flow_ctrl *fc, const struct tlv_parsed *tp)
+{
+ unsigned int granularity = 100;
+
+ /* optional "Flow Control Granularity IE" (11.3.102); applies to
+* bucket_size_max, bucket_leak_rate and PFC FC params IE */
+ if (TLVP_PRESENT(tp, BSSGP_IE_FLOW_CTRL_GRANULARITY)) {
+ uint8_t gran = *TLVP_VAL(tp, BSSGP_IE_FLOW_CTRL_GRANULARITY);
+ granularity = bssgp_fc_gran_tbl[gran & 3];
+ }
+
+ /* mandatory IEs */
+ fc->tag = *TLVP_VAL(tp, BSSGP_IE_TAG);
+ fc->bucket_size_max = granularity * tlvp_val16be(tp,
BSSGP_IE_BVC_BUCKET_SIZE);
+ fc->bucket_leak_rate = (granularity * tlvp_val16be(tp,
Change in libosmocore[master]: tlv.h: Add msgb_tvlv_put_{16,32}be()
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/21609 )
Change subject: tlv.h: Add msgb_tvlv_put_{16,32}be()
..
tlv.h: Add msgb_tvlv_put_{16,32}be()
Those routines are very useful when puzzling together BSSGP messages
with 16-bit and 32bit sized IEs.
Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
---
M include/osmocom/gsm/tlv.h
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/21609/1
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index d34b7da..fe057f4 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -4,6 +4,7 @@
#include
#include
+#include
#include
#include
@@ -278,6 +279,20 @@
return tvlv_put(buf, tag, len, val);
}
+/*! put (append) a TvLV field containing a big-endian 16bit value to msgb. */
+static inline uint8_t *msgb_tvlv_put_16be(struct msgb *msg, uint8_t tag,
uint16_t val)
+{
+ uint16_t val_be = osmo_htons(val);
+ return msgb_tvlv_put(msg, tag, 2, (const uint8_t *)_be);
+}
+
+/*! put (append) a TvLV field containing a big-endian 16bit value to msgb. */
+static inline uint8_t *msgb_tvlv_put_32be(struct msgb *msg, uint8_t tag,
uint32_t val)
+{
+ uint32_t val_be = osmo_htonl(val);
+ return msgb_tvlv_put(msg, tag, 4, (const uint8_t *)_be);
+}
+
/*! put (append) a vTvLV field to \ref msgb */
static inline uint8_t *msgb_vtvlv_gan_put(struct msgb *msg, uint16_t tag,
uint16_t len, const uint8_t *val)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21609
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
Gerrit-Change-Number: 21609
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608 )
Change subject: BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
..
BTS_Tests_OML: add new test case TC_ipa_rsl_connect_nack
Currently osmo-bts seems to be sending IPA RSL Connect ACK
unconditionally, even if the remote peer is not reachable.
Change-Id: Ibfa58f670401907801f610578dd9b4ebf155a83a
---
M bts/BTS_Tests_OML.ttcn
1 file changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/08/21608/1
diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn
index 396ed38..6770dab 100644
--- a/bts/BTS_Tests_OML.ttcn
+++ b/bts/BTS_Tests_OML.ttcn
@@ -589,6 +589,30 @@
}
}
+/* Make sure that the IUT sends RSL Connect NACK when the remote is not
reachable. */
+testcase TC_ipa_rsl_connect_nack() runs on BSC_OML_CT {
+ timer T := 2.0;
+
+ f_init_oml(testcasename());
+
+ /* Most likely, nobody is listening to this port */
+ OML.send(ts_OML_IPA_RslConnect(0, 65535));
+
+ T.start;
+ alt {
+ [] OML.receive(tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT_NACK)) {
+ setverdict(pass);
+ }
+ [] OML.receive(tr_OML_IPA_MsgType(NM_MT_IPACC_RSL_CONNECT_ACK)) {
+ setverdict(fail, "RSL Connect ACK is not expected");
+ }
+ [] OML.receive { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for RSL Connect NACK");
+ }
+ }
+}
+
control {
execute( TC_wrong_mdisc() );
@@ -606,6 +630,7 @@
execute( TC_ts_opstart() );
execute( TC_ts_opstart_noattr() );
execute( TC_initial_state_reports() );
+ execute( TC_ipa_rsl_connect_nack() );
}
/* BTS:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21608
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: Ibfa58f670401907801f610578dd9b4ebf155a83a
Gerrit-Change-Number: 21608
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 ) Change subject: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/21607/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/21607/1//COMMIT_MSG@9 PS1, Line 9: would make more sense check the current state I'll better implement this. https://gerrit.osmocom.org/c/osmo-bsc/+/21607/1//COMMIT_MSG@10 PS1, Line 10: all other NM FSMs seem : to allow This is incorrect. I just checked, and this is only the case for nm_channel_fsm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Gerrit-Change-Number: 21607 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 18:02:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 ) Change subject: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED .. Patch Set 1: Code-Review+1 See https://osmocom.org/issues/4831 It's also happening in other FSMs. It would be great if you could make sure all FSMs are fixed the same way in the same commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Gerrit-Change-Number: 21607 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 17:48:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 ) Change subject: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 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: I872111dae761bda038d2e881ab5f4e6b7f52ec90 Gerrit-Change-Number: 21606 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 17:46:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 17:45:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 ) Change subject: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 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: I903ede1c78e103d24a93f2e6b0e1acd136405099 Gerrit-Change-Number: 21605 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 17:42:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: vty: fix swapped documentation for 'filler type' command
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/21604 ) Change subject: vty: fix swapped documentation for 'filler type' command .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/21604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ieb3bbc4fb30f303c47555ca77d03a9e965bc72b5 Gerrit-Change-Number: 21604 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 17:42:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: make raise/lower step limitation configurable
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21568 ) Change subject: power_control: make raise/lower step limitation configurable .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98 Gerrit-Change-Number: 21568 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 17:37:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 ) Change subject: nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED .. nm_gprs_nsvc_fsm: allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED It would make more sense check the current state before asking for transition to DISABLED_NOTINSTALLED, however all other NM FSMs seem to allow DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED transition. Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Related: OS#4901 --- M src/osmo-bsc/nm_gprs_nsvc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/21607/1 diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index 2a57ada..7a7ab8d 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -317,6 +317,7 @@ X(NM_EV_FEATURE_NEGOTIATED) | X(NM_EV_STATE_CHG_REP), .out_state_mask = + X(NM_GPRS_NSVC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_GPRS_NSVC_ST_OP_DISABLED_DEPENDENCY) | X(NM_GPRS_NSVC_ST_OP_DISABLED_OFFLINE) | X(NM_GPRS_NSVC_ST_OP_ENABLED), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Gerrit-Change-Number: 21607 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 ) Change subject: bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now .. bts/expected-results.xml: TC_sacch_chan_act_ho_sync should pass now Change-Id: I872111dae761bda038d2e881ab5f4e6b7f52ec90 --- M bts/expected-results.xml 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/21606/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 4fd704c..6142e40 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -16,12 +16,7 @@ BTS_Tests.ttcn:MASKED TC_sacch_chan_act_ho_async testcase - -"BTS_Tests.ttcn:MASKED : Unexpected RSL message received" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_sacch_chan_act_ho_sync testcase - - + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21606 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: I872111dae761bda038d2e881ab5f4e6b7f52ec90 Gerrit-Change-Number: 21606 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21598 to look at the new patch set (#4). Change subject: gb: Add beginnings of a new BSSGP implementation .. gb: Add beginnings of a new BSSGP implementation Similar to ns2 superseding ns, we now also intoduce a next generation of BSSGP related code to libosmogb. However, this is not aiming to be a full implementation yet, but simply those parts that we currently need from the revamped osmo-gbproxy. The gprs_bssgp2.[ch] differs in two ways from the old code: * it separates message encoding from message transmission * it supports more recent specs / IEs bssgp_bvc_fsm.c is a genric implementation of the BSSGP BVC RESET/BLOCK/UNBLOCK logic with support for both PTP and signaling, both on the SGSN side and the BSS side. Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a --- M include/Makefile.am A include/osmocom/gprs/bssgp_bvc_fsm.h A include/osmocom/gprs/gprs_bssgp2.h M src/gb/Makefile.am A src/gb/bssgp_bvc_fsm.c A src/gb/gprs_bssgp2.c M src/gb/libosmogb.map 7 files changed, 1,100 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/21598/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 ) Change subject: bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations .. bts/expected-results.xml: add missing SMSCB-over-SDCCH8 expectations Change-Id: I903ede1c78e103d24a93f2e6b0e1acd136405099 --- M bts/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/21605/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index a50cf6d..4fd704c 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -157,6 +157,16 @@ + + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21605 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: I903ede1c78e103d24a93f2e6b0e1acd136405099 Gerrit-Change-Number: 21605 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-trx[master]: vty: fix swapped documentation for 'filler type' command
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/21604 )
Change subject: vty: fix swapped documentation for 'filler type' command
..
vty: fix swapped documentation for 'filler type' command
vty_cmd_string_from_valstr() expands the given 'struct value_string'
sequentionally, so the order of entries in both filler_{types,docs}
shall match (regardless of the value assigned).
Change-Id: Ieb3bbc4fb30f303c47555ca77d03a9e965bc72b5
---
M CommonLibs/trx_vty.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/04/21604/1
diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c
index e672928..0bb83fe 100644
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -68,8 +68,8 @@
};
static const struct value_string filler_docs[] = {
- { FILLER_ZERO, "Send an empty burst (default)" },
{ FILLER_DUMMY, "Send a Dummy Burst on C0 (TRX0) and empty
burst on other channels" },
+ { FILLER_ZERO, "Send an empty burst (default)" },
{ FILLER_NORM_RAND, "Send a GMSK modulated Normal Burst with random
bits (spectrum mask testing)" },
{ FILLER_EDGE_RAND, "Send an 8-PSK modulated Normal Burst with
random bits (spectrum mask testing)" },
{ FILLER_ACCESS_RAND, "Send an Access Burst with random bits (Rx/Tx
alignment testing)" },
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/21604
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ieb3bbc4fb30f303c47555ca77d03a9e965bc72b5
Gerrit-Change-Number: 21604
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.2/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 191s] (cd ../../src && make libosmo-rspro.la) [ 191s] make[4]: Entering directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 191s] make[4]: 'libosmo-rspro.la' is up to date. [ 191s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 191s] In file included from rest_api.c:7:0: [ 191s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 191s]#include [ 191s] ^~~~ [ 191s] compilation terminated. [ 191s] make[3]: *** [Makefile:451: rest_api.o] Error 1 [ 191s] make[3]: *** Waiting for unfinished jobs [ 191s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src/server' [ 191s] make[2]: *** [Makefile:534: all-recursive] Error 1 [ 191s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 191s] make[1]: *** [Makefile:482: all-recursive] Error 1 [ 191s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34' [ 191s] make: *** [Makefile:406: all] Error 2 [ 191s] error: Bad exit status from /var/tmp/rpm-tmp.RAXf0k (%build) [ 191s] [ 191s] [ 191s] RPM build errors: [ 191s] Bad exit status from /var/tmp/rpm-tmp.RAXf0k (%build) [ 191s] ### VM INTERACTION START ### [ 195s] [ 157.938825] sysrq: Power Off [ 195s] [ 157.995682] reboot: Power down [ 195s] ### VM INTERACTION END ### [ 195s] [ 195s] lamb13 failed "build osmo-remsim.spec" at Tue Dec 8 14:12:08 UTC 2020. [ 195s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.1/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 56s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rest_api.o rest_api.c [ 56s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 56s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o slotmap.o `test -f '../slotmap.c' || echo './'`../slotmap.c [ 56s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o debug.o `test -f '../debug.c' || echo './'`../debug.c [ 56s] In file included from rest_api.c:7:0: [ 56s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 56s]#include [ 56s] ^~~~ [ 56s] compilation terminated. [ 56s] make[3]: *** [Makefile:451:
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Tumbleweed/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 77s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o remsim_server.o remsim_server.c [ 77s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_server.o rspro_server.c [ 77s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rest_api.o rest_api.c [ 77s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1-O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 77s] In file included from rest_api.c:7: [ 77s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 77s]49 | #include [ 77s] |^~~~ [ 77s] compilation terminated. [ 77s] make[3]: *** [Makefile:461: rest_api.o] Error 1 [ 77s] make[3]: *** Waiting for unfinished jobs [ 77s] make[3]: Leaving directory
Change in osmo-gsm-tester[master]: add handover_2G suite, with handover.py test
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21523 ) Change subject: add handover_2G suite, with handover.py test .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21523/2/sysmocom/suites/handover_2G/handover.py File sysmocom/suites/handover_2G/handover.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21523/2/sysmocom/suites/handover_2G/handover.py@91 PS2, Line 91: with bsc.ctrl() as bsc_ctrl: > BTW, I'd do that ofc inside the obj class, so test doesn't need to care about > those details. […] that's a good alternative, yes. Since my last comment I also considered simply *always* opening a CTRL and VTY connection. In defense of the 'with' statement: the point of 'with' is to un-use an object no matter how that 'with' block is exited, be it an exception or plain being done with it. It is a simplification of the 'try: ... finally:' pattern. 'with' is usually very nice, lean+powerful, imho, but i accept that you prefer less indent in test scripts (though it's a cosmetic that we don't even mention in most code) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I0b2671304165a1aaae2b386af46fbd8b098e3bd8 Gerrit-Change-Number: 21523 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:53:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: add test.report_fragment()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516 ) Change subject: add test.report_fragment() .. Patch Set 3: (2 comments) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516/3//COMMIT_MSG@14 PS3, Line 14: handover.py__01_bts0_started PASSED > The separator is / instead of __ now right? thx https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516/3/src/osmo_gsm_tester/core/test.py File src/osmo_gsm_tester/core/test.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516/3/src/osmo_gsm_tester/core/test.py@171 PS3, Line 171: if isinstance(lt, log.FileLogTarget): > This looks not related to this commit? Is it a separate fix? thx -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4ca9100b6f8db24d1f7e0a09b3b7ba88b8ae3b59 Gerrit-Change-Number: 21516 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:42:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: process: add get_output_mark() and grep_output()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21512 ) Change subject: process: add get_output_mark() and grep_output() .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21512/2/src/osmo_gsm_tester/core/process.py File src/osmo_gsm_tester/core/process.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21512/2/src/osmo_gsm_tester/core/process.py@388 PS2, Line 388: def get_stdout_mark(self): > Can you write here an example on how to use the get_output_mark() API? […] Typically i get a mark, and after that start the actions that i want to see a log of -- no race problem. get_output_mark() returns the length of the log currently. Later, get_output(since_mark=...) returns the log since that start marker. adding an example. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib6569f7486e9d961bd79a5f24232e58d053667a1 Gerrit-Change-Number: 21512 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:35:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Leap_15.1_ARM/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 105s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o remsim_server.o remsim_server.c [ 105s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_server.o rspro_server.c [ 105s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rest_api.o rest_api.c [ 105s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I//usr/include -I/usr/include/p11-kit-1 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 105s] In file included from rest_api.c:7:0: [ 105s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 105s]#include [ 105s] ^~~~ [ 105s] compilation terminated. [ 105s] make[3]: *** [Makefile:451: rest_api.o] Error 1 [ 105s] make[3]: *** Waiting
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Factory_ARM/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 98s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o remsim_server.o remsim_server.c [ 98s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_server.o rspro_server.c [ 98s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rest_api.o rest_api.c [ 98s] gcc -DPACKAGE_NAME=\"osmo-remsim\" -DPACKAGE_TARNAME=\"osmo-remsim\" -DPACKAGE_VERSION=\"0.2.2.103.dc34\" -DPACKAGE_STRING=\"osmo-remsim\ 0.2.2.103.dc34\" -DPACKAGE_BUGREPORT=\"simtr...@lists.osmocom.org\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DPACKAGE=\"osmo-remsim\" -DVERSION=\"0.2.2.103.dc34\" -DBUILD_SERVER=1 -DBUILD_BANKD=1 -DHAVE_CSV_H=1 -DBUILD_CLIENT_ST2=1 -DBUILD_CLIENT_IFDHANDLER=1 -DSTDC_HEADERS=1 -I. -Wall -Wall -I../../include -I../../include -I../../src -I../../include/osmocom/rspro -I/usr/include/libosmocore/ -pthread -I/usr/include/libosmocore/ -I/usr/include/libosmo-abis/ -I/usr/include/p11-kit-1 -mbranch-protection=standard -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type -flto=auto -Wall -c -o rspro_util.o `test -f '../rspro_util.c' || echo './'`../rspro_util.c [ 98s] In file included from rest_api.c:7: [ 98s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 98s]49 | #include [ 98s] |^~~~ [ 98s] compilation terminated. [ 98s] make[3]: *** [Makefile:461: rest_api.o]
Build failure of network:osmocom:nightly/osmo-remsim in openSUSE_Tumbleweed/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-remsim failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 131s] (cd ../../src && make libosmo-rspro.la) [ 131s] make[4]: Entering directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 131s] make[4]: 'libosmo-rspro.la' is up to date. [ 131s] make[4]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 131s] In file included from rest_api.c:7: [ 131s] /usr/include/ulfius.h:49:12: fatal error: zlib.h: No such file or directory [ 131s]49 | #include [ 131s] |^~~~ [ 131s] compilation terminated. [ 131s] make[3]: *** [Makefile:461: rest_api.o] Error 1 [ 131s] make[3]: *** Waiting for unfinished jobs [ 132s] make[3]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src/server' [ 132s] make[2]: *** [Makefile:542: all-recursive] Error 1 [ 132s] make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34/src' [ 132s] make[1]: *** [Makefile:482: all-recursive] Error 1 [ 132s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/osmo-remsim-0.2.2.103.dc34' [ 132s] make: *** [Makefile:406: all] Error 2 [ 132s] error: Bad exit status from /var/tmp/rpm-tmp.y1yyQ1 (%build) [ 132s] [ 132s] [ 132s] RPM build errors: [ 132s] Bad exit status from /var/tmp/rpm-tmp.y1yyQ1 (%build) [ 132s] ### VM INTERACTION START ### [ 135s] [ 109.986185] sysrq: Power Off [ 135s] [ 109.994904] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] lamb58 failed "build osmo-remsim.spec" at Tue Dec 8 12:31:59 UTC 2020. [ 135s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in libosmocore[master]: (WIP) libosmogsm: introduce message definition and verification helpers
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/11105 ) Change subject: (WIP) libosmogsm: introduce message definition and verification helpers .. Abandoned See https://gerrit.osmocom.org/c/libosmocore/+/21534. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/11105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idef83b0c53b17503a64d7ab7422184ca4b60be57 Gerrit-Change-Number: 11105 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: abandon
Change in libosmocore[master]: gsm_08_18.h: Add #defines for [extended] feature bits
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21595 ) Change subject: gsm_08_18.h: Add #defines for [extended] feature bits .. gsm_08_18.h: Add #defines for [extended] feature bits Change-Id: I7743cb901988c8fddd91127cfdca6e54b3d44ea8 --- M include/osmocom/gprs/protocol/gsm_08_18.h 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h b/include/osmocom/gprs/protocol/gsm_08_18.h index 679a08e..0ce28f5 100644 --- a/include/osmocom/gprs/protocol/gsm_08_18.h +++ b/include/osmocom/gprs/protocol/gsm_08_18.h @@ -321,3 +321,23 @@ BSSGP_CAUSE_DTM_HO_MSC_ERR = 0x4a, BSSGP_CAUSE_INVAL_CSG_CELL = 0x4b, }; + +/* Feature Bitmap (Section 11.3.45) */ +#defineBSSGP_FEAT_PFC 0x01/* Packet Flow Context */ +#defineBSSGP_FEAT_CBL 0x02/* Current Bucket Level */ +#defineBSSGP_FEAT_INR 0x04/* Inter-NSE re-routing */ +#defineBSSGP_FEAT_LCS 0x08/* Location Services */ +#defineBSSGP_FEAT_RIM 0x10/* RAN Inoformation Management */ +#defineBSSGP_FEAT_PFC_FC 0x20/* PFC Flow Control */ +#defineBSSGP_FEAT_ERS 0x40/* Enhanced Radio Status */ +#defineBSSGP_FEAT_MBMS 0x80/* Multimedia Broadcast */ + +/* Extended Feature Bitmap (Section 11.3.84) */ +#defineBSSGP_XFEAT_PSHO0x01/* PS Handover */ +#defineBSSGP_XFEAT_GBIT0x02/* Gigabit Interface */ +#defineBSSGP_XFEAT_MOCN0x04/* Multi-Operator CN */ +#defineBSSGP_XFEAT_CSPS0x08/* CS/PS coordination enhancements */ +#defineBSSGP_XFEAT_ECIoT 0x10/* EC-GSM-IoT */ +#defineBSSGP_XFEAT_DCN 0x20/* Dedicated CN */ +#defineBSSGP_XFEAT_eDRX0x40/* eDRX */ +#defineBSSGP_XFEAT_MSAD0x80/* MS-assisted Dedicated CN selection */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7743cb901988c8fddd91127cfdca6e54b3d44ea8 Gerrit-Change-Number: 21595 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: bssgp: Add osmo_tlv_prot_def for BSSGP
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21544 )
Change subject: bssgp: Add osmo_tlv_prot_def for BSSGP
..
bssgp: Add osmo_tlv_prot_def for BSSGP
Change-Id: I7e4226463f3c935134b5c2c737696fbfd1dd5815
---
M include/osmocom/gprs/gprs_bssgp.h
M src/gb/gprs_bssgp_util.c
M src/gb/libosmogb.map
3 files changed, 317 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/gprs/gprs_bssgp.h
b/include/osmocom/gprs/gprs_bssgp.h
index e962b44..dc2a8d0 100644
--- a/include/osmocom/gprs/gprs_bssgp.h
+++ b/include/osmocom/gprs/gprs_bssgp.h
@@ -12,8 +12,21 @@
#include
/* gprs_bssgp_util.c */
-typedef int (*bssgp_bvc_send)(void *ctx, struct msgb *msg);
+#define BSSGP_PDUF_UL 0x0001 /* PDU may occur in uplink */
+#define BSSGP_PDUF_DL 0x0002 /* PDU may occur in downlink */
+#define BSSGP_PDUF_SIG 0x0004 /* PDU may occur on Signaling BVC */
+#define BSSGP_PDUF_PTP 0x0008 /* PDU may occur on PTP BVC */
+#define BSSGP_PDUF_PTM 0x0010 /* PDU may occur on PTM BVC */
+
+extern const struct osmo_tlv_prot_def osmo_pdef_bssgp;
+
+/*! return the PDU type flags (UL/DL/SIG/PTP/PTM) of specified PDU type */
+static inline uint32_t bssgp_pdu_type_flags(uint8_t pdu_type) {
+ return osmo_tlv_prot_msgt_flags(_pdef_bssgp, pdu_type);
+}
+
+typedef int (*bssgp_bvc_send)(void *ctx, struct msgb *msg);
extern struct gprs_ns_inst *bssgp_nsi;
void bssgp_set_bssgp_callback(bssgp_bvc_send ns_send, void *data);
struct msgb *bssgp_msgb_alloc(void);
diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c
index a4ee926..8342d7c 100644
--- a/src/gb/gprs_bssgp_util.c
+++ b/src/gb/gprs_bssgp_util.c
@@ -179,6 +179,307 @@
{ 0, NULL },
};
+static const uint8_t dl_ud_ies[] = { BSSGP_IE_PDU_LIFETIME };
+static const uint8_t ul_ud_ies[] = { BSSGP_IE_CELL_ID };
+static const uint8_t ra_cap_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_MS_RADIO_ACCESS_CAP };
+static const uint8_t dl_mb_ud_ies[] = { BSSGP_IE_PDU_LIFETIME, BSSGP_IE_TMGI,
BSSGP_IE_LLC_PDU };
+static const uint8_t ul_mb_ud_ies[] = { BSSGP_IE_PDU_LIFETIME, BSSGP_IE_TMGI,
BSSGP_IE_LLC_PDU };
+static const uint8_t pag_ps_ies[] = { BSSGP_IE_IMSI, BSSGP_IE_QOS_PROFILE };
+static const uint8_t pag_cs_ies[] = { BSSGP_IE_IMSI, BSSGP_IE_DRX_PARAMS };
+static const uint8_t ra_cap_upd_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_TAG };
+static const uint8_t ra_cap_upd_ack_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_TAG,
BSSGP_IE_RA_CAP_UPD_CAUSE };
+static const uint8_t rad_sts_ies[] = { BSSGP_IE_RADIO_CAUSE };
+static const uint8_t suspend_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_ROUTEING_AREA };
+static const uint8_t suspend_ack_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_ROUTEING_AREA, BSSGP_IE_SUSPEND_REF_NR };
+static const uint8_t resume_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_ROUTEING_AREA,
BSSGP_IE_SUSPEND_REF_NR };
+static const uint8_t resume_ack_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_ROUTEING_AREA };
+static const uint8_t resume_nack_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_ROUTEING_AREA };
+static const uint8_t d_pag_ps_ies[] = { BSSGP_IE_IMSI };
+static const uint8_t d_pag_ps_resp_ies[] = { BSSGP_IE_IMSI,
BSSGP_IE_T_UNTIL_NEXT_PAGING };
+static const uint8_t d_pag_ps_rej_ies[] = { BSSGP_IE_IMSI,
BSSGP_IE_T_UNTIL_NEXT_PAGING };
+static const uint8_t ms_reg_enq_ies[] = { BSSGP_IE_IMSI };
+static const uint8_t ms_reg_enq_res_ies[] = { BSSGP_IE_IMSI };
+static const uint8_t flush_ll_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_BVCI };
+static const uint8_t flush_ll_ack_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_FLUSH_ACTION };
+static const uint8_t llc_disc_ies[] = { BSSGP_IE_TLLI,
BSSGP_IE_LLC_FRAMES_DISCARDED, BSSGP_IE_BVCI,
+ BSSGP_IE_NUM_OCT_AFF };
+static const uint8_t fc_bvc_ies[] = { BSSGP_IE_TAG, BSSGP_IE_BVC_BUCKET_SIZE,
BSSGP_IE_BUCKET_LEAK_RATE,
+ BSSGP_IE_BMAX_DEFAULT_MS,
BSSGP_IE_R_DEFAULT_MS };
+static const uint8_t fc_bvc_ack_ies[] = { BSSGP_IE_TAG };
+static const uint8_t fc_ms_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_TAG,
BSSGP_IE_MS_BUCKET_SIZE,
+BSSGP_IE_BUCKET_LEAK_RATE };
+static const uint8_t fc_ms_ack_ies[] = { BSSGP_IE_TLLI, BSSGP_IE_TAG };
+static const uint8_t block_ies[] = { BSSGP_IE_BVCI, BSSGP_IE_CAUSE };
+static const uint8_t block_ack_ies[] = { BSSGP_IE_BVCI };
+static const uint8_t unblock_ies[] = { BSSGP_IE_BVCI };
+static const uint8_t unblock_ack_ies[] = { BSSGP_IE_BVCI };
+static const uint8_t reset_ies[] = { BSSGP_IE_BVCI, BSSGP_IE_CAUSE };
+static const uint8_t reset_ack_ies[] = { BSSGP_IE_BVCI };
+static const uint8_t status_ies[] = { BSSGP_IE_CAUSE };
+static const uint8_t inv_trc_ies[] = { BSSGP_IE_TRACE_TYPE,
BSSGP_IE_TRACE_REFERENC };
+static const uint8_t dl_bss_pfc_ies[] = {
Change in libosmocore[master]: Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21534 )
Change subject: Introduce 'osmo_tlv_prot' abstraction for validation of TLV
protocols
..
Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols
This extends our existing TLV parser with the ability to
* validate that mandatory IEs of a given message are present
* validate that all present IEs are of required minimum length
Introducing this generic layer will help us to reduce open-coded
imperative verification across virtually all the protocols we
implement, as well as add validation to those protocols where we
don't properly perform related input validation yet.
Change-Id: If1e1d9adfa141ca86001dbd62a6a339f9bf9a912
---
M include/osmocom/gsm/tlv.h
M src/gsm/libosmogsm.map
M src/gsm/tlv_parser.c
3 files changed, 159 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index 254c21b..a307b3d 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -620,4 +620,54 @@
int osmo_shift_lv(uint8_t **data, size_t *data_len,
uint8_t **value, size_t *value_len);
+#define MSG_DEF(name, mand_ies, flags) { name, mand_ies, ARRAY_SIZE(mand_ies),
flags }
+
+struct osmo_tlv_prot_msg_def {
+ /*! human-readable name of message type (optional) */
+ const char *name;
+ /*! array of mandatory IEs */
+ const uint8_t *mand_ies;
+ /*! number of entries in 'mand_ies' above */
+ uint8_t mand_count;
+ /*! user-defined flags (like uplink/downlink/...) */
+ uint32_t flags;
+};
+struct osmo_tlv_prot_ie_def {
+ /*! minimum length of IE value part, in octets */
+ uint16_t min_len;
+ /*! huamn-readable name (optional) */
+ const char *name;
+};
+
+/*! Osmocom TLV protocol definition */
+struct osmo_tlv_prot_def {
+ /*! human-readable name of protocol */
+ const char *name;
+ /*! TLV parser definition (optional) */
+ const struct tlv_definition *tlv_def;
+ /*! definition of each message (8-bit message type) */
+ struct osmo_tlv_prot_msg_def msg_def[256];
+ /*! definition of IE for each 8-bit tag */
+ struct osmo_tlv_prot_ie_def ie_def[256];
+ /*! value_string array of message type names (legacy, if not populated
in msg_def) */
+ const struct value_string *msgt_names;
+};
+
+const char *osmo_tlv_prot_msg_name(const struct osmo_tlv_prot_def *pdef,
uint8_t msg_type);
+const char *osmo_tlv_prot_ie_name(const struct osmo_tlv_prot_def *pdef,
uint8_t iei);
+
+int osmo_tlv_prot_validate_tp(const struct osmo_tlv_prot_def *pdef, uint8_t
msg_type,
+ const struct tlv_parsed *tp, int log_subsys,
const char *log_pfx);
+
+int osmo_tlv_prot_parse(const struct osmo_tlv_prot_def *pdef,
+ struct tlv_parsed *dec, unsigned int dec_multiples,
uint8_t msg_type,
+ const uint8_t *buf, unsigned int buf_len, uint8_t
lv_tag, uint8_t lv_tag2,
+ int log_subsys, const char *log_pfx);
+
+static inline uint32_t osmo_tlv_prot_msgt_flags(const struct osmo_tlv_prot_def
*pdef, uint8_t msg_type)
+{
+ return pdef->msg_def[msg_type].flags;
+}
+
+
/*! @} */
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index f339120..bcded1c 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -580,6 +580,11 @@
osmo_match_shift_tlv;
osmo_shift_lv;
+osmo_tlv_prot_msg_name;
+osmo_tlv_prot_ie_name;
+osmo_tlv_prot_validate_tp;
+osmo_tlv_prot_parse;
+
gan_msgt_vals;
gan_pdisc_vals;
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index 159b42b..24edd0c 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,4 +1,4 @@
-/* (C) 2008-2017 by Harald Welte
+/* (C) 2008-2020 by Harald Welte
* (C) 2016-2017 by sysmocom - s.f.m.c. GmbH
*
* All Rights Reserved
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
/*! \addtogroup tlv
@@ -627,4 +628,106 @@
return -1;
}
+static __thread char ienamebuf[32];
+static __thread char msgnamebuf[32];
+
+/*! get the message name for given msg_type in protocol pdef */
+const char *osmo_tlv_prot_msg_name(const struct osmo_tlv_prot_def *pdef,
uint8_t msg_type)
+{
+ if (pdef->msg_def[msg_type].name) {
+ return pdef->msg_def[msg_type].name;
+ } else if (pdef->msgt_names) {
+ return get_value_string(pdef->msgt_names, msg_type);
+ } else {
+ snprintf(msgnamebuf, sizeof(msgnamebuf), "Unknown msg_type
0x%02x", msg_type);
+ return msgnamebuf;
+ }
+}
+
+/*! get the IE name for given IEI in protocol pdef */
+const char *osmo_tlv_prot_ie_name(const struct osmo_tlv_prot_def *pdef,
uint8_t
Change in libosmocore[master]: tlv: Introduce enum with error codes for TLV parser functions
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21535 )
Change subject: tlv: Introduce enum with error codes for TLV parser functions
..
tlv: Introduce enum with error codes for TLV parser functions
Change-Id: I0b352792089c5c0c714712d2ea237beb92e1d73f
---
M include/osmocom/gsm/tlv.h
M src/gsm/tlv_parser.c
2 files changed, 29 insertions(+), 17 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index a307b3d..d34b7da 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -40,6 +40,16 @@
/*! maximum length of TLV of one byte length */
#define TVLV_MAX_ONEBYTE 0x7f
+/*! error return codes of various TLV parser functions */
+enum osmo_tlv_parser_error {
+ OSMO_TLVP_ERR_OFS_BEYOND_BUFFER = -1,
+ OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER = -2,
+ OSMO_TLVP_ERR_UNKNOWN_TLV_TYPE = -3,
+
+ OSMO_TLVP_ERR_MAND_IE_MISSING = -50,
+ OSMO_TLVP_ERR_IE_TOO_SHORT = -51,
+};
+
/*! gross length of a TVLV type field */
static inline uint16_t TVLV_GROSS_LEN(uint16_t len)
{
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index 24edd0c..7930d64 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -266,24 +266,24 @@
case TLV_TYPE_TLV:
tlv: /* GSM TS 04.07 11.2.4: Type 4 TLV */
if (buf + 1 > buf + buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
*o_val = buf+2;
*o_len = *(buf+1);
len = *o_len + 2;
if (len > buf_len)
- return -2;
+ return OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER;
break;
case TLV_TYPE_vTvLV_GAN:/* 44.318 / 11.1.4 */
/* FIXME: variable-length TAG! */
if (*(buf+1) & 0x80) {
/* like TL16Vbut without highest bit of len */
if (2 > buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
*o_val = buf+3;
*o_len = (*(buf+1) & 0x7F) << 8 | *(buf+2);
len = *o_len + 3;
if (len > buf_len)
- return -2;
+ return OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER;
} else {
/* like TLV */
goto tlv;
@@ -293,26 +293,26 @@
if (*(buf+1) & 0x80) {
/* like TLV, but without highest bit of len */
if (buf + 1 > buf + buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
*o_val = buf+2;
*o_len = *(buf+1) & 0x7f;
len = *o_len + 2;
if (len > buf_len)
- return -2;
+ return OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER;
break;
}
/* like TL16V, fallthrough */
case TLV_TYPE_TL16V:
if (2 > buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
*o_val = buf+3;
*o_len = *(buf+1) << 8 | *(buf+2);
len = *o_len + 3;
if (len > buf_len)
- return -2;
+ return OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER;
break;
default:
- return -3;
+ return OSMO_TLVP_ERR_UNKNOWN_TLV_TYPE;
}
return len;
@@ -370,12 +370,12 @@
const uint8_t *val;
uint16_t parsed_len;
if (ofs > buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
val = [ofs+1];
len = buf[ofs];
parsed_len = len + 1;
if (ofs + parsed_len > buf_len)
- return -2;
+ return OSMO_TLVP_ERR_OFS_LEN_BEYOND_BUFFER;
num_parsed++;
ofs += parsed_len;
/* store the resulting val and len */
@@ -391,12 +391,12 @@
const uint8_t *val;
uint16_t parsed_len;
if (ofs > buf_len)
- return -1;
+ return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
val = [ofs+1];
len = buf[ofs];
parsed_len = len + 1;
if (ofs + parsed_len
Change in libosmocore[master]: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21589 )
Change subject: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state
..
ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state
if we transition to UNBLOCKED as a result of a locally-generated
unblock action, then of course we will receive an inbound UNBLOCK-ACK.
Let's avoid error log messages and confusign the peer with NS-STATUS
in this case:
DLNS DEBUG
GPRS-NS2-VC(FR-hdlcnet3-DLCI18-NSEI2001-NSVCI3)[0x61201720]{UNBLOCKED}:
Received Event UNBLOCK_ACK (gprs_ns2_vc_fsm.c:692)
DLNS ERROR
GPRS-NS2-VC(FR-hdlcnet3-DLCI18-NSEI2001-NSVCI3)[0x61201720]{UNBLOCKED}:
Event UNBLOCK_ACK not permitted (gprs_ns2_vc_fsm.c:692)
Change-Id: Icc4d960ddad82e3ebbf571d8ff9f24854b52a946
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index 08b6b2d..0f6eeab 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -400,7 +400,7 @@
.onenter = gprs_ns2_st_blocked_onenter,
},
[GPRS_NS2_ST_UNBLOCKED] = {
- .in_event_mask = S(GPRS_NS2_EV_BLOCK),
+ .in_event_mask = S(GPRS_NS2_EV_BLOCK) |
S(GPRS_NS2_EV_UNBLOCK_ACK),
.out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_ALIVE) |
S(GPRS_NS2_ST_BLOCKED) |
S(GPRS_NS2_ST_UNCONFIGURED),
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21589
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Icc4d960ddad82e3ebbf571d8ff9f24854b52a946
Gerrit-Change-Number: 21589
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: bssgp: Add osmo_tlv_prot_def for BSSGP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21544 ) Change subject: bssgp: Add osmo_tlv_prot_def for BSSGP .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7e4226463f3c935134b5c2c737696fbfd1dd5815 Gerrit-Change-Number: 21544 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:27:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: tlv: Introduce enum with error codes for TLV parser functions
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21535 ) Change subject: tlv: Introduce enum with error codes for TLV parser functions .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b352792089c5c0c714712d2ea237beb92e1d73f Gerrit-Change-Number: 21535 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:27:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21589 ) Change subject: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icc4d960ddad82e3ebbf571d8ff9f24854b52a946 Gerrit-Change-Number: 21589 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:27:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 3: (3 comments) One of the questions where I don't have a clear feeling about is whether we should prefix also the BBV FSM with bssgp2_ instead of bssgp_. It's not like we had a FSM before, so there is no need to separate a new from an old implementatin in prefix. But then, mayb it makes sense to prefix all symbols introduced around the same time/generation of code with the same prefix? https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c File src/gb/bssgp_bvc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@4 PS3, Line 4: /* FIXME: This should probably be moved to libosmogb? */ > it's already inlibosmogb right? Ack https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@70 PS3, Line 70: uint32_t advertised; > not important, but these can really be uint16_t then. AS you can see, today's spec already utilizes all 16 of those 16 bits. Wait for Rel16 or later defining more bits, and you will be happy we have used an uint32_t here from the start :P https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@283 PS3, Line 283: osmo_fsm_inst_state_chg(fi, BSSGP_BVCFSM_S_UNBLOCKED, T1_SECS, T1); > Not required, but you probably want to move to using osmo_tdef structures and > FSM APIs at some point […] There's actually a related FIXME in Line 25, thanks. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:24:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmocore[master]: Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21534 ) Change subject: Introduce 'osmo_tlv_prot' abstraction for validation of TLV protocols .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If1e1d9adfa141ca86001dbd62a6a339f9bf9a912 Gerrit-Change-Number: 21534 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:24:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm_08_18.h: Add #defines for [extended] feature bits
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21595 ) Change subject: gsm_08_18.h: Add #defines for [extended] feature bits .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7743cb901988c8fddd91127cfdca6e54b3d44ea8 Gerrit-Change-Number: 21595 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:22:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: log passed tests
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21509 ) Change subject: log passed tests .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib85a5b90e267c2ed2f844691187ecadc8939b1bb Gerrit-Change-Number: 21509 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:20:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21589 ) Change subject: ns2: Accept NS-UNBLOCK-ACK in UNBLOCKED state .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21589/1/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/21589/1/src/gb/gprs_ns2_vc_fsm.c@403 PS1, Line 403: .in_event_mask = S(GPRS_NS2_EV_BLOCK) | S(GPRS_NS2_EV_UNBLOCK_ACK), > Only some of the lines are wrong, others are good, so I'm asking simply not > to make it worse * I don't think we have a general rule about not putting multiple in one line. Infact, IIRC all the orgiinal code I introduced was using multiple per line * whether it's "worse" is IMHO a question of taste It's OK to point out clear violations of [documented, established] coding style. However, pointing out something that is not a universal rule _and_ is not followed in the surrounding code is not OK for me, sorry. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icc4d960ddad82e3ebbf571d8ff9f24854b52a946 Gerrit-Change-Number: 21589 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:20:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: properly initialize MS/BS Power Control state
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21448 )
Change subject: rsl: properly initialize MS/BS Power Control state
..
rsl: properly initialize MS/BS Power Control state
struct lchan_power_ctrl_state actually contains more fields,
which also must be initialized on CHANnel ACTIVation.
Change-Id: Id9719088fc6e9479c13e9b327a3466d9e2810a3a
Related: SYS#4918
---
M src/common/rsl.c
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 2ebfb32..30fa259 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1154,14 +1154,18 @@
gsm_lchans_name(lchan->state));
/* Initialize MS Power Control defaults */
- lchan->ms_power_ctrl.max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
- lchan->ms_power_ctrl.current = lchan->ms_power_ctrl.max;
- lchan->ms_power_ctrl.fixed = true;
+ lchan->ms_power_ctrl = (struct lchan_power_ctrl_state) {
+ .max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0),
+ .current = lchan->ms_power_ctrl.max,
+ .fixed = true,
+ };
/* Initialize BS Power Control defaults */
- lchan->bs_power_ctrl.max = 2 * 15;
- lchan->bs_power_ctrl.current = 0;
- lchan->bs_power_ctrl.fixed = true;
+ lchan->bs_power_ctrl = (struct lchan_power_ctrl_state) {
+ .max = 2 * 15, /* maximum defined in 9.3.4 */
+ .current = 0,
+ .fixed = true,
+ };
rsl_tlv_parse(, msgb_l3(msg), msgb_l3len(msg));
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21448
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id9719088fc6e9479c13e9b327a3466d9e2810a3a
Gerrit-Change-Number: 21448
Gerrit-PatchSet: 7
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmocore[master]: logging: Assing different 8bit colors to built-in subsystems
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21599 ) Change subject: logging: Assing different 8bit colors to built-in subsystems .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8c0f91a61fbca0441faf66b3f368f45f886187c Gerrit-Change-Number: 21599 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:15:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: make raise/lower step limitation configurable
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21568 ) Change subject: power_control: make raise/lower step limitation configurable .. Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/21568/1/include/osmo-bts/bts.h File include/osmo-bts/bts.h: https://gerrit.osmocom.org/c/osmo-bts/+/21568/1/include/osmo-bts/bts.h@110 PS1, Line 110: as maximum > at maximum (also below) Done https://gerrit.osmocom.org/c/osmo-bts/+/21568/1/include/osmo-bts/bts.h@111 PS1, Line 111: in > the variable name nor the comment really indicate it is about the _step_ > size. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98 Gerrit-Change-Number: 21568 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 12:14:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: make raise/lower step limitation configurable
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/21568 to look at the new patch set (#2). Change subject: power_control: make raise/lower step limitation configurable .. power_control: make raise/lower step limitation configurable Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98 Related: SYS#4918 --- M include/osmo-bts/bts.h M include/osmo-bts/power_control.h M src/common/bts.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok M tests/power/ms_power_loop_test.c 8 files changed, 64 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/21568/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98 Gerrit-Change-Number: 21568 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: rsl: properly initialize MS/BS Power Control state
Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/21448 to look at the new patch set (#7). Change subject: rsl: properly initialize MS/BS Power Control state .. rsl: properly initialize MS/BS Power Control state struct lchan_power_ctrl_state actually contains more fields, which also must be initialized on CHANnel ACTIVation. Change-Id: Id9719088fc6e9479c13e9b327a3466d9e2810a3a Related: SYS#4918 --- M src/common/rsl.c 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/21448/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9719088fc6e9479c13e9b327a3466d9e2810a3a Gerrit-Change-Number: 21448 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: log passed tests
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21509 ) Change subject: log passed tests .. Patch Set 3: it first lists the failures, then the passes -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib85a5b90e267c2ed2f844691187ecadc8939b1bb Gerrit-Change-Number: 21509 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 12:02:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib: Disable libmnl dependency cross-compiling osmo-bts
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603 )
Change subject: contrib: Disable libmnl dependency cross-compiling osmo-bts
..
contrib: Disable libmnl dependency cross-compiling osmo-bts
Only newest OE SDKs have libmnl added, but we don't need this feature
anyway, so let's disable it in order to get builds running fine again.
Change-Id: Ief9cbca6e10b1ed6acf6e079f660fc3f7c863c7b
---
M contrib/jenkins-build-osmo-bts-oc2g.sh
M contrib/jenkins-build-osmo-bts-sysmo.sh
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh
b/contrib/jenkins-build-osmo-bts-oc2g.sh
index 9a02ab0..41eac19 100755
--- a/contrib/jenkins-build-osmo-bts-oc2g.sh
+++ b/contrib/jenkins-build-osmo-bts-oc2g.sh
@@ -24,7 +24,7 @@
git_url="${prev_git_url}"
L1_OC2G_HEADERS="$PWD/oc2g-fw/inc"
-build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls
--disable-detect-tls-gcc-arm-bug
+build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen
--disable-gnutls --disable-detect-tls-gcc-arm-bug
build_repo libosmo-abis --disable-dahdi
build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g
--with-oc2g="$L1_OC2G_HEADERS"
diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh
b/contrib/jenkins-build-osmo-bts-sysmo.sh
index fc528d3..731867f 100755
--- a/contrib/jenkins-build-osmo-bts-sysmo.sh
+++ b/contrib/jenkins-build-osmo-bts-sysmo.sh
@@ -18,7 +18,7 @@
prefix_real="$DESTDIR$prefix"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls
--disable-detect-tls-gcc-arm-bug
+build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen
--disable-gnutls --disable-detect-tls-gcc-arm-bug
build_repo libosmo-abis --disable-dahdi
build_repo osmo-bts --enable-sysmocom-bts
--with-openbsc=$base/openbsc/openbsc/include
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ief9cbca6e10b1ed6acf6e079f660fc3f7c863c7b
Gerrit-Change-Number: 21603
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: contrib: Disable libmnl dependency cross-compiling osmo-bts
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603 ) Change subject: contrib: Disable libmnl dependency cross-compiling osmo-bts .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ief9cbca6e10b1ed6acf6e079f660fc3f7c863c7b Gerrit-Change-Number: 21603 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 11:02:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib: Disable libmnl dependency cross-compiling osmo-bts
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603 )
Change subject: contrib: Disable libmnl dependency cross-compiling osmo-bts
..
contrib: Disable libmnl dependency cross-compiling osmo-bts
Only newest OE SDKs have libmnl added, but we don't need this feature
anyway, so let's disable it in order to get builds running fine again.
Change-Id: Ief9cbca6e10b1ed6acf6e079f660fc3f7c863c7b
---
M contrib/jenkins-build-osmo-bts-oc2g.sh
M contrib/jenkins-build-osmo-bts-sysmo.sh
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/03/21603/1
diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh
b/contrib/jenkins-build-osmo-bts-oc2g.sh
index 9a02ab0..41eac19 100755
--- a/contrib/jenkins-build-osmo-bts-oc2g.sh
+++ b/contrib/jenkins-build-osmo-bts-oc2g.sh
@@ -24,7 +24,7 @@
git_url="${prev_git_url}"
L1_OC2G_HEADERS="$PWD/oc2g-fw/inc"
-build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls
--disable-detect-tls-gcc-arm-bug
+build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen
--disable-gnutls --disable-detect-tls-gcc-arm-bug
build_repo libosmo-abis --disable-dahdi
build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g
--with-oc2g="$L1_OC2G_HEADERS"
diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh
b/contrib/jenkins-build-osmo-bts-sysmo.sh
index fc528d3..731867f 100755
--- a/contrib/jenkins-build-osmo-bts-sysmo.sh
+++ b/contrib/jenkins-build-osmo-bts-sysmo.sh
@@ -18,7 +18,7 @@
prefix_real="$DESTDIR$prefix"
. "$(dirname "$0")/jenkins-build-common.sh"
-build_repo libosmocore --disable-pcsc --disable-doxygen --disable-gnutls
--disable-detect-tls-gcc-arm-bug
+build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen
--disable-gnutls --disable-detect-tls-gcc-arm-bug
build_repo libosmo-abis --disable-dahdi
build_repo osmo-bts --enable-sysmocom-bts
--with-openbsc=$base/openbsc/openbsc/include
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21603
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ief9cbca6e10b1ed6acf6e079f660fc3f7c863c7b
Gerrit-Change-Number: 21603
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/libosmocore/+/21598/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/21598/3//COMMIT_MSG@18 PS3, Line 18: bssgp_bvc_fsm.c is a genric implementation of the BSSGP BVC generic https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c File src/gb/bssgp_bvc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@4 PS3, Line 4: /* FIXME: This should probably be moved to libosmogb? */ it's already inlibosmogb right? https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@70 PS3, Line 70: uint32_t advertised; not important, but these can really be uint16_t then. https://gerrit.osmocom.org/c/libosmocore/+/21598/3/src/gb/bssgp_bvc_fsm.c@283 PS3, Line 283: osmo_fsm_inst_state_chg(fi, BSSGP_BVCFSM_S_UNBLOCKED, T1_SECS, T1); Not required, but you probably want to move to using osmo_tdef structures and FSM APIs at some point, so that timers are hooked transparently to state changes. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 10:58:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-trx[master]: ipc-driver-test: Allow setting dir prefix for UD socket
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/21594 ) Change subject: ipc-driver-test: Allow setting dir prefix for UD socket .. Patch Set 1: Do we still need the socket number? Why not just go for the full path instead? I only did the sock number because I was lazy and it was pretty much my own arcane debug tool, not used by anyone else... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/21594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I35282b38a1d560fb3440fe0aa9a27808d9d116cc Gerrit-Change-Number: 21594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 10:30:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Assing different 8bit colors to built-in subsystems
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21599 ) Change subject: logging: Assing different 8bit colors to built-in subsystems .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8c0f91a61fbca0441faf66b3f368f45f886187c Gerrit-Change-Number: 21599 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 09:50:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: resurrect per-lchan BS/MS Power Control information
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21481 ) Change subject: vty: resurrect per-lchan BS/MS Power Control information .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21481 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I48812383ef0a125e83b9b3761f3f15873d3b37b4 Gerrit-Change-Number: 21481 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 08 Dec 2020 09:46:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: properly initialize MS/BS Power Control state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21448 ) Change subject: rsl: properly initialize MS/BS Power Control state .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9719088fc6e9479c13e9b327a3466d9e2810a3a Gerrit-Change-Number: 21448 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 08 Dec 2020 09:46:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: clarify units in 'struct lchan_power_ctrl_state'
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21500 )
Change subject: power_control: clarify units in 'struct lchan_power_ctrl_state'
..
power_control: clarify units in 'struct lchan_power_ctrl_state'
Change-Id: I934f2d1e1064eed7587bc5693ef981bf449a1b81
Related: SYS#4918
---
M include/osmo-bts/gsm_data.h
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 6af96fe..fdd5ba3 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -161,6 +161,9 @@
uint32_t fn;
};
+/* Depending on the context (MS or BS power control), fields 'current' and
'max'
+ * reflect either the MS power level (magic numbers), or BS Power reduction
level
+ * (attenuation, in dB). Field 'avg100_rxlev_dbm' is always in dBm. */
struct lchan_power_ctrl_state {
uint8_t current;
uint8_t max;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21500
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I934f2d1e1064eed7587bc5693ef981bf449a1b81
Gerrit-Change-Number: 21500
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: power_control: clarify units in 'struct bts_power_ctrl_params'
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21499 )
Change subject: power_control: clarify units in 'struct bts_power_ctrl_params'
..
power_control: clarify units in 'struct bts_power_ctrl_params'
Change-Id: Icb059ca1f555397be116a424800e4536883b9106
Related: SYS#4918
---
M include/osmo-bts/bts.h
M src/common/bts.c
M src/common/power_control.c
M src/common/vty.c
M src/osmo-bts-lc15/oml.c
M src/osmo-bts-oc2g/oml.c
M src/osmo-bts-sysmo/oml.c
M src/osmo-bts-sysmo/sysmobts_vty.c
M src/osmo-bts-trx/trx_vty.c
M tests/power/bs_power_loop_test.c
M tests/power/ms_power_loop_test.c
11 files changed, 42 insertions(+), 42 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index 3847a26..48f404c 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -104,9 +104,9 @@
/* UL/DL power control parameters */
struct bts_power_ctrl_params {
/* Target value to strive to */
- int target;
+ int target_dbm;
/* Tolerated deviation from target */
- int hysteresis;
+ int hysteresis_db;
/* RxLev filtering algorithm */
enum bts_pf_algo pf_algo;
/* (Optional) filtering parameters */
diff --git a/src/common/bts.c b/src/common/bts.c
index a974b9f..e021864 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -332,8 +332,8 @@
/* Default UL/DL power control parameters */
bts->ul_power_ctrl = bts->dl_power_ctrl = \
(struct bts_power_ctrl_params) {
- .target = -75, /* dBm default */
- .hysteresis = 3,/* -78 .. -72 dBm */
+ .target_dbm = -75,
+ .hysteresis_db = 3, /* -78 .. -72 dBm */
.pf_algo = BTS_PF_ALGO_EWMA,
.pf = {
.ewma = {
diff --git a/src/common/power_control.c b/src/common/power_control.c
index a8bf031..d458a92 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -113,10 +113,10 @@
/* How many dBs measured power should be increased (+) or decreased (-)
* to reach expected power. */
- delta = params->target - rxlev_dbm_avg;
+ delta = params->target_dbm - rxlev_dbm_avg;
/* Tolerate small deviations from 'rx-target' */
- if (abs(delta) <= params->hysteresis)
+ if (abs(delta) <= params->hysteresis_db)
return 0;
/* Don't ever change more than PWR_{LOWER,RAISE}_MAX_DBM during one loop
@@ -192,7 +192,7 @@
LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control
level %d, %d dBm "
"(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8
", rx-current %d dBm, rx-target %d dBm)\n",
new_power_lvl, new_dbm, ms_power_lvl, state->max,
- ul_rssi_dbm, params->target);
+ ul_rssi_dbm, params->target_dbm);
return 0;
}
@@ -201,7 +201,7 @@
"(rx-ms-pwr-lvl %" PRIu8 ", max-ms-pwr-lvl %" PRIu8 ",
rx-current %d dBm, rx-target %d dBm)\n",
(new_dbm > current_dbm) ? "Raising" : "Lowering",
state->current, current_dbm, new_power_lvl, new_dbm,
- ms_power_lvl, state->max, ul_rssi_dbm, params->target);
+ ms_power_lvl, state->max, ul_rssi_dbm, params->target_dbm);
/* store the resulting new MS power level in the lchan */
state->current = new_power_lvl;
@@ -301,13 +301,13 @@
if (state->current != new) {
LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Changing Downlink
attenuation: "
"%u -> %u dB (maximum %u dB, target %d dBm, delta %d
dB)\n",
- state->current, new, state->max, params->target,
delta);
+ state->current, new, state->max, params->target_dbm,
delta);
state->current = new;
return 1;
} else {
LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping Downlink
attenuation "
"at %u dB (maximum %u dB, target %d dBm, delta %d
dB)\n",
- state->current, state->max, params->target, delta);
+ state->current, state->max, params->target_dbm,
delta);
return 0;
}
}
diff --git a/src/common/vty.c b/src/common/vty.c
index 5d21e58..bbb0ba1 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -255,9 +255,9 @@
VTY_NEWLINE);
vty_out(vty, " paging lifetime %u%s",
paging_get_lifetime(bts->paging_state),
VTY_NEWLINE);
- vty_out(vty, " uplink-power-target %d", bts->ul_power_ctrl.target);
- if (bts->ul_power_ctrl.hysteresis > 0)
- vty_out(vty, "
Change in osmo-bts[master]: power_control: cosmetic: fix weird spacing
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21480 )
Change subject: power_control: cosmetic: fix weird spacing
..
power_control: cosmetic: fix weird spacing
Change-Id: Ia5661e82372f958e7cda4041d7b5a1cfb1d64afe
---
M src/common/power_control.c
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/common/power_control.c b/src/common/power_control.c
index 4c4e283..a8bf031 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -130,11 +130,11 @@
return delta;
}
- /*! compute the new MS POWER LEVEL communicated to the MS and store it in
lchan.
- * \param lchan logical channel for which to compute (and in which to store)
new power value.
- * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH
Header in SACCH block.
- * \param[in] ul_rssi_dbm Signal level of the received SACCH block, in dBm.
- */
+/*! compute the new MS POWER LEVEL communicated to the MS and store it in
lchan.
+ * \param lchan logical channel for which to compute (and in which to store)
new power value.
+ * \param[in] ms_power_lvl MS Power Level received from Uplink L1 SACCH
Header in SACCH block.
+ * \param[in] ul_rssi_dbm Signal level of the received SACCH block, in dBm.
+ */
int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
const uint8_t ms_power_lvl,
const int8_t ul_rssi_dbm)
@@ -210,10 +210,10 @@
return 1;
}
- /*! compute the new Downlink attenuation value for the given logical channel.
- * \param lchan logical channel for which to compute (and in which to store)
new power value.
- * \param[in] gh pointer to the beginning of (presumably) a Measurement
Report.
- */
+/*! compute the new Downlink attenuation value for the given logical channel.
+ * \param lchan logical channel for which to compute (and in which to store)
new power value.
+ * \param[in] gh pointer to the beginning of (presumably) a Measurement
Report.
+ */
int lchan_bs_pwr_ctrl(struct gsm_lchan *lchan,
const struct gsm48_hdr *gh)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21480
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ia5661e82372f958e7cda4041d7b5a1cfb1d64afe
Gerrit-Change-Number: 21480
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
