From admin at opensuse.org Tue May 1 04:42:21 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 01 May 2018 04:42:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ae7f032ca929_2a6a1262680984988@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 19s] [63/70] preinstalling libmount1... [ 19s] [64/70] preinstalling bash... [ 19s] [65/70] preinstalling mount... [ 20s] [66/70] preinstalling util-linux... [ 20s] [67/70] preinstalling sysvinit-utils... [ 20s] [68/70] preinstalling e2fsprogs... [ 20s] [69/70] preinstalling sysv-rc... [ 20s] [70/70] preinstalling initscripts... [ 21s] [ 21s] [1/1] preinstalling libdevmapper1.02.1... [ 22s] copying packages... [ 30s] reordering...cycle: libc6 -> libgcc1 [ 30s] breaking dependency libgcc1 -> libc6 [ 30s] cycle: debhelper -> dh-autoreconf [ 30s] breaking dependency debhelper -> dh-autoreconf [ 30s] cycle: debhelper -> dh-strip-nondeterminism [ 30s] breaking dependency debhelper -> dh-strip-nondeterminism [ 30s] done [ 30s] objdump: /boot/Image.guest32: File format not recognized [ 31s] booting kvm... [ 31s] linux64 /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host,aarch64=off -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/initvm.aarch64 -m 9216 -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_11/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 31s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_11/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 31s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_11/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [28834s] qemu-system-aarch64: terminating on signal 15 from pid 31626 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28834s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28834s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 1 08:54:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 1 May 2018 08:54:55 +0000 Subject: osmo-ttcn3-hacks[master]: sgsn: test umts aka with gsm sres response In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/7956/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: Line 329: ws -- To view, visit https://gerrit.osmocom.org/7956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: Yes From jenkins at lists.osmocom.org Tue May 1 10:51:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 1 May 2018 10:51:25 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#18?= In-Reply-To: <1873838043.191.1525128080590.JavaMail.jenkins@jenkins.osmocom.org> References: <1873838043.191.1525128080590.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <247476253.243.1525171885538.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [steve] change version to 0.6git ------------------------------------------ [...truncated 93.17 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-3674/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-3674/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-3674/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-3674/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-3674/ libtool: install: (cd /tmp/am-dc-3674/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-3674/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-3674/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-3674/ libtool: install: chmod 644 /tmp/am-dc-3674/ libtool: install: ranlib /tmp/am-dc-3674/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-3674/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-3674/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-3674/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-3674/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-3674/ /bin/mkdir -p '/tmp/am-dc-3674/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-3674/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-3674/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-3674/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-3674/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-3674/ libtool: uninstall: rm -f /tmp/am-dc-3674/ /tmp/am-dc-3674/ /tmp/am-dc-3674/ /tmp/am-dc-3674/ /tmp/am-dc-3674/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-3674/ && rm -f html.tar ) ( cd '/tmp/am-dc-3674/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-3674/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Tue May 1 12:16:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 1 May 2018 12:16:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#19?= In-Reply-To: <247476253.243.1525171885538.JavaMail.jenkins@jenkins.osmocom.org> References: <247476253.243.1525171885538.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1314108287.247.1525176986242.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [steve] Fix build with MinGW ------------------------------------------ [...truncated 93.07 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20820/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-20820/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-20820/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-20820/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-20820/ libtool: install: (cd /tmp/am-dc-20820/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-20820/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-20820/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-20820/ libtool: install: chmod 644 /tmp/am-dc-20820/ libtool: install: ranlib /tmp/am-dc-20820/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-20820/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-20820/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-20820/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20820/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-20820/ /bin/mkdir -p '/tmp/am-dc-20820/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-20820/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-20820/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-20820/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-20820/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-20820/ libtool: uninstall: rm -f /tmp/am-dc-20820/ /tmp/am-dc-20820/ /tmp/am-dc-20820/ /tmp/am-dc-20820/ /tmp/am-dc-20820/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-20820/ && rm -f html.tar ) ( cd '/tmp/am-dc-20820/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-20820/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Tue May 1 13:16:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 1 May 2018 13:16:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#20?= In-Reply-To: <1314108287.247.1525176986242.JavaMail.jenkins@jenkins.osmocom.org> References: <1314108287.247.1525176986242.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <636193296.248.1525180586243.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [steve] lib: use USB zero-copy transfers if possible ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-28401/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-28401/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-28401/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-28401/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-28401/ libtool: install: (cd /tmp/am-dc-28401/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-28401/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-28401/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-28401/ libtool: install: chmod 644 /tmp/am-dc-28401/ libtool: install: ranlib /tmp/am-dc-28401/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-28401/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-28401/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-28401/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-28401/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-28401/ /bin/mkdir -p '/tmp/am-dc-28401/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-28401/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-28401/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-28401/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-28401/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-28401/ libtool: uninstall: rm -f /tmp/am-dc-28401/ /tmp/am-dc-28401/ /tmp/am-dc-28401/ /tmp/am-dc-28401/ /tmp/am-dc-28401/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-28401/ && rm -f html.tar ) ( cd '/tmp/am-dc-28401/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-28401/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Tue May 1 16:13:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 1 May 2018 16:13:29 +0000 Subject: [PATCH] libosmocore[master]: lapdm: Implement SABM related constraints Message-ID: Review at https://gerrit.osmocom.org/7960 lapdm: Implement SABM related constraints * MO SAPI0 establishment *must always* have L3 payload for contention resolution * SAPI3 establishment *must never* use contention resolution * MT establish must never use contention resolution Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Closes: OS#2370 --- M src/gsm/lapdm.c 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/7960/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 6a16012..0f2d071 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -48,6 +48,8 @@ #include #include +#define LAPD_U_SABM 0x7 + /* TS 04.06 Figure 4 / Section 3.2 */ #define LAPDm_LPD_NORMAL 0 #define LAPDm_LPD_SMSCB 1 @@ -535,6 +537,37 @@ return rc; } +/* determine if receiving a given LAPDm message is not permitted */ +static int lapdm_rx_not_permitted(const struct lapdm_entity *le, + const struct lapd_msg_ctx *lctx) +{ + if (le->mode == LAPDM_MODE_BTS) { + if (lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM) { + switch (lctx->sapi) { + case 0: + /* SAPI0 must use contention resolution, i.e. L3 payload + * must exist */ + if (lctx->length == 0) + return RLL_CAUSE_UFRM_INC_PARAM; + break; + case 3: + /* SAPI3 doesn't support contention resolution */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + break; + } + } + } else if (le->mode == LAPDM_MODE_MS) { + if (lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM) { + /* contention resolution (L3 present) is only sent by MS, but + * never received by it */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + } + } + return 0; +} + /* input into layer2 (from layer 1) */ static int l2_ph_data_ind(struct msgb *msg, struct lapdm_entity *le, uint8_t chan_nr, uint8_t link_id) @@ -672,6 +705,13 @@ } /* store context for messages from lapd */ memcpy(&mctx.dl->mctx, &mctx, sizeof(mctx.dl->mctx)); + rc =lapdm_rx_not_permitted(le, &lctx); + if (rc > 0) { + LOGP(DLLAPD, LOGL_NOTICE, "received message not permitted"); + msgb_free(msg); + rsl_rll_error(rc, &mctx); + return -EINVAL; + } /* send to LAPD */ rc = lapd_ph_data_ind(msg, &lctx); break; -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Tue May 1 17:06:50 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 1 May 2018 17:06:50 +0000 Subject: libosmocore[master]: lapdm: Implement SABM related constraints In-Reply-To: References: Message-ID: Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/7960/1/src/gsm/lapdm.c File src/gsm/lapdm.c: Line 545: if (lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM) { May we unpack this condition in the following way: if (lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM) { if (le->mode == LAPDM_MODE_BTS) { // ... } else if (le->mode == LAPDM_MODE_MS) { // ... } } Line 708: rc =lapdm_rx_not_permitted(le, &lctx); 's/ =/ = /' -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 1 22:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 1 May 2018 22:16:40 +0000 Subject: osmo-ttcn3-hacks[master]: sgsn: test umts aka with gsm sres response In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 1 22:16:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 1 May 2018 22:16:59 +0000 Subject: osmo-sgsn[master]: auth+ciph: log is_r99 and auth types In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7957 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9679b7c174df186e05171a059a6b4d870a6f16e6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 1 22:17:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 1 May 2018 22:17:17 +0000 Subject: osmo-sgsn[master]: log two RA Update Request failure causes In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7958 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic9c8a492abf5a707b37d9c8888c59be6e51541b8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 1 22:18:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 1 May 2018 22:18:01 +0000 Subject: osmo-sgsn[master]: GERAN: allow GSM SRES on UMTS AKA challenge In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7959 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I36807bad3bc55c0030d4f09cb2c369714f24bec7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From jenkins at lists.osmocom.org Tue May 1 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 1 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#21?= In-Reply-To: <636193296.248.1525180586243.JavaMail.jenkins@jenkins.osmocom.org> References: <636193296.248.1525180586243.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1019174913.266.1525214480617.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-10365/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-10365/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-10365/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-10365/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-10365/ libtool: install: (cd /tmp/am-dc-10365/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-10365/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-10365/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-10365/ libtool: install: chmod 644 /tmp/am-dc-10365/ libtool: install: ranlib /tmp/am-dc-10365/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-10365/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-10365/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-10365/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-10365/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-10365/ /bin/mkdir -p '/tmp/am-dc-10365/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-10365/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-10365/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-10365/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-10365/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-10365/ libtool: uninstall: rm -f /tmp/am-dc-10365/ /tmp/am-dc-10365/ /tmp/am-dc-10365/ /tmp/am-dc-10365/ /tmp/am-dc-10365/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-10365/ && rm -f html.tar ) ( cd '/tmp/am-dc-10365/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-10365/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Wed May 2 04:03:08 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 02 May 2018 04:03:08 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5ae9388bd03c7_2a6a126268012721be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 20s] [63/70] preinstalling libmount1... [ 20s] [64/70] preinstalling bash... [ 20s] [65/70] preinstalling mount... [ 20s] [66/70] preinstalling util-linux... [ 21s] [67/70] preinstalling sysvinit-utils... [ 21s] [68/70] preinstalling e2fsprogs... [ 21s] [69/70] preinstalling sysv-rc... [ 21s] [70/70] preinstalling initscripts... [ 21s] [ 22s] [1/1] preinstalling libdevmapper1.02.1... [ 22s] copying packages... [ 28s] reordering...cycle: libc6 -> libgcc1 [ 28s] breaking dependency libgcc1 -> libc6 [ 28s] cycle: debhelper -> dh-autoreconf [ 28s] breaking dependency debhelper -> dh-autoreconf [ 28s] cycle: dh-strip-nondeterminism -> debhelper [ 28s] breaking dependency debhelper -> dh-strip-nondeterminism [ 28s] done [ 29s] objdump: /boot/Image.guest32: File format not recognized [ 29s] booting kvm... [ 29s] linux64 /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host,aarch64=off -M virt,gic-version=host -object rng-random,filename=/dev/random,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -mem-prealloc -mem-path /dev/hugepages -net none -kernel /boot/Image.guest32 -initrd /boot/initrd.guest32 -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/initvm.aarch64 -m 9216 -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_8/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 8 [ 30s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_8/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 30s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_8/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28832s] qemu-system-aarch64: terminating on signal 15 from pid 62281 () [28832s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28832s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed May 2 09:15:33 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:15:33 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: sgsn: test umts aka with gsm sres response In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7956 to look at the new patch set (#2). sgsn: test umts aka with gsm sres response Add ability to test UMTS AKA, by f_gmm_attach() with flags to select UMTS AKA and to respond to it with GSM AKA SRES. Add TC_attach_umts_aka_umts_res and TC_attach_umts_aka_gsm_sres. Change existing TC_attach_* to also call f_gmm_attach(). (Actually, f_gmm_attach() is almost exactly the previous TC_attach function body.) osmo-sgsn change I36807bad3bc55c0030d4f09cb2c369714f24bec7 will implement proper handling of GSM AKA response and make TC_attach_umts_aka_gsm_sres pass. Related: OS#3193 OS#3224 Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a --- M library/L3_Common.ttcn M sgsn/SGSN_Tests.ttcn M sgsn/expected-results.xml 3 files changed, 114 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/7956/2 diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn index 5b36056..2b39621 100644 --- a/library/L3_Common.ttcn +++ b/library/L3_Common.ttcn @@ -7,8 +7,11 @@ type record AuthVector { OCT16 rand, OCT4 sres, - OCT8 kc - /* FIXME: 3G elements */ + OCT8 kc, + OCT16 ik, + OCT16 ck, + OCT16 autn, + OCT8 res } private function f_rnd_oct(integer len) return octetstring { @@ -28,6 +31,15 @@ return vec; } +function f_gen_auth_vec_3g() return AuthVector { + var AuthVector vec := f_gen_auth_vec_2g(); + vec.ik := f_rnd_oct(16); + vec.ck := f_rnd_oct(16); + vec.autn := f_rnd_oct(16); + vec.res := f_rnd_oct(8); + return vec; +} + /* 3GPP TS 23.003 2.6 */ type enumerated TlliType { TLLI_LOCAL, diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 79aa166..912a507 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -35,6 +35,8 @@ import from GSM_RR_Types all; +import from MobileL3_MM_Types all; + modulepar { /* IP/port on which we run our internal GSUP/HLR emulation */ @@ -286,23 +288,65 @@ } } -/* perform GMM authentication (if expected) */ -function f_gmm_auth () runs on BSSGP_ConnHdlr { +/* perform GMM authentication (if expected). + * Note, for umts_aka_challenge to work, the revisionLevelIndicatior needs to + * be 1 to mark R99 capability, in the GMM Attach Request, see f_gmm_attach(). */ +function f_gmm_auth (boolean umts_aka_challenge := false, boolean force_gsm_sres := false) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; var PDU_L3_MS_SGSN l3_mo; var PDU_L3_SGSN_MS l3_mt; var default di := activate(as_mm_identity()); if (g_pars.net.expect_auth) { - g_pars.vec := f_gen_auth_vec_2g(); - var GSUP_IE auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc)); + var GSUP_IE auth_tuple; + var template AuthenticationParameterAUTNTLV autn; + + if (umts_aka_challenge) { + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + log("GSUP sends 2G and 3G auth tuples", auth_tuple); + } else { + g_pars.vec := f_gen_auth_vec_2g(); + autn := omit; + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc)); + log("GSUP sends only 2G auth tuple", auth_tuple); + } GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_AUTH_REQ(g_pars.vec.rand))) -> value bd; + + var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP.receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; l3_mt := bd.l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; - l3_mo := valueof(ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres)); + var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + + if (umts_aka_challenge and not force_gsm_sres) { + /* set UMTS response instead */ + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationParResp := { + valueField := substr(g_pars.vec.res, 0, 4) + }; + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationRespParExt := { + elementIdentifier := '21'O, + lengthIndicator := lengthof(g_pars.vec.res) - 4, + valueField := substr(g_pars.vec.res, 4, lengthof(g_pars.vec.res) - 4) + }; + } + + l3_mo := valueof(auth_ciph_resp); if (ispresent(l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest) and l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest.valueField == '001'B) { l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := @@ -402,12 +446,20 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); } -private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { +private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); + var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); - f_gmm_auth(); + /* indicate R99 capability of the MS to enable UMTS AKA in presence of + * 3G auth vectors */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.revisionLevelIndicatior := '1'B; + /* The thing is, if the solSACapability is 'omit', then the + * revisionLevelIndicatior is at the wrong place! */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; + + BSSGP.send(attach_req); + f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -416,6 +468,10 @@ } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ BSSGP.send(ts_GMM_ATTACH_COMPL); +} + +private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(false, false); setverdict(pass); } @@ -432,6 +488,30 @@ f_init('023042'H); f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1001); + vc_conn.done; +} + +private function f_TC_attach_umts_aka_umts_res(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(true, false); + setverdict(pass); +} +testcase TC_attach_umts_aka_umts_res() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb[0], 1002); + vc_conn.done; +} + +private function f_TC_attach_umts_aka_gsm_sres(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(true, true); + setverdict(pass); +} +testcase TC_attach_umts_aka_gsm_sres() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb[0], 1003); vc_conn.done; } @@ -1153,6 +1233,8 @@ control { execute( TC_attach() ); execute( TC_attach_mnc3() ); + execute( TC_attach_umts_aka_umts_res() ); + execute( TC_attach_umts_aka_gsm_sres() ); execute( TC_attach_auth_id_timeout() ); execute( TC_attach_auth_sai_timeout() ); execute( TC_attach_auth_sai_reject() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 49ab60c..688e35e 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -2,6 +2,13 @@ + + + Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_umts_aka_gsm_sres testcase + + Tguard timeout -- To view, visit https://gerrit.osmocom.org/7956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Wed May 2 09:16:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:16:03 +0000 Subject: osmo-ttcn3-hacks[master]: sgsn: test umts aka with gsm sres response In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 Verified+1 (just fixed that ws) -- To view, visit https://gerrit.osmocom.org/7956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 09:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:16:07 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: sgsn: test umts aka with gsm sres response In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: sgsn: test umts aka with gsm sres response ...................................................................... sgsn: test umts aka with gsm sres response Add ability to test UMTS AKA, by f_gmm_attach() with flags to select UMTS AKA and to respond to it with GSM AKA SRES. Add TC_attach_umts_aka_umts_res and TC_attach_umts_aka_gsm_sres. Change existing TC_attach_* to also call f_gmm_attach(). (Actually, f_gmm_attach() is almost exactly the previous TC_attach function body.) osmo-sgsn change I36807bad3bc55c0030d4f09cb2c369714f24bec7 will implement proper handling of GSM AKA response and make TC_attach_umts_aka_gsm_sres pass. Related: OS#3193 OS#3224 Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a --- M library/L3_Common.ttcn M sgsn/SGSN_Tests.ttcn M sgsn/expected-results.xml 3 files changed, 114 insertions(+), 13 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/library/L3_Common.ttcn b/library/L3_Common.ttcn index 5b36056..2b39621 100644 --- a/library/L3_Common.ttcn +++ b/library/L3_Common.ttcn @@ -7,8 +7,11 @@ type record AuthVector { OCT16 rand, OCT4 sres, - OCT8 kc - /* FIXME: 3G elements */ + OCT8 kc, + OCT16 ik, + OCT16 ck, + OCT16 autn, + OCT8 res } private function f_rnd_oct(integer len) return octetstring { @@ -28,6 +31,15 @@ return vec; } +function f_gen_auth_vec_3g() return AuthVector { + var AuthVector vec := f_gen_auth_vec_2g(); + vec.ik := f_rnd_oct(16); + vec.ck := f_rnd_oct(16); + vec.autn := f_rnd_oct(16); + vec.res := f_rnd_oct(8); + return vec; +} + /* 3GPP TS 23.003 2.6 */ type enumerated TlliType { TLLI_LOCAL, diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 79aa166..912a507 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -35,6 +35,8 @@ import from GSM_RR_Types all; +import from MobileL3_MM_Types all; + modulepar { /* IP/port on which we run our internal GSUP/HLR emulation */ @@ -286,23 +288,65 @@ } } -/* perform GMM authentication (if expected) */ -function f_gmm_auth () runs on BSSGP_ConnHdlr { +/* perform GMM authentication (if expected). + * Note, for umts_aka_challenge to work, the revisionLevelIndicatior needs to + * be 1 to mark R99 capability, in the GMM Attach Request, see f_gmm_attach(). */ +function f_gmm_auth (boolean umts_aka_challenge := false, boolean force_gsm_sres := false) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; var PDU_L3_MS_SGSN l3_mo; var PDU_L3_SGSN_MS l3_mt; var default di := activate(as_mm_identity()); if (g_pars.net.expect_auth) { - g_pars.vec := f_gen_auth_vec_2g(); - var GSUP_IE auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, - g_pars.vec.sres, - g_pars.vec.kc)); + var GSUP_IE auth_tuple; + var template AuthenticationParameterAUTNTLV autn; + + if (umts_aka_challenge) { + g_pars.vec := f_gen_auth_vec_3g(); + autn := { + elementIdentifier := '28'O, + lengthIndicator := lengthof(g_pars.vec.autn), + autnValue := g_pars.vec.autn + }; + + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc, + g_pars.vec.ik, + g_pars.vec.ck, + g_pars.vec.autn, + g_pars.vec.res)); + log("GSUP sends 2G and 3G auth tuples", auth_tuple); + } else { + g_pars.vec := f_gen_auth_vec_2g(); + autn := omit; + auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand, + g_pars.vec.sres, + g_pars.vec.kc)); + log("GSUP sends only 2G auth tuple", auth_tuple); + } GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple)); - BSSGP.receive(tr_BD_L3_MT(tr_GMM_AUTH_REQ(g_pars.vec.rand))) -> value bd; + + var template PDU_L3_SGSN_MS auth_ciph_req := tr_GMM_AUTH_REQ(g_pars.vec.rand); + auth_ciph_req.msgs.gprs_mm.authenticationAndCipheringRequest.authenticationParameterAUTN := autn; + BSSGP.receive(tr_BD_L3_MT(auth_ciph_req)) -> value bd; l3_mt := bd.l3_mt; var BIT4 ac_ref := l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.acReferenceNumber.valueField; - l3_mo := valueof(ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres)); + var template PDU_L3_MS_SGSN auth_ciph_resp := ts_GMM_AUTH_RESP_2G(ac_ref, g_pars.vec.sres); + + if (umts_aka_challenge and not force_gsm_sres) { + /* set UMTS response instead */ + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationParResp := { + valueField := substr(g_pars.vec.res, 0, 4) + }; + auth_ciph_resp.msgs.gprs_mm.authenticationAndCipheringResponse.authenticationRespParExt := { + elementIdentifier := '21'O, + lengthIndicator := lengthof(g_pars.vec.res) - 4, + valueField := substr(g_pars.vec.res, 4, lengthof(g_pars.vec.res) - 4) + }; + } + + l3_mo := valueof(auth_ciph_resp); if (ispresent(l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest) and l3_mt.msgs.gprs_mm.authenticationAndCipheringRequest.imeisvRequest.valueField == '001'B) { l3_mo.msgs.gprs_mm.authenticationAndCipheringResponse.imeisv := @@ -402,12 +446,20 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); } -private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { +private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres) runs on BSSGP_ConnHdlr { var BssgpDecoded bd; var RoutingAreaIdentificationV old_ra := f_random_RAI(); + var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit); - BSSGP.send(ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit)); - f_gmm_auth(); + /* indicate R99 capability of the MS to enable UMTS AKA in presence of + * 3G auth vectors */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.revisionLevelIndicatior := '1'B; + /* The thing is, if the solSACapability is 'omit', then the + * revisionLevelIndicatior is at the wrong place! */ + attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B; + + BSSGP.send(attach_req); + f_gmm_auth(umts_aka_challenge, force_gsm_sres); /* Expect MSC to perform LU with HLR */ f_gmm_gsup_lu_isd(); @@ -416,6 +468,10 @@ } /* FIXME: Extract P-TMSI, if any. Only send Complete if necessary */ BSSGP.send(ts_GMM_ATTACH_COMPL); +} + +private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(false, false); setverdict(pass); } @@ -432,6 +488,30 @@ f_init('023042'H); f_sleep(1.0); vc_conn := f_start_handler(refers(f_TC_attach), testcasename(), g_gb[0], 1001); + vc_conn.done; +} + +private function f_TC_attach_umts_aka_umts_res(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(true, false); + setverdict(pass); +} +testcase TC_attach_umts_aka_umts_res() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_umts_res), testcasename(), g_gb[0], 1002); + vc_conn.done; +} + +private function f_TC_attach_umts_aka_gsm_sres(charstring id) runs on BSSGP_ConnHdlr { + f_gmm_attach(true, true); + setverdict(pass); +} +testcase TC_attach_umts_aka_gsm_sres() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_attach_umts_aka_gsm_sres), testcasename(), g_gb[0], 1003); vc_conn.done; } @@ -1153,6 +1233,8 @@ control { execute( TC_attach() ); execute( TC_attach_mnc3() ); + execute( TC_attach_umts_aka_umts_res() ); + execute( TC_attach_umts_aka_gsm_sres() ); execute( TC_attach_auth_id_timeout() ); execute( TC_attach_auth_sai_timeout() ); execute( TC_attach_auth_sai_reject() ); diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 49ab60c..688e35e 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -2,6 +2,13 @@ + + + Tguard timeout + SGSN_Tests.ttcn:MASKED SGSN_Tests control part + SGSN_Tests.ttcn:MASKED TC_attach_umts_aka_gsm_sres testcase + + Tguard timeout -- To view, visit https://gerrit.osmocom.org/7956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I201ffeaee4439a413ab8289aceeccca9aba40a7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Wed May 2 09:20:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:20:14 +0000 Subject: osmo-sgsn[master]: log two RA Update Request failure causes In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/7958/1/src/gprs/gprs_gmm.c File src/gprs/gprs_gmm.c: Line 1711: LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); there's a LOGMMCTXP just above this, but it's actually in an "if (!mmctx)" -- both of them will actually fail to log actual context. -- To view, visit https://gerrit.osmocom.org/7958 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic9c8a492abf5a707b37d9c8888c59be6e51541b8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 09:23:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:23:03 +0000 Subject: [MERGED] osmo-sgsn[master]: log two RA Update Request failure causes In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: log two RA Update Request failure causes ...................................................................... log two RA Update Request failure causes Change-Id: Ic9c8a492abf5a707b37d9c8888c59be6e51541b8 --- M src/gprs/gprs_gmm.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 275cdbc..642c738 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1616,6 +1616,9 @@ /* MS Radio Access Capability 10.5.5.12a */ ms_ra_acc_cap_len = *cur++; if (ms_ra_acc_cap_len > 52) { + LOGP(DMM, LOGL_ERROR, + "Rejecting GMM RA Update Request: MS Radio Access Capability too long" + " (ms_ra_acc_cap_len = %u > 52)\n", ms_ra_acc_cap_len); reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; goto rejected; } @@ -1668,6 +1671,7 @@ mmctx = sgsn_mm_ctx_by_ptmsi(tmsi); } #else + LOGP(DMM, LOGL_ERROR, "Rejecting GMM RA Update Request: No Iu support\n"); goto rejected; #endif } @@ -1704,6 +1708,7 @@ /* The MS has to perform GPRS attach */ /* Device is still IMSI attached for CS but initiate GPRS ATTACH, * see GSM 04.08, 4.7.5.1.4 and G.6 */ + LOGMMCTXP(LOGL_ERROR, mmctx, "Rejecting GMM RA Update Request: MS should GMM Attach first\n"); reject_cause = GMM_CAUSE_IMPL_DETACHED; goto rejected; } -- To view, visit https://gerrit.osmocom.org/7958 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9c8a492abf5a707b37d9c8888c59be6e51541b8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 09:23:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:23:04 +0000 Subject: [MERGED] osmo-sgsn[master]: GERAN: allow GSM SRES on UMTS AKA challenge In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: GERAN: allow GSM SRES on UMTS AKA challenge ...................................................................... GERAN: allow GSM SRES on UMTS AKA challenge Store the established security context type (GSM or UMTS) instead of the boolean flag is_authenticated. Provide the previous boolean query with thin sgsn_mm_ctx_is_authenticated() function. Knowing which security context was established will be necessary for OS#3224, i.e. using the proper ciphering key, which is not yet tested properly, and probably not correct at this stage. This change will make new SGSN_Tests.TC_attach_umts_aka_gsm_sres pass. Related: OS#3193 OS#3224 Change-Id: I36807bad3bc55c0030d4f09cb2c369714f24bec7 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/gprs_gmm.c M src/gprs/sgsn_auth.c M tests/sgsn/sgsn_test.c 4 files changed, 34 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index c47fb09..64e5619 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -224,7 +224,7 @@ * whether one of them can be dropped. */ enum sgsn_auth_state auth_state; - int is_authenticated; + enum osmo_sub_auth_type sec_ctx; /* the string representation of the current hlr */ char hlr[GSM_EXTENSION_LENGTH]; @@ -235,6 +235,17 @@ struct gprs_subscr *subscr; }; +static inline bool sgsn_mm_ctx_is_authenticated(struct sgsn_mm_ctx *ctx) +{ + switch (ctx->sec_ctx) { + case OSMO_AUTH_TYPE_GSM: + case OSMO_AUTH_TYPE_UMTS: + return true; + default: + return false; + } +} + #define LOGMMCTXP(level, mm, fmt, args...) \ LOGP(DMM, level, "MM(%s/%08x) " fmt, (mm) ? (mm)->imsi : "---", \ (mm) ? (mm)->p_tmsi : GSM_RESERVED_TMSI, ## args) diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 642c738..28fba71 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -662,24 +662,24 @@ } /* check if the received authentication response matches */ -static bool check_auth_resp(struct sgsn_mm_ctx *ctx, - bool is_utran, - const struct osmo_auth_vector *vec, - const uint8_t *res, uint8_t res_len) +static enum osmo_sub_auth_type check_auth_resp(struct sgsn_mm_ctx *ctx, + bool is_utran, + const struct osmo_auth_vector *vec, + const uint8_t *res, uint8_t res_len) { const uint8_t *expect_res; uint8_t expect_res_len; enum osmo_sub_auth_type expect_type; const char *expect_str; - if (!vec) - return true; /* really!? */ - /* On UTRAN (3G) we always expect UMTS AKA. On GERAN (2G) we sent AUTN * and expect UMTS AKA if there is R99 capability and our vector - * supports UMTS AKA, otherwise we expect GSM AKA. */ + * supports UMTS AKA, otherwise we expect GSM AKA. + * However, on GERAN, even if we sent a UMTS AKA Authentication Request, the MS may decide to + * instead reply with a GSM AKA SRES response. */ if (is_utran - || (mmctx_is_r99(ctx) && (vec->auth_types & OSMO_AUTH_TYPE_UMTS))) { + || (mmctx_is_r99(ctx) && (vec->auth_types & OSMO_AUTH_TYPE_UMTS) + && (res_len > sizeof(vec->sres)))) { expect_type = OSMO_AUTH_TYPE_UMTS; expect_str = "UMTS RES"; expect_res = vec->res; @@ -696,7 +696,7 @@ " not provide the expected auth type:" " expected %s = 0x%x, auth_types are 0x%x\n", expect_str, expect_type, vec->auth_types); - return false; + return OSMO_AUTH_TYPE_NONE; } if (!res) @@ -709,12 +709,12 @@ goto auth_mismatch; /* Authorized! */ - return true; + return expect_type; auth_mismatch: LOGMMCTXP(LOGL_ERROR, ctx, "Auth mismatch: expected %s = %s\n", expect_str, osmo_hexdump_nospc(expect_res, expect_res_len)); - return false; + return OSMO_AUTH_TYPE_NONE; } /* Section 9.4.10: Authentication and Ciphering Response */ @@ -778,14 +778,12 @@ LOGMMCTXP(LOGL_DEBUG, ctx, "checking auth: received %s = %s\n", res_name, osmo_hexdump(res, res_len)); - rc = check_auth_resp(ctx, false, &at->vec, res, res_len); - if (!rc) { + ctx->sec_ctx = check_auth_resp(ctx, false, &at->vec, res, res_len); + if (!sgsn_mm_ctx_is_authenticated(ctx)) { rc = gsm48_tx_gmm_auth_ciph_rej(ctx); mm_ctx_cleanup_free(ctx, "GPRS AUTH AND CIPH REJECT"); return rc; } - - ctx->is_authenticated = 1; if (ctx->ran_type == MM_CTX_T_UTRAN_Iu) ctx->iu.new_key = 1; @@ -1026,7 +1024,8 @@ return 0; } - if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE && !ctx->is_authenticated) { + if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE + && !sgsn_mm_ctx_is_authenticated(ctx)) { struct gsm_auth_tuple *at = &ctx->auth_triplet; mmctx_timer_start(ctx, 3360, sgsn->cfg.timers.T3360); @@ -1034,7 +1033,7 @@ false); } - if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE && ctx->is_authenticated && + if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE && sgsn_mm_ctx_is_authenticated(ctx) && ctx->auth_triplet.key_seq != GSM_KEY_SEQ_INVAL) { /* Check again for authorization */ sgsn_auth_request(ctx); @@ -1106,7 +1105,7 @@ void gsm0408_gprs_authenticate(struct sgsn_mm_ctx *ctx) { - ctx->is_authenticated = 0; + ctx->sec_ctx = OSMO_AUTH_TYPE_NONE; gsm48_gmm_authorize(ctx); } @@ -1420,7 +1419,7 @@ ctx->gb.tlli_new = gprs_tmsi2tlli(ctx->p_tmsi, TLLI_LOCAL); /* Inform LLC layer about new TLLI but keep old active */ - if (ctx->is_authenticated) + if (sgsn_mm_ctx_is_authenticated(ctx)) gprs_llme_copy_key(ctx, ctx->gb.llme); gprs_llgmm_assign(ctx->gb.llme, ctx->gb.tlli, ctx->gb.tlli_new); diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c index 6fb32b7..694bece 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/gprs/sgsn_auth.c @@ -114,7 +114,7 @@ return mmctx->auth_state; if (sgsn->cfg.require_authentication && - (!mmctx->is_authenticated || + (!sgsn_mm_ctx_is_authenticated(mmctx) || mmctx->subscr->sgsn_data->auth_triplets_updated)) return SGSN_AUTH_AUTHENTICATE; @@ -175,7 +175,7 @@ OSMO_ASSERT(mmctx->subscr != NULL); - if (sgsn->cfg.require_authentication && !mmctx->is_authenticated) { + if (sgsn->cfg.require_authentication && !sgsn_mm_ctx_is_authenticated(mmctx)) { /* Find next tuple */ at = sgsn_auth_get_tuple(mmctx, mmctx->auth_triplet.key_seq); diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index df4df3b..0e5267b 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1132,7 +1132,7 @@ { /* Fake an authentication */ OSMO_ASSERT(mmctx->subscr); - mmctx->is_authenticated = 1; + mmctx->sec_ctx = OSMO_AUTH_TYPE_GSM; gprs_subscr_update_auth_info(mmctx->subscr); return 0; -- To view, visit https://gerrit.osmocom.org/7959 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36807bad3bc55c0030d4f09cb2c369714f24bec7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 09:23:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:23:04 +0000 Subject: [MERGED] osmo-sgsn[master]: auth+ciph: log is_r99 and auth types In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: auth+ciph: log is_r99 and auth types ...................................................................... auth+ciph: log is_r99 and auth types Change-Id: I9679b7c174df186e05171a059a6b4d870a6f16e6 --- M src/gprs/gprs_gmm.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index ff993cc..275cdbc 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -587,8 +587,10 @@ uint8_t *m_rand, *m_cksn, rbyte; int rc; - LOGMMCTXP(LOGL_INFO, mm, "<- GPRS AUTH AND CIPHERING REQ (rand = %s", - osmo_hexdump(vec->rand, sizeof(vec->rand))); + LOGMMCTXP(LOGL_INFO, mm, "<- GPRS AUTH AND CIPHERING REQ (rand = %s," + " mmctx_is_r99=%d, vec->auth_types=0x%x", + osmo_hexdump(vec->rand, sizeof(vec->rand)), + mmctx_is_r99(mm), vec->auth_types); if (mmctx_is_r99(mm) && vec && (vec->auth_types & OSMO_AUTH_TYPE_UMTS)) { LOGPC(DMM, LOGL_INFO, ", autn = %s)\n", -- To view, visit https://gerrit.osmocom.org/7957 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9679b7c174df186e05171a059a6b4d870a6f16e6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 09:31:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 2 May 2018 09:31:00 +0000 Subject: osmo-bsc[master]: gscon: remove dead code In-Reply-To: References: Message-ID: Patch Set 2: > > just wondering whether these were stubs for a future development, > > like the inter-bsc ho states. What's RR Mode Modify for?? > > yes, that was most likely the case. At the moment this part is handled by gsm0808_assign_req() in bsc_api.c The decision if we remove this part or not depends on our plans to split up this any further and move more controlling into the GSCON FSM. -- To view, visit https://gerrit.osmocom.org/7839 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 09:36:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:36:53 +0000 Subject: docker-playground[master]: jenkins.sh: stay in the jenkins workspace, not in /tmp In-Reply-To: References: Message-ID: Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/7868 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e Gerrit-PatchSet: 2 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 09:37:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:37:01 +0000 Subject: [MERGED] docker-playground[master]: jenkins.sh: stay in the jenkins workspace, not in /tmp In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: jenkins.sh: stay in the jenkins workspace, not in /tmp ...................................................................... jenkins.sh: stay in the jenkins workspace, not in /tmp On jenkins, place all logs and manage docker volumes in the workspace instead of a /tmp/* dir. Use $WORKSPACE/logs as docker volume base to begin with, thus there needs to be no copy from /tmp to $WORKSPACE/logs. On non-jenkins runs, place all in a /tmp/* dir still, but also skip copying of the logs: just have a /tmp/logs symlink to the last tmpdir. Change-Id: I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e --- M jenkins-common.sh M sua-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh 3 files changed, 16 insertions(+), 13 deletions(-) Approvals: Neels Hofmeyr: Verified Harald Welte: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index 281807a..515479f 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -11,8 +11,7 @@ } collect_logs() { - cp -a "$VOL_BASE_DIR"/* "$WORKSPACE"/logs/ - cat "$WORKSPACE"/logs/*/junit-*.log || true + cat "$VOL_BASE_DIR"/*/junit-*.log || true } set -x @@ -22,9 +21,18 @@ REPO_USER=$USER fi -# non-jenkins execution: put logs in /tmp if [ "x$WORKSPACE" = "x" ]; then - WORKSPACE=/tmp + # non-jenkins execution: put logs in /tmp + VOL_BASE_DIR="$(mktemp -d)" + + # point /tmp/logs to the last ttcn3 run + rm /tmp/logs || true + ln -s "$VOL_BASE_DIR" /tmp/logs || true +else + # jenkins execution: put logs in workspace + VOL_BASE_DIR="$WORKSPACE/logs" + rm -rf "$VOL_BASE_DIR" + mkdir -p "$VOL_BASE_DIR" fi # non-jenkins execution: put logs in /tmp @@ -35,8 +43,3 @@ SUITE_NAME=`basename $PWD` NET_NAME=$SUITE_NAME - -VOL_BASE_DIR=`mktemp -d` - -rm -rf $WORKSPACE/logs || /bin/true -mkdir -p $WORKSPACE/logs diff --git a/sua-test/jenkins.sh b/sua-test/jenkins.sh index 7c1939e..0f87b4e 100755 --- a/sua-test/jenkins.sh +++ b/sua-test/jenkins.sh @@ -23,7 +23,7 @@ --network $NET_NAME --ip 172.18.6.3 \ -v $VOL_BASE_DIR/sua-tester:/data \ --name ${BUILD_TAG}-sua-test \ - $REPO_USER/sua-test > $WORKSPACE/logs/junit-xml-sua.log + $REPO_USER/sua-test > $VOL_BASE_DIR/junit-xml-sua.log docker container stop -t 1 ${BUILD_TAG}-stp diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index ac00642..530b4ee 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -43,9 +43,9 @@ -v bts-vol:/bts \ --name ${BUILD_TAG}-sysinfo-helper -d \ busybox /bin/sh -c 'sleep 1000 & wait' -docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $WORKSPACE/logs -docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $WORKSPACE/logs -docker cp ${BUILD_TAG}-sysinfo-helper:/bts $WORKSPACE/logs +docker cp ${BUILD_TAG}-sysinfo-helper:/ttcn3-nitb-sysinfo $VOL_BASE_DIR +docker cp ${BUILD_TAG}-sysinfo-helper:/nitb $VOL_BASE_DIR +docker cp ${BUILD_TAG}-sysinfo-helper:/bts $VOL_BASE_DIR docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper network_remove -- To view, visit https://gerrit.osmocom.org/7868 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e Gerrit-PatchSet: 3 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 09:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:39:50 +0000 Subject: osmo-bts[master]: scheduler_trx: Fix signed integer overflow in clock calculat... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7918 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I36e0d2d0d0c6e35e963f611135453c4a4c00bc99 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 09:43:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 09:43:46 +0000 Subject: osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/7743/5/src/hlr.c File src/hlr.c: Line 111: gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; > unaddressed comment: if neither CS nor PS has been seen, skip this item, si The test currently does not seem to send a CN_DOMAIN information element in its location update, in which case both flags (supports_ps and supports_cs) remain set to false. Should we always require a CN_DOMAIN IE from gsup clients? Shold we treat a client which does not provide this IE as CS? -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 5 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 09:46:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 09:46:08 +0000 Subject: libosmocore[master]: lapdm: Implement SABM related constraints In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 (2 comments) none of the remarks really matter since it's just a fairly trivial static function... https://gerrit.osmocom.org/#/c/7960/1/src/gsm/lapdm.c File src/gsm/lapdm.c: Line 540: /* determine if receiving a given LAPDm message is not permitted */ (cosmetically, would prefer dropping the "_not"; also explaining the return value) Line 545: if (lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM) { > May we unpack this condition in the following way: or even if (!(lctx->format == LAPD_FORM_U && lctx->s_u == LAPD_U_SABM)) return 0; above -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 09:55:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 09:55:16 +0000 Subject: [PATCH] osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7743 to look at the new patch set (#6). rewrite subscriber_update_notify() without calls into luop This function relied on implementation details of the luop code. Port what is necessary for an independent Insert Subscriber Data Tx operation from the luop code into this function. A next possible step would be to try to merge both of these into a common implementation. This will be addressed in a follow-up change as soon as this change is merged. The TTCN3 test TC_vty_msisdn_isd is still passing (it currently triggers the "circuit switched domain" case because it does not advertise itself as an SGSN in the IPA unit name). Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 91 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/43/7743/6 diff --git a/src/gsup_server.c b/src/gsup_server.c index b382c86..24ba738 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "gsup_server.h" #include "gsup_router.h" @@ -333,3 +334,20 @@ } talloc_free(gsups); } + +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup) +{ + int l; + uint8_t apn[APN_MAXLEN]; + + l = osmo_apn_from_str(apn, sizeof(apn), "*"); + if (l <= 0) + return; + + gsup->pdp_infos[0].apn_enc = apn; + gsup->pdp_infos[0].apn_enc_len = l; + gsup->pdp_infos[0].have_info = 1; + gsup->num_pdp_infos = 1; + /* FIXME: use real value: */ + gsup->pdp_infos[0].context_id = 1; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 74062d4..3d36bff 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -4,6 +4,7 @@ #include #include #include +#include struct osmo_gsup_conn; @@ -33,6 +34,10 @@ struct tlv_parsed ccm; unsigned int auc_3g_ind; /*!< IND index used for UMTS AKA SQN */ + + /* Set when Location Update is received: */ + bool supports_cs; /* client supports OSMO_GSUP_CN_DOMAIN_CS */ + bool supports_ps; /* client supports OSMO_GSUP_CN_DOMAIN_PS */ }; @@ -48,3 +53,4 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); diff --git a/src/hlr.c b/src/hlr.c index 3845993..a312e50 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,19 +61,69 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct lu_operation *luop = lu_op_alloc_conn(co); - if (!luop) { + struct osmo_gsup_message gsup = { + .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST + }; + uint8_t *peer; + int peer_len; + uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + int len; + struct msgb *msg_out; + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot allocate lu_operation," - " for %s:%u\n", subscr->imsi, + "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - luop->subscr = *subscr; - luop->state = LU_S_LU_RECEIVED; /* Pretend we received a location update. */ - lu_op_tx_insert_subscr_data(luop); - lu_op_free(luop); + + osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); + if (len < 1) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", + subscr->imsi, subscr->msisdn); + continue; + } + gsup.msisdn_enc = msisdn_enc; + gsup.msisdn_enc_len = len; + + if (co->supports_ps) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(&gsup); + } else if (co->supports_cs) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + } else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + /* Send ISD to MSC/SGSN */ + msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); + if (msg_out == NULL) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + + osmo_gsup_encode(msg_out, &gsup); + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; send operation failed " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } } } @@ -202,8 +251,15 @@ lu_op_statechg(luop, LU_S_LU_RECEIVED); - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS) + conn->supports_cs = true; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + conn->supports_ps = true; luop->is_ps = true; + } else { + /* The client didn't send a CN_DOMAIN IE; assume circuit-switched */ + conn->supports_cs = true; + } llist_add(&luop->list, &g_lu_ops); /* Roughly follwing "Process Update_Location_HLR" of TS 09.02 */ diff --git a/src/luop.c b/src/luop.c index 02c41d0..7150b64 100644 --- a/src/luop.c +++ b/src/luop.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "gsup_server.h" #include "gsup_router.h" @@ -233,7 +232,6 @@ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { struct osmo_gsup_message gsup; - uint8_t apn[APN_MAXLEN]; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ int l; @@ -259,15 +257,7 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - l = osmo_apn_from_str(apn, sizeof(apn), "*"); - if (l > 0) { - gsup.pdp_infos[0].apn_enc = apn; - gsup.pdp_infos[0].apn_enc_len = l; - gsup.pdp_infos[0].have_info = 1; - gsup.num_pdp_infos = 1; - /* FIXME: use real value: */ - gsup.pdp_infos[0].context_id = 1; - } + osmo_gsup_configure_wildcard_apn(&gsup); } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 6 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Wed May 2 09:56:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 09:56:36 +0000 Subject: osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Patch Set 5: > Uploaded patch set 6. Patch set 6 should address all of your comments (sorry for missing some before). In case a gsup client does not send a CN_DOMAIN IE at all, this patch makes the HLR assume the client is using DOMAIN_CS. -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 5 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 10:04:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 10:04:09 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: update expected results Message-ID: Review at https://gerrit.osmocom.org/7961 update expected results bsc: TC_assignment_sign fails with different message msc fixed: TC_lu_clear_request TC_emerg_call_imei_reject TC_cm_serv_req_vgcs_reject TC_cm_serv_req_vbs_reject TC_cm_serv_req_lcs_reject TC_cm_reest_req_reject TC_cl3_rnd_payload TC_lu_and_mt_sms new: TC_smpp_mo_sms TC_smpp_mt_sms sgsn fixed: TC_attach_umts_aka_gsm_sres Change-Id: Ie9ef25fb2081ebab7a2b08c06307fa391f8f747a --- M bsc/expected-results.xml M msc/expected-results.xml M sgsn/expected-results.xml 3 files changed, 18 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/7961/1 diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 8cafaa5..5b62fc9 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,10 @@ - + Received unexpected ASSIGNMENT FAIL + BSC_Tests.ttcn:MASKED BSC_Tests control part + BSC_Tests.ttcn:MASKED TC_assignment_sign testcase + diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 48ab12d..0b192d0 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -20,58 +20,23 @@ - - Got a second Clear Command, only one expected - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_clear_request testcase - - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_emerg_call_imei_reject testcase - - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_vgcs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_vbs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_lcs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_reest_req_reject testcase - - + + + + - - Timeout waiting for ClearCommand or SCCP Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cl3_rnd_payload testcase - - + Timeout waiting for ClearCommand/Release MSC_Tests.ttcn:MASKED MSC_Tests control part @@ -107,11 +72,8 @@ - - Unexpected SMS related PDU from MSC - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_and_mt_sms testcase - - + + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 688e35e..6724a8f 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,14 +1,9 @@ - + - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_umts_aka_gsm_sres testcase - - + Tguard timeout -- To view, visit https://gerrit.osmocom.org/7961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9ef25fb2081ebab7a2b08c06307fa391f8f747a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 10:05:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 10:05:21 +0000 Subject: osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie9ef25fb2081ebab7a2b08c06307fa391f8f747a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 10:05:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 10:05:23 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: update expected results ...................................................................... update expected results bsc: TC_assignment_sign fails with different message msc fixed: TC_lu_clear_request TC_emerg_call_imei_reject TC_cm_serv_req_vgcs_reject TC_cm_serv_req_vbs_reject TC_cm_serv_req_lcs_reject TC_cm_reest_req_reject TC_cl3_rnd_payload TC_lu_and_mt_sms new: TC_smpp_mo_sms TC_smpp_mt_sms sgsn fixed: TC_attach_umts_aka_gsm_sres Change-Id: Ie9ef25fb2081ebab7a2b08c06307fa391f8f747a --- M bsc/expected-results.xml M msc/expected-results.xml M sgsn/expected-results.xml 3 files changed, 18 insertions(+), 58 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 8cafaa5..5b62fc9 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -20,7 +20,10 @@ - + Received unexpected ASSIGNMENT FAIL + BSC_Tests.ttcn:MASKED BSC_Tests control part + BSC_Tests.ttcn:MASKED TC_assignment_sign testcase + diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 48ab12d..0b192d0 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -20,58 +20,23 @@ - - Got a second Clear Command, only one expected - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_clear_request testcase - - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_emerg_call_imei_reject testcase - - + - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_vgcs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_vbs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_serv_req_lcs_reject testcase - - - - Timeout waiting for ClearCommand/Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cm_reest_req_reject testcase - - + + + + - - Timeout waiting for ClearCommand or SCCP Release - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_cl3_rnd_payload testcase - - + Timeout waiting for ClearCommand/Release MSC_Tests.ttcn:MASKED MSC_Tests control part @@ -107,11 +72,8 @@ - - Unexpected SMS related PDU from MSC - MSC_Tests.ttcn:MASKED MSC_Tests control part - MSC_Tests.ttcn:MASKED TC_lu_and_mt_sms testcase - - + + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 688e35e..6724a8f 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,14 +1,9 @@ - + - - Tguard timeout - SGSN_Tests.ttcn:MASKED SGSN_Tests control part - SGSN_Tests.ttcn:MASKED TC_attach_umts_aka_gsm_sres testcase - - + Tguard timeout -- To view, visit https://gerrit.osmocom.org/7961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9ef25fb2081ebab7a2b08c06307fa391f8f747a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 2 10:14:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 10:14:05 +0000 Subject: [MERGED] osmo-bts[master]: scheduler_trx: Fix signed integer overflow in clock calculat... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: scheduler_trx: Fix signed integer overflow in clock calculations ...................................................................... scheduler_trx: Fix signed integer overflow in clock calculations Should fix following observed run time errors: osmo-bts-trx/scheduler_trx.c:1627:65: runtime error: signed integer overflow: -1081823 * 4615 cannot be represented in type 'int' osmo-bts-trx/scheduler_trx.c:1627:21: runtime error: signed integer overflow: 1852394502 - -697645849 cannot be represented in type 'int' Related: OS#3213 Change-Id: I36e0d2d0d0c6e35e963f611135453c4a4c00bc99 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4a31df2..4c4ae6c 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1581,7 +1581,7 @@ struct osmo_trx_clock_state *tcs = &g_clk_s; struct timespec tv_now; int elapsed_us, elapsed_fn; - int elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; + int64_t elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk; unsigned int fn_caught_up = 0; const struct timespec interval = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_nS }; @@ -1625,7 +1625,8 @@ elapsed_fn_since_clk = compute_elapsed_fn(tcs->last_clk_ind.fn, fn); /* error (delta) between local clock since last CLK and CLK based on FN clock at TRX */ error_us_since_clk = elapsed_us_since_clk - (FRAME_DURATION_uS * elapsed_fn_since_clk); - LOGP(DL1C, LOGL_INFO, "TRX Clock Ind: elapsed_us=%7d, elapsed_fn=%3d, error_us=%+5d\n", + LOGP(DL1C, LOGL_INFO, "TRX Clock Ind: elapsed_us=%7"PRId64", " + "elapsed_fn=%3"PRId64", error_us=%+5"PRId64"\n", elapsed_us_since_clk, elapsed_fn_since_clk, error_us_since_clk); /* TODO: put this computed error_us_since_clk into some filter -- To view, visit https://gerrit.osmocom.org/7918 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I36e0d2d0d0c6e35e963f611135453c4a4c00bc99 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 10:15:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 10:15:54 +0000 Subject: osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Patch Set 6: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/7743/6/src/hlr.c File src/hlr.c: Line 260: /* The client didn't send a CN_DOMAIN IE; assume circuit-switched */ I really wanted to +2 now, but damn: Looking in our GSUP specs, e.g. osmohlr-usermanual ( http://ftp.osmocom.org/docs/latest/ ) the CN Domain is indeed optional (11.5.6 Update Location Request) but 11.6.15 CN Domain says: For backwards compatibility reasons, if no CN Domain IE is present within a request, the PS Domain is assumed. -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 6 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 11:35:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 11:35:16 +0000 Subject: [PATCH] osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7743 to look at the new patch set (#7). rewrite subscriber_update_notify() without calls into luop This function relied on implementation details of the luop code. Port what is necessary for an independent Insert Subscriber Data Tx operation from the luop code into this function. A next possible step would be to try to merge both of these into a common implementation. This will be addressed in a follow-up change as soon as this change is merged. The TTCN3 test TC_vty_msisdn_isd is still passing (it currently triggers the "circuit switched domain" case because it does not advertise itself as an SGSN in the IPA unit name). Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 94 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/43/7743/7 diff --git a/src/gsup_server.c b/src/gsup_server.c index b382c86..24ba738 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "gsup_server.h" #include "gsup_router.h" @@ -333,3 +334,20 @@ } talloc_free(gsups); } + +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup) +{ + int l; + uint8_t apn[APN_MAXLEN]; + + l = osmo_apn_from_str(apn, sizeof(apn), "*"); + if (l <= 0) + return; + + gsup->pdp_infos[0].apn_enc = apn; + gsup->pdp_infos[0].apn_enc_len = l; + gsup->pdp_infos[0].have_info = 1; + gsup->num_pdp_infos = 1; + /* FIXME: use real value: */ + gsup->pdp_infos[0].context_id = 1; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 74062d4..3d36bff 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -4,6 +4,7 @@ #include #include #include +#include struct osmo_gsup_conn; @@ -33,6 +34,10 @@ struct tlv_parsed ccm; unsigned int auc_3g_ind; /*!< IND index used for UMTS AKA SQN */ + + /* Set when Location Update is received: */ + bool supports_cs; /* client supports OSMO_GSUP_CN_DOMAIN_CS */ + bool supports_ps; /* client supports OSMO_GSUP_CN_DOMAIN_PS */ }; @@ -48,3 +53,4 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); diff --git a/src/hlr.c b/src/hlr.c index 3845993..479b5cf 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,19 +61,69 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct lu_operation *luop = lu_op_alloc_conn(co); - if (!luop) { + struct osmo_gsup_message gsup = { + .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST + }; + uint8_t *peer; + int peer_len; + uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + int len; + struct msgb *msg_out; + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot allocate lu_operation," - " for %s:%u\n", subscr->imsi, + "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - luop->subscr = *subscr; - luop->state = LU_S_LU_RECEIVED; /* Pretend we received a location update. */ - lu_op_tx_insert_subscr_data(luop); - lu_op_free(luop); + + osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); + if (len < 1) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", + subscr->imsi, subscr->msisdn); + continue; + } + gsup.msisdn_enc = msisdn_enc; + gsup.msisdn_enc_len = len; + + if (co->supports_ps) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(&gsup); + } else if (co->supports_cs) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + } else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + /* Send ISD to MSC/SGSN */ + msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); + if (msg_out == NULL) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + + osmo_gsup_encode(msg_out, &gsup); + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; send operation failed " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } } } @@ -202,8 +251,18 @@ lu_op_statechg(luop, LU_S_LU_RECEIVED); - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS) + conn->supports_cs = true; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + conn->supports_ps = true; luop->is_ps = true; + } else { + /* The client didn't send a CN_DOMAIN IE; assume packet-switched in + * accordance with the GSUP spec in osmo-hlr's user manual (section + * 11.6.15 "CN Domain" says "if no CN Domain IE is present within + * a request, the PS Domain is assumed." */ + conn->supports_ps = true; + } llist_add(&luop->list, &g_lu_ops); /* Roughly follwing "Process Update_Location_HLR" of TS 09.02 */ diff --git a/src/luop.c b/src/luop.c index 02c41d0..7150b64 100644 --- a/src/luop.c +++ b/src/luop.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "gsup_server.h" #include "gsup_router.h" @@ -233,7 +232,6 @@ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { struct osmo_gsup_message gsup; - uint8_t apn[APN_MAXLEN]; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ int l; @@ -259,15 +257,7 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - l = osmo_apn_from_str(apn, sizeof(apn), "*"); - if (l > 0) { - gsup.pdp_infos[0].apn_enc = apn; - gsup.pdp_infos[0].apn_enc_len = l; - gsup.pdp_infos[0].have_info = 1; - gsup.num_pdp_infos = 1; - /* FIXME: use real value: */ - gsup.pdp_infos[0].context_id = 1; - } + osmo_gsup_configure_wildcard_apn(&gsup); } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 7 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Wed May 2 11:36:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 11:36:01 +0000 Subject: osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Patch Set 7: > Uploaded patch set 7. Set the CN Domain fallback to packet-switched and added a comment which explains why. -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 7 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 13:10:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 13:10:10 +0000 Subject: [PATCH] osmo-pcu[master]: improve documentation of Encoding::write_paging_request() Message-ID: Review at https://gerrit.osmocom.org/7962 improve documentation of Encoding::write_paging_request() Add pointers to relevant parts of the spec. Tweak comments to be more specific about the values being written and abbreviations used. Change-Id: Ia5bf3f7f8846198b7b4e25ff1accf6206764be74 --- M src/encoding.cpp 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/62/7962/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index b2da1e8..1f96458 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -609,7 +609,7 @@ pda_r99->Exist_COMPACT_ReducedMA = 0; } -/* generate paging request */ +/* Generate paging request. See 44.018, sections 10 and 9.1.22 */ int Encoding::write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len) { unsigned wp = 0; @@ -617,7 +617,7 @@ bitvec_write_field(dest, &wp,0x0,4); // Skip Indicator bitvec_write_field(dest, &wp,0x6,4); // Protocol Discriminator - bitvec_write_field(dest, &wp,0x21,8); // Paging Request Message Type + bitvec_write_field(dest, &wp,0x21,8); // Paging Request Message Type 1 bitvec_write_field(dest, &wp,0x0,4); // Page Mode bitvec_write_field(dest, &wp,0x0,4); // Channel Needed @@ -636,7 +636,7 @@ "multiple of 8 bits, PLEASE FIX!\n"); plen = wp / 8; - bitvec_write_field(dest, &wp,0x0,1); // "L" NLN(PCH) = off + bitvec_write_field(dest, &wp,0x0,1); // "L" Notification List Number; NLN(PCH) = off bitvec_write_field(dest, &wp,0x0,1); // "L" Priority1 = off bitvec_write_field(dest, &wp,0x1,1); // "L" Priority2 = off bitvec_write_field(dest, &wp,0x0,1); // "L" Group Call information = off -- To view, visit https://gerrit.osmocom.org/7962 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5bf3f7f8846198b7b4e25ff1accf6206764be74 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Wed May 2 13:17:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 2 May 2018 13:17:26 +0000 Subject: [PATCH] osmo-bsc[master]: cosmetic: Add note about libosmo-legacy-mgcp to configure.ac Message-ID: Review at https://gerrit.osmocom.org/7963 cosmetic: Add note about libosmo-legacy-mgcp to configure.ac Change-Id: Ia496bd9ec02c0028aa541a798b1358a68ad18e21 Closes: OS#3226 --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/7963/1 diff --git a/configure.ac b/configure.ac index c74402a..a077fd5 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,9 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.2.0) + +#NOTE: osmo-bsc does not depend on libosmo-legacy-mgcp anymore, but we still +# need the dependancy for osmo-bsc-nat, which still uses the old API. PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.0.0) dnl checks for header files -- To view, visit https://gerrit.osmocom.org/7963 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia496bd9ec02c0028aa541a798b1358a68ad18e21 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Wed May 2 13:26:52 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 13:26:52 +0000 Subject: [PATCH] libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7904 to look at the new patch set (#4). gsm_utils: call gnutls_global_init() as constructor gnutls_global_init must be called at least once for gnutls < 3.3.0. It doesn't hurt calling it twice, except a reference counter is increased. gnutls >= 3.3.0 will call it automatic. Fixes: OS#2986 Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 --- M src/gsm/gsm_utils.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/7904/4 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 5d8c834..47f3e2b 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -112,6 +112,25 @@ #pragma message ("including GnuTLS for getrandom fallback.") #include #include + +/* gnutls < 3.3.0 requires global init. + * gnutls >= 3.3.0 does it automatic. + * It doesn't hurt calling it twice, + * as long it's not done at the same time (threads). + */ +__attribute__((constructor)) +static void on_dso_load_gnutls(void) +{ + if (gnutls_check_version("3.3.0")) + gnutls_global_init(); +} + +__attribute__((destructor)) +static void on_dso_unload_gnutls(void) +{ + if (gnutls_check_version("3.3.0")) + gnutls_global_deinit(); +{ #endif /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 13:32:07 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 13:32:07 +0000 Subject: [PATCH] libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7904 to look at the new patch set (#5). gsm_utils: call gnutls_global_init() as constructor gnutls_global_init must be called at least once for gnutls < 3.3.0. It doesn't hurt calling it twice, except a reference counter is increased. gnutls >= 3.3.0 will call it automatic. Fixes: OS#2986 Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 --- M src/gsm/gsm_utils.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/7904/5 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 5d8c834..dcaa97d 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -112,6 +112,25 @@ #pragma message ("including GnuTLS for getrandom fallback.") #include #include + +/* gnutls < 3.3.0 requires global init. + * gnutls >= 3.3.0 does it automatic. + * It doesn't hurt calling it twice, + * as long it's not done at the same time (threads). + */ +__attribute__((constructor)) +static void on_dso_load_gnutls(void) +{ + if (gnutls_check_version("3.3.0")) + gnutls_global_init(); +} + +__attribute__((destructor)) +static void on_dso_unload_gnutls(void) +{ + if (gnutls_check_version("3.3.0")) + gnutls_global_deinit(); +} #endif /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 5 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 13:46:01 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 13:46:01 +0000 Subject: [PATCH] libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7904 to look at the new patch set (#6). gsm_utils: call gnutls_global_init() as constructor gnutls_global_init must be called at least once for gnutls < 3.3.0. It doesn't hurt calling it twice, except a reference counter is increased. gnutls >= 3.3.0 will call it automatic. Fixes: OS#2986 Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 --- M src/gsm/gsm_utils.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/04/7904/6 diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 5d8c834..7e6c794 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -112,6 +112,25 @@ #pragma message ("including GnuTLS for getrandom fallback.") #include #include + +/* gnutls < 3.3.0 requires global init. + * gnutls >= 3.3.0 does it automatic. + * It doesn't hurt calling it twice, + * as long it's not done at the same time (threads). + */ +__attribute__((constructor)) +static void on_dso_load_gnutls(void) +{ + if (!gnutls_check_version("3.3.0")) + gnutls_global_init(); +} + +__attribute__((destructor)) +static void on_dso_unload_gnutls(void) +{ + if (!gnutls_check_version("3.3.0")) + gnutls_global_deinit(); +} #endif /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 14:00:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:00:52 +0000 Subject: libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 14:21:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 2 May 2018 14:21:44 +0000 Subject: osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 7 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 14:40:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 2 May 2018 14:40:18 +0000 Subject: [MERGED] osmo-hlr[master]: rewrite subscriber_update_notify() without calls into luop In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. Change subject: rewrite subscriber_update_notify() without calls into luop ...................................................................... rewrite subscriber_update_notify() without calls into luop This function relied on implementation details of the luop code. Port what is necessary for an independent Insert Subscriber Data Tx operation from the luop code into this function. A next possible step would be to try to merge both of these into a common implementation. This will be addressed in a follow-up change as soon as this change is merged. The TTCN3 test TC_vty_msisdn_isd is still passing (it currently triggers the "circuit switched domain" case because it does not advertise itself as an SGSN in the IPA unit name). Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 94 insertions(+), 21 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsup_server.c b/src/gsup_server.c index b382c86..24ba738 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "gsup_server.h" #include "gsup_router.h" @@ -333,3 +334,20 @@ } talloc_free(gsups); } + +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup) +{ + int l; + uint8_t apn[APN_MAXLEN]; + + l = osmo_apn_from_str(apn, sizeof(apn), "*"); + if (l <= 0) + return; + + gsup->pdp_infos[0].apn_enc = apn; + gsup->pdp_infos[0].apn_enc_len = l; + gsup->pdp_infos[0].have_info = 1; + gsup->num_pdp_infos = 1; + /* FIXME: use real value: */ + gsup->pdp_infos[0].context_id = 1; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 74062d4..3d36bff 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -4,6 +4,7 @@ #include #include #include +#include struct osmo_gsup_conn; @@ -33,6 +34,10 @@ struct tlv_parsed ccm; unsigned int auc_3g_ind; /*!< IND index used for UMTS AKA SQN */ + + /* Set when Location Update is received: */ + bool supports_cs; /* client supports OSMO_GSUP_CN_DOMAIN_CS */ + bool supports_ps; /* client supports OSMO_GSUP_CN_DOMAIN_PS */ }; @@ -48,3 +53,4 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); diff --git a/src/hlr.c b/src/hlr.c index 3845993..479b5cf 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,19 +61,69 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct lu_operation *luop = lu_op_alloc_conn(co); - if (!luop) { + struct osmo_gsup_message gsup = { + .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST + }; + uint8_t *peer; + int peer_len; + uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + int len; + struct msgb *msg_out; + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot allocate lu_operation," - " for %s:%u\n", subscr->imsi, + "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - luop->subscr = *subscr; - luop->state = LU_S_LU_RECEIVED; /* Pretend we received a location update. */ - lu_op_tx_insert_subscr_data(luop); - lu_op_free(luop); + + osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); + if (len < 1) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", + subscr->imsi, subscr->msisdn); + continue; + } + gsup.msisdn_enc = msisdn_enc; + gsup.msisdn_enc_len = len; + + if (co->supports_ps) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(&gsup); + } else if (co->supports_cs) { + gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + } else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + /* Send ISD to MSC/SGSN */ + msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); + if (msg_out == NULL) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; could not allocate msg buffer " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + + osmo_gsup_encode(msg_out, &gsup); + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot notify GSUP client; send operation failed " + "for %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } } } @@ -202,8 +251,18 @@ lu_op_statechg(luop, LU_S_LU_RECEIVED); - if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_CS) + conn->supports_cs = true; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + conn->supports_ps = true; luop->is_ps = true; + } else { + /* The client didn't send a CN_DOMAIN IE; assume packet-switched in + * accordance with the GSUP spec in osmo-hlr's user manual (section + * 11.6.15 "CN Domain" says "if no CN Domain IE is present within + * a request, the PS Domain is assumed." */ + conn->supports_ps = true; + } llist_add(&luop->list, &g_lu_ops); /* Roughly follwing "Process Update_Location_HLR" of TS 09.02 */ diff --git a/src/luop.c b/src/luop.c index 02c41d0..7150b64 100644 --- a/src/luop.c +++ b/src/luop.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "gsup_server.h" #include "gsup_router.h" @@ -233,7 +232,6 @@ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { struct osmo_gsup_message gsup; - uint8_t apn[APN_MAXLEN]; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ int l; @@ -259,15 +257,7 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - l = osmo_apn_from_str(apn, sizeof(apn), "*"); - if (l > 0) { - gsup.pdp_infos[0].apn_enc = apn; - gsup.pdp_infos[0].apn_enc_len = l; - gsup.pdp_infos[0].have_info = 1; - gsup.num_pdp_infos = 1; - /* FIXME: use real value: */ - gsup.pdp_infos[0].context_id = 1; - } + osmo_gsup_configure_wildcard_apn(&gsup); } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/7743 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06c43ece2b48dc63d599000eb6d6d51e08963067 Gerrit-PatchSet: 7 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Wed May 2 14:43:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:43:28 +0000 Subject: [PATCH] libgtpnl[master]: configure.ac: Depend on osmo-release.mk Message-ID: Review at https://gerrit.osmocom.org/7964 configure.ac: Depend on osmo-release.mk The osmo-release.mk script can be found in libosmocore and it is used in most osmocom related projects to help create new releases. LIBVERSION is moved to src/Makefile.am since osmo-release.mk greps for Makefile.am to find LIBVERSIOn changes. In any case, we don't need in the global include makefile. Change-Id: I5d163535c34369c74ece26574c8b1601bc1697b7 --- M Make_global.am M Makefile.am M TODO-RELEASE M configure.ac M src/Makefile.am 5 files changed, 21 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/64/7964/1 diff --git a/Make_global.am b/Make_global.am index 4037ac1..f2cb36c 100644 --- a/Make_global.am +++ b/Make_global.am @@ -1,24 +1,2 @@ -# This is _NOT_ the library release version, it's an API version. -# Extracted from Chapter 6 "Library interface versions" of the libtool docs. -# -# -# Here are a set of rules to help you update your library version information: -# -# 1. Start with version information of `0:0:0' for each libtool library. -# 2. Update the version information only immediately before a public release -# of your software. More frequent updates are unnecessary, and only guarantee -# that the current interface number gets larger faster. -# 3. If the library source code has changed at all since the last update, -# then increment revision (`c:r:a' becomes `c:r+1:a'). -# 4. If any interfaces have been added, removed, or changed since the last -# update, increment current, and set revision to 0. -# 5. If any interfaces have been added since the last public release, then -# increment age. -# 6. If any interfaces have been removed since the last public release, then -# set age to 0. -# -# -LIBVERSION=1:0:1 - AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff --git a/Makefile.am b/Makefile.am index deb3299..1fabe69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Make_global.am + at RELMAKE@ + ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src include tools diff --git a/TODO-RELEASE b/TODO-RELEASE index e69de29..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac index f70ead0..19e07b2 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,10 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/src/Makefile.am b/src/Makefile.am index 53adda7..5490e42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,10 @@ include $(top_srcdir)/Make_global.am + +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +LIBVERSION=1:0:1 + + lib_LTLIBRARIES = libgtpnl.la noinst_HEADERS = internal.h -- To view, visit https://gerrit.osmocom.org/7964 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d163535c34369c74ece26574c8b1601bc1697b7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:43:29 +0000 Subject: [PATCH] libgtpnl[master]: debian/changelog: Set latest release as unstable Message-ID: Review at https://gerrit.osmocom.org/7965 debian/changelog: Set latest release as unstable It was left as UNRELEASED but it was actually released (there's a tag on it). Otherwise osmo-release.mk is fooled. Change-Id: Iedd8311303274dd3be88a11314a61fbdd511679d --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/65/7965/1 diff --git a/debian/changelog b/debian/changelog index 69b49ae..851dee5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtpnl (1.1.0) UNRELEASED; urgency=medium +libgtpnl (1.1.0) unstable; urgency=medium * Add genl_socket_close() function * Add contrib/jenkins.sh for jenkins build verification -- To view, visit https://gerrit.osmocom.org/7965 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedd8311303274dd3be88a11314a61fbdd511679d Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:43:29 +0000 Subject: [PATCH] libgtpnl[master]: configure.ac: Use git-version-gen to set VERSION Message-ID: Review at https://gerrit.osmocom.org/7966 configure.ac: Use git-version-gen to set VERSION Change-Id: Id6535719321c8bb690936b5ae3ddcb9d8a9aa4d7 --- M configure.ac A git-version-gen 2 files changed, 154 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/66/7966/1 diff --git a/configure.ac b/configure.ac index 19e07b2..f7580e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libgtpnl], [1.1.0]) +AC_INIT([libgtpnl], + m4_esyscmd([./git-version-gen .tarball-version]), + [osmocom-net-gprs at lists.osmocom.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/7966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6535719321c8bb690936b5ae3ddcb9d8a9aa4d7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:43:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:43:29 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E5-b1ad-dirty_=E2=86=92_1=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7967 Bump version: 1.1.0.5-b1ad-dirty ? 1.2.0 Change-Id: I4b72bfb1c9c2413e84e9d8a1c5ebc19d476aada1 --- M debian/changelog M src/Makefile.am 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/67/7967/1 diff --git a/debian/changelog b/debian/changelog index 851dee5..6499958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtpnl (1.2.0) unstable; urgency=medium + + * Fix CTRL_ATTR_FAMILY_ID attribute size + + -- Harald Welte Wed, 02 May 2018 16:37:14 +0200 + libgtpnl (1.1.0) unstable; urgency=medium * Add genl_socket_close() function diff --git a/src/Makefile.am b/src/Makefile.am index 5490e42..a87c5cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=1:0:1 +LIBVERSION=1:1:1 lib_LTLIBRARIES = libgtpnl.la -- To view, visit https://gerrit.osmocom.org/7967 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b72bfb1c9c2413e84e9d8a1c5ebc19d476aada1 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:44:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:44:37 +0000 Subject: [PATCH] libosmocore[master]: osmo-release.sh: Remove temporary file TODO-RELEASE.entries ... Message-ID: Review at https://gerrit.osmocom.org/7968 osmo-release.sh: Remove temporary file TODO-RELEASE.entries after use Change-Id: I1cac39093d43910c2f5b969f5287cf3678110f4e --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/7968/1 diff --git a/osmo-release.sh b/osmo-release.sh index ed40d0b..fbaf63d 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -42,6 +42,7 @@ fi fi xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" + rm TODO-RELEASE.entries fi dch -r -m --distribution "unstable" "" git add -u -- To view, visit https://gerrit.osmocom.org/7968 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cac39093d43910c2f5b969f5287cf3678110f4e Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:44:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:44:37 +0000 Subject: [PATCH] libosmocore[master]: osmo-release.sh: Exit with error if no description for new c... Message-ID: Review at https://gerrit.osmocom.org/7969 osmo-release.sh: Exit with error if no description for new changelog entry provided If no line is provided, then the xargs line doesn't call dch (due to -r param) and as a result no new version entry is created in the log, and the old one is updated. Change-Id: I17894f669e6d3d6d31203a4522dce7fa01da323f --- M osmo-release.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/7969/1 diff --git a/osmo-release.sh b/osmo-release.sh index fbaf63d..7ae4da0 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -32,6 +32,11 @@ echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" grep -v '#' TODO-RELEASE | sed 's/\t\+/: /g' > TODO-RELEASE.entries + if [ "$(wc -l /dev/null)" -eq "0" ]; then + rm TODO-RELEASE.entries + echo "TODO-RELEASE must contain at least one line with change descriptions" + exit 1 + fi grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE if [ "z$MAKEMOD" = "z" ]; then -- To view, visit https://gerrit.osmocom.org/7969 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17894f669e6d3d6d31203a4522dce7fa01da323f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:44:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 14:44:38 +0000 Subject: [PATCH] libosmocore[master]: osmo-release.sh: Fix error condition no LIBVERSION modified Message-ID: Review at https://gerrit.osmocom.org/7970 osmo-release.sh: Fix error condition no LIBVERSION modified It turns out git status doesn't return an error code in any of the modified/unmodified cases. It's not clear anyway why we check TODO-RELEASE when we actually care about the file containing the LIBVERSION (non-)change. Change-Id: I2320d6ee29cd528e55c0609be1af350655123b85 --- M osmo-release.sh 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/7970/1 diff --git a/osmo-release.sh b/osmo-release.sh index 7ae4da0..0e85023 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -40,11 +40,8 @@ grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE if [ "z$MAKEMOD" = "z" ]; then - git status -s -uno TODO-RELEASE - if [ $? -ne 0 ]; then - echo "Before releasing, please modify some of the libversions: $LIBVERS" - exit 1 - fi + echo "Before releasing, please modify some of the libversions: $LIBVERS" + exit 1 fi xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" rm TODO-RELEASE.entries -- To view, visit https://gerrit.osmocom.org/7970 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2320d6ee29cd528e55c0609be1af350655123b85 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 14:58:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 14:58:31 +0000 Subject: [PATCH] osmo-ci[master]: jobs: Osmocom_latest_packages: change node to obs Message-ID: Review at https://gerrit.osmocom.org/7971 jobs: Osmocom_latest_packages: change node to obs obs node label have the credentials to access OBS Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 --- M jobs/osmocom-obs-latest.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/7971/1 diff --git a/jobs/osmocom-obs-latest.yml b/jobs/osmocom-obs-latest.yml index def633f..e6e63f9 100644 --- a/jobs/osmocom-obs-latest.yml +++ b/jobs/osmocom-obs-latest.yml @@ -9,7 +9,7 @@ project-type: freestyle defaults: global description: 'Generated by job-builder' - node: linux_amd64_debian8 + node: obs builders: - shell: ./scripts/osmocom-latest-packages.sh -- To view, visit https://gerrit.osmocom.org/7971 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 14:58:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 14:58:31 +0000 Subject: [PATCH] osmo-ci[master]: jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml Message-ID: Review at https://gerrit.osmocom.org/7972 jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml Prepare to template nightly and latest in one file Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 --- R jobs/osmocom-obs.yml 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/7972/1 diff --git a/jobs/osmocom-obs-latest.yml b/jobs/osmocom-obs.yml similarity index 100% rename from jobs/osmocom-obs-latest.yml rename to jobs/osmocom-obs.yml -- To view, visit https://gerrit.osmocom.org/7972 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 14:58:31 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 14:58:31 +0000 Subject: [PATCH] osmo-ci[master]: jobs: osmocom-obs: introduce template var type Message-ID: Review at https://gerrit.osmocom.org/7973 jobs: osmocom-obs: introduce template var type In preparation for the nightly jobs Change-Id: I315215eb1d5ade257262d0717711c11f3787319f --- M jobs/osmocom-obs.yml 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/73/7973/1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index e6e63f9..6bbf8da 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -1,18 +1,20 @@ --- - project: - name: Osmocom_OBS_latest + name: Osmocom_OBS jobs: - - Osmocom_OBS_latest + - Osmocom_OBS_{type} + type: + - latest -- job: - name: 'Osmocom_OBS_latest' +- job-template: + name: 'Osmocom_OBS_{type}' project-type: freestyle defaults: global description: 'Generated by job-builder' node: obs builders: - shell: - ./scripts/osmocom-latest-packages.sh + ./scripts/osmocom-{type}-packages.sh scm: - git: url: git://git.osmocom.org/osmo-ci -- To view, visit https://gerrit.osmocom.org/7973 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I315215eb1d5ade257262d0717711c11f3787319f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 14:58:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 14:58:32 +0000 Subject: [PATCH] osmo-ci[master]: jobs: osmocom-obs: add support for the nightly build Message-ID: Review at https://gerrit.osmocom.org/7974 jobs: osmocom-obs: add support for the nightly build Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 --- M jobs/osmocom-obs.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/7974/1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 6bbf8da..9b9f989 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -4,6 +4,7 @@ jobs: - Osmocom_OBS_{type} type: + - nightly - latest - job-template: -- To view, visit https://gerrit.osmocom.org/7974 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 14:58:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 14:58:32 +0000 Subject: [PATCH] osmo-ci[master]: jobs: remove old job Osmocom_nightly_nitb_split Message-ID: Review at https://gerrit.osmocom.org/7975 jobs: remove old job Osmocom_nightly_nitb_split It's not any more used, neither does the job even work, because the split file got already removed. Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec --- D jobs/osmocom-nightly-nitb-split.yml 1 file changed, 0 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/7975/1 diff --git a/jobs/osmocom-nightly-nitb-split.yml b/jobs/osmocom-nightly-nitb-split.yml deleted file mode 100644 index 4c64de4..0000000 --- a/jobs/osmocom-nightly-nitb-split.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- project: - name: Osmocom_nightly_nitb_split - jobs: - - Osmocom_nightly_nitb_split - -- job: - name: 'Osmocom_nightly_nitb_split' - project-type: freestyle - defaults: global - description: 'Generated by job-builder' - node: linux_amd64_debian8 - builders: - - shell: - ./scripts/osmocom-nightly-nitb-split.sh - scm: - - git: - url: git://git.osmocom.org/osmo-ci - git-config-name: 'Jenkins Builder' - git-config-email: 'jenkins at osmocom.org' - triggers: - - timed: "@midnight" - -# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/7975 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 15:07:49 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 15:07:49 +0000 Subject: [PATCH] osmo-ci[master]: osmocom-nightly-packages: replace version string with by git... Message-ID: Review at https://gerrit.osmocom.org/7976 osmocom-nightly-packages: replace version string with by git-version-gen E.g. old version 0.10.2.20180501 (0.10.2 last deb version, 20180501 was the date) The new version will look like 0.10.2.279.178b - 0.10.2 is the last tag - .279 is 279 commits since the tag - 178b is the actual short git rev The direct output of ./git-version-gen couldn't be used because debian forbids using a minus (-) in upstream versions. Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/7976/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index c9eb2e0..a200f36 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -37,6 +37,25 @@ osc co "$PROJ" } +get_commit_version() { + # return a version based on the commit + local version + local date + + # git version + version=$(test -x ./git-version-gen && ./git-version-gen . 2>/dev/null) + # debian doesn't allow '-' in version. + version=$(echo "$version" | sed 's/-/./g' ) + + # deb version + if [ -z "$version" ] ; then + version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') + version="$version.$DT" + fi + + echo -n "$version" +} + build() { local name=$1 local changelog=$2 @@ -62,9 +81,9 @@ cd "$repodir" if [ "$changelog" = "commit" ] ; then - VER=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') - dch -v "$VER.$DT" -m "Snapshot build" - git commit -m "$DT snapshot" debian/ + VER=$(get_commit_version) + dch -b -v "$VER" -m "Snapshot build" + git commit -m "$VER snapshot" debian/ fi mkdir -p "$DATA/$name" -- To view, visit https://gerrit.osmocom.org/7976 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 15:55:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 15:55:14 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E282-f8ca-dirty_=E2=86=92_0=2E11=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7977 Bump version: 0.10.2.282-f8ca-dirty ? 0.11.0 Remark: For libosmogb and libosmogsm, LIBVERSION was already bumped in c4fce1425e19d604c199c895e227dc2519110456. Change-Id: I22d6be1427b126edcd43ae0ae70fd9696108184b --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmocodec1.install R debian/libosmocoding1.install R debian/libosmocore10.install R debian/libosmoctrl2.install M src/Makefile.am M src/codec/Makefile.am M src/coding/Makefile.am M src/ctrl/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 13 files changed, 30 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/7977/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 16496d6..fb0bfea 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,9 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -core msgb_queue_free() add inline func to msgb.h -coding gsm0503_rach_ext-encode() add func to gsm0503_coding.h -codec ecu.c / ecu.h implement ECU for FR (Error Concealment Unit) -fsm fsmc / fsm.h added callback for graceful exit => ABI changed -gsm gsm0480.c / gsm0480.h the 'ss_request' struct extended with ussd_data, - ussd_data_len, and ussd_data_dcs => ABI changed diff --git a/debian/changelog b/debian/changelog index a50e30b..952ddcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libosmocore (0.11.0) unstable; urgency=medium + + * core: msgb_queue_free(): add inline func to msgb.h + * coding: gsm0503_rach_ext-encode(): add func to gsm0503_coding.h + * codec: ecu.c / ecu.h: implement ECU for FR (Error Concealment Unit) + * fsm: fsmc / fsm.h: added callback for graceful exit => ABI changed + * gsm: gsm0480.c / gsm0480.h: the 'ss_request' struct extended with + ussd_data, ussd_data_len, and ussd_data_dcs => ABI changed + + -- Harald Welte Wed, 02 May 2018 17:45:38 +0200 + libosmocore (0.10.2) unstable; urgency=medium * Revert "vty: Fix bad use of vector_slot()" diff --git a/debian/control b/debian/control index d911f32..acce32e 100644 --- a/debian/control +++ b/debian/control @@ -25,13 +25,13 @@ Section: libs Architecture: any Multi-Arch: foreign -Depends: libosmocodec0 (= ${binary:Version}), - libosmocoding0 (= ${binary:Version}), - libosmocore9 (= ${binary:Version}), +Depends: libosmocodec1 (= ${binary:Version}), + libosmocoding1 (= ${binary:Version}), + libosmocore10 (= ${binary:Version}), libosmogb6 (= ${binary:Version}), libosmogsm9 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), - libosmoctrl1 (= ${binary:Version}), + libosmoctrl2 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), ${misc:Depends} Description: Open Source MObile COMmunications CORE library (metapackage) @@ -41,7 +41,7 @@ least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. -Package: libosmocodec0 +Package: libosmocodec1 Section: libs Architecture: any Multi-Arch: same @@ -67,7 +67,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocodec0, + libosmocodec1, libjs-jquery Description: Documentation for the osmo codec library This is part of the libosmocore "meta"-library. The libosmocore library @@ -78,7 +78,7 @@ . This package contains the documentation for the libosmocodec library. -Package: libosmocoding0 +Package: libosmocoding1 Section: libs Architecture: any Multi-Arch: same @@ -99,7 +99,7 @@ Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocoding0, + libosmocoding1, libjs-jquery Description: Documentation for the osmo coding library This is part of the libosmocore "meta"-library. The libosmocore library @@ -110,7 +110,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore9 +Package: libosmocore10 Section: libs Architecture: any Multi-Arch: same @@ -124,14 +124,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore9 library in particular is a collection of common code used in + The libosmocore10 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore9, + libosmocore10, libjs-jquery, libosmocodec-doc, libosmocoding-doc, @@ -245,7 +245,7 @@ . This package contains the documentation for the libosmovty library. -Package: libosmoctrl1 +Package: libosmoctrl2 Section: libs Architecture: any Multi-Arch: same @@ -259,7 +259,7 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmoctrl1 library in particular contains an SNMP-like status interface. + The libosmoctrl2 library in particular contains an SNMP-like status interface. Package: libosmosim0 Section: libs diff --git a/debian/libosmocodec0.install b/debian/libosmocodec1.install similarity index 100% rename from debian/libosmocodec0.install rename to debian/libosmocodec1.install diff --git a/debian/libosmocoding0.install b/debian/libosmocoding1.install similarity index 100% rename from debian/libosmocoding0.install rename to debian/libosmocoding1.install diff --git a/debian/libosmocore9.install b/debian/libosmocore10.install similarity index 100% rename from debian/libosmocore9.install rename to debian/libosmocore10.install diff --git a/debian/libosmoctrl1.install b/debian/libosmoctrl2.install similarity index 100% rename from debian/libosmoctrl1.install rename to debian/libosmoctrl2.install diff --git a/src/Makefile.am b/src/Makefile.am index 2641a97..60b76b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=9:0:0 +LIBVERSION=10:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index f77d910..60fce5e 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index dcbbd8f..a17e3d1 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION = 0:0:0 +LIBVERSION = 1:0:1 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 2bda5b7..71cc9a3 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:0:1 +LIBVERSION=2:0:2 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 869e12d..ebf4739 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:1:0 +LIBVERSION=0:2:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 7b5e1e5..18d3a84 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:0 +LIBVERSION=4:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/7977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22d6be1427b126edcd43ae0ae70fd9696108184b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 16:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 2 May 2018 16:14:44 +0000 Subject: libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Patch Set 6: Code-Review+1 Looks good. I'll test and let you know ;) -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 16:42:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 2 May 2018 16:42:28 +0000 Subject: [PATCH] osmo-trx[master]: doc: add example config for usrp B200 series Message-ID: Review at https://gerrit.osmocom.org/7978 doc: add example config for usrp B200 series Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b --- A doc/examples/osmo-trx-usrp_b200.cfg 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/78/7978/1 diff --git a/doc/examples/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-usrp_b200.cfg new file mode 100644 index 0000000..1d6656e --- /dev/null +++ b/doc/examples/osmo-trx-usrp_b200.cfg @@ -0,0 +1,20 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging level all info +! +line vty + no login +! +trx + bind-ip 127.0.0.1 + remote-ip 127.0.0.1 + base-port 5700 + egprs disable + tx-sps 4 + rx-sps 4 + clock-ref external + chan 0 + -- To view, visit https://gerrit.osmocom.org/7978 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Wed May 2 16:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 16:43:41 +0000 Subject: osmo-trx[master]: doc: add example config for usrp B200 series In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/7978 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 16:44:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 16:44:39 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7979 Bump version: 1.1.0.90-5468-dirty ? 1.2.0 Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a --- M configure.ac M debian/changelog M debian/control R debian/libgtp3.install M gtp/Makefile.am 5 files changed, 15 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/79/7979/1 diff --git a/configure.ac b/configure.ac index b9073e9..62812ae 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ [enable_gtp_linux="$enableval"], [enable_gtp_linux="no"]) AS_IF([test "x$enable_gtp_linux" = "xyes"], [ - PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.0.0]) + PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.2.0]) ]) AM_CONDITIONAL([ENABLE_GTP_KERNEL], [test "$enable_gtp_linux" = "yes"]) @@ -135,9 +135,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index 47e02f1..303c826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-ggsn (1.2.0) unstable; urgency=medium + + * libgtp: Changes in tun_new, Add gtp_kernel APIs. + + -- Harald Welte Wed, 02 May 2018 18:41:11 +0200 + osmo-ggsn (1.1.0) unstable; urgency=medium * libgtp: pdp.h: Addition of new tx_gpdu_seq struct member member diff --git a/debian/control b/debian/control index f31248e..c8aa0b7 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp2 +Package: libgtp3 Architecture: any Multi-Arch: same Section: libs @@ -41,7 +41,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp2 (= ${binary:Version}) + libgtp3 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -54,7 +54,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -65,7 +65,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp2.install b/debian/libgtp3.install similarity index 100% rename from debian/libgtp2.install rename to debian/libgtp3.install diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a0ff0a..7a41a88 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=3:0:0 lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h @@ -11,7 +11,3 @@ libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libgtp_la_LIBADD = $(LIBOSMOCORE_LIBS) - - - - -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 16:47:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 16:47:19 +0000 Subject: =?UTF-8?Q?osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Fails because libosmocore and libgtpnl release patches need to be merged first. -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 17:02:02 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 2 May 2018 17:02:02 +0000 Subject: [PATCH] osmo-sgsn[master]: GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is ... Message-ID: Review at https://gerrit.osmocom.org/7980 GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is unknown Change-Id: I1d1cf64500f1295ab58d157d4d4dab16fcddbbf3 --- M src/gprs/gprs_gmm.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/80/7980/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 28fba71..93d64a4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1933,6 +1933,13 @@ if (gh->msg_type == GSM48_MT_GMM_DETACH_ACK) return gprs_llgmm_unassign(llme); + /* Don't reply to deatch requests, reason power off */ + if (gh->msg_type == GSM48_MT_GMM_DETACH_REQ && + gh->data[0] & 0x8) { + return 0; + } + + gprs_llgmm_reset(llme); /* Don't force it into re-attachment */ -- To view, visit https://gerrit.osmocom.org/7980 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d1cf64500f1295ab58d157d4d4dab16fcddbbf3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 17:43:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 17:43:09 +0000 Subject: [PATCH] libosmo-abis[master]: git-version-gen: Check first for new tag format Message-ID: Review at https://gerrit.osmocom.org/7981 git-version-gen: Check first for new tag format Tags starting with "v*" are old ones. We first want to check for the new ones, otherwise the wrong tag is selected as the last one. Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84 --- M git-version-gen 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/81/7981/1 diff --git a/git-version-gen b/git-version-gen index 42cf3d2..2a9abb5 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,8 +93,8 @@ then : # use $v elif - v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + v=`git describe --abbrev=4 HEAD 2>/dev/null \ + || git describe --abbrev=4 --match='v*' HEAD 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/7981 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 17:43:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 17:43:10 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7982 Bump version: 0.4.0.21-60fd-dirty ? 0.5.0 Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmotrau3.install M src/Makefile.am 6 files changed, 15 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/7982/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b02e1eb..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmotrau addition New osmo_rtp_set_source_desc() wrapper around libortp diff --git a/configure.ac b/configure.ac index 05fbb12..0aca550 100644 --- a/configure.ac +++ b/configure.ac @@ -59,9 +59,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/debian/changelog b/debian/changelog index 13c0996..3000e12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmo-abis (0.5.0) unstable; urgency=medium + + * libosmotrau: addition: New osmo_rtp_set_source_desc() wrapper around + libortp + + -- Holger Hans Peter Freyther Wed, 02 May 2018 19:41:04 +0200 + libosmo-abis (0.4.0) unstable; urgency=medium * Move forward towards a new release. diff --git a/debian/control b/debian/control index dd958c8..bea0009 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau3 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one @@ -40,7 +40,7 @@ It also implements drivers for mISDN and DAHDI based E1 cards, as well as some A-bis/IP dialects. -Package: libosmotrau1 +Package: libosmotrau3 Section: libs Architecture: any Multi-Arch: same @@ -58,7 +58,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmotrau1 (= ${binary:Version}), + libosmotrau3 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis @@ -72,7 +72,7 @@ Section: debug Priority: extra Depends: libosmoabis5 (= ${binary:Version}), - libosmotrau1 (= ${binary:Version}), + libosmotrau3 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis diff --git a/debian/libosmotrau1.install b/debian/libosmotrau3.install similarity index 100% rename from debian/libosmotrau1.install rename to debian/libosmotrau3.install diff --git a/src/Makefile.am b/src/Makefile.am index 7395d17..ab42d38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html ABIS_LIBVERSION=6:0:0 -TRAU_LIBVERSION=2:0:0 +TRAU_LIBVERSION=3:0:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 17:57:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 17:57:02 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E114-33c5-dirty_=E2=86=92_0=2E5=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7983 Bump version: 0.4.0.114-33c5-dirty ? 0.5.0 Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e --- M configure.ac M debian/changelog 2 files changed, 136 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/83/7983/1 diff --git a/configure.ac b/configure.ac index 6365fcb..86b4ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.1) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/changelog b/debian/changelog index 4caccc8..01cb2e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,135 @@ +osmo-pcu (0.5.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * implement support for 3-digit MNC with leading zeros + * configure: add --enable-werror + * mslot_class: find_free_tfi(): use uint32_t to shift 1 << 31 + * mslot_class: two more: use uint32_t to shift 1 << 31 + * Revert "Use Timing Advance Index in UL assignments" + * Revert "Rewrite Packet Uplink Assignment" + * Revert "Rewrite Packet Downlink Assignment" + * configure: fix --enable-sysmocom-dsp and --with-sysmobts flags + * configure: properly quote CFLAGS in lc15 check + * Revert "Rewrite EGPRS Packet Uplink Assignment" + * use osmo_init_logging2() with proper talloc ctx + + [ Minh-Quang Nguyen ] + * PCU: Fix TA adjustment + * PCU: display TA information in TBF stats + + [ Max ] + * Remove unused parameter + * Move multislot table to separate file + * Replace '.' in counter names with ':' + * Fix compiler warning + * TBF: log timer override + * TBF: fix compiler warning in test + * TBF: expand timer logging + * vty: print class and TBFs for each MS + * DL window: constify resend_needed() function + * TBF: move EGPRS enablement into (U|D)L-TBF + * TBF-DL: fix misleading idle time check + * TBF: remove unused variable + * Remove unused includes and forward declarations + * Fix tests after rate_ctr change + * Introduce LOGTBF* for consistent logging + * TBF: implement independent T31xx timers + * TBF: add N3101 counter + * Fix warnings + * Add function to get max supported MS class + * Add --enable-sanitize configure option + * Enable sanitize for CI test + * Add tests for pcu_lsb() + * Add optional profiling support + * TBF: unify timer handling + * TBF: log timer invocation source + * TBF: bail out for unknown timers + * Fix llc_queue_size() type + * TBF-DL: mark rcvd_dl_ack() parameters as boolean + * window: move encoding into functions + * cosmetic: clarify coding scheme and puncturing + * Make TBF state private + * TBF: cleanup state flag handling + * Clarify RACH-related interfaces + * TBF-UL: add simpler test helper + * Avoid code duplication in TBF test + * TBF: move window parameters to UL/DL level + * TBF-DL: move priority computation into function + * TBF: unify EGPRS window calculation + * Don't access TBF internals in vty functions + * Fix jenkins.sh to match jenkins job axis filter + * Allocate global context for TypesTest + * Fix sanitizer build + * Rewrite EGPRS Packet Uplink Assignment + * Rewrite Packet Downlink Assignment + * Rewrite Packet Uplink Assignment + * Use Timing Advance Index in UL assignments + * Allow specifying sysmocom headers explicitly + * TBF: log source of state transitions + * jenkins.sh: Disable building doxygen for deps + * Set V_N and V_B to known initial state + * TBF: add dedicated log categories + * TBF: make UL/DL state internal + * TBF: make UL ack state internal + * TBF: make poll state internal + * TBF: adjust test log levels + * Add tests for find_multi_slots() + * AllocTest: adjust test_alloc_b() + * AllocTest: expand test output + * AllocTest: remove assumption on max MS class + * Add multislot classes from latest spec + * cosmetic: fix whitespace issue with include files + * TBF: decrease L1 logging verbosity in test + * TBF: override send function via linker option + * Simplify TS alloc: adjust allocator signatures + * Simplify TS alloc: fix allocation calls + * Simplify TS alloc: avoid TS reassignment + * Simplify TS alloc: use defines for constants + * Simplify TS alloc: adjust function signatures + * TS alloc: print suggested TRX on allocation errors + * Simplify TS alloc: internalize TRX check + * TBF: decrease logging verbosity for traffic + * TBF: add helpers for assignment type handling + * TBF: show assignment kind in vty + * vty: drop unused function + * RACH: improve single block detection + * TBF: move common test code into functions + * emu: use libosmocore definitions + * Use explicit type for pcu_lsb() + * Move paging generation into PDCH + * Move include guard to the top + * Update header includes + * Simplify TS alloc: split off RX mask computation + * Simplify TS alloc: separate capacity computation + * Simplify TS alloc: split allocation + * Simplify TS alloc: split USF/UL allocation + * Move PDCH-related functions into separate files + * Simplify TS alloc: don't use PDCH for free TFI + * Simplify TS alloc: constify max dl slot func + * TBF: make network counters internal + * Simplify TS alloc: move slot assignment + * Simplify TS alloc: move slot check into functions + + [ Pau Espin Pedrol ] + * Print error cause of pcu socket connect failure + * gprs_bssgp_pcu.cpp: Comment unused function parse_ra_cap + + [ Stefan Sperling ] + * Make osmo-pcu wait for BTS to become available at start-up time. + + [ Alexander Couzens ] + * pcuif_proto.h: fix whitespaces and indention + * pcuif_proto: add version 8 features + + [ Philipp Maier ] + * cosmetic: remove runaway semicolon + * pcu_l1_if: add frame number to log output + * tbf: add frame number to log output + + -- Pau Espin Pedrol Wed, 02 May 2018 19:54:59 +0200 + osmo-pcu (0.4.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] -- To view, visit https://gerrit.osmocom.org/7983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 18:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 18:19:48 +0000 Subject: [PATCH] osmo-trx[master]: git-version-gen: Take into account tags not in master Message-ID: Review at https://gerrit.osmocom.org/7984 git-version-gen: Take into account tags not in master Latest tag 0.3.0 was created in a release branch instead of master. As a result, git describe doesn't show them. Let's instead reuse git command used in osmo-ci to get latest tag from tag list when OBS latest repository is built. Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27 --- M git-version-gen 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/84/7984/1 diff --git a/git-version-gen b/git-version-gen index 42cf3d2..51d4bf7 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,8 +93,7 @@ then : # use $v elif - v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/7984 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 18:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 18:19:48 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0-dirty_=E2=86=92_0=2E4=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7985 Bump version: 0.3.0-dirty ? 0.4.0 Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad --- M configure.ac M debian/changelog 2 files changed, 122 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/85/7985/1 diff --git a/configure.ac b/configure.ac index 2b2dab7..5f66225 100644 --- a/configure.ac +++ b/configure.ac @@ -74,9 +74,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index ec65036..cd99970 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,122 @@ +osmo-trx (0.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + + [ Harald Welte ] + * SocketsTest: Fix printing of non-nul-terminated string + * Revert "debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb" + * debian/control: Remove "Maintainer" from binary package section + * debian/rules: Make sure we always require libusrp + * debian: Ensure USRP1 firmware is part of osmo-trx-usrp1 + * debian/control: Add build dependency to libusrp-dev + * update .gitignore for new executable names + * osmo-trx: s/GSM Core Address/GSM BTS Address/ + + [ Piotr Krysik ] + * UHDDevice.cpp: add USRP B205mini support + + [ Max ] + * Mark release target as virtual + * Remove outdated references to OpenBTS + * Remove unused headers + * Update installation instructions + * Update legal disclaimer + * Update license notes + * tests: null-terminate buffer + + [ Pau Espin Pedrol ] + * cosmetic: Remove trailing whitespace + * Logger: Stop using Log.Alarms.Max from config + * Logger: Stop using Log.File and Log.Level from config + * Drop use of ConfigurationTable gConfig + * Remove Configuration module and libsqlite dependency + * cosmetic: AUTHORS: fix trailing whitespace + * Set up GNU Autotest infrastructure + * tests: InterThread: adapt to have reproducible output and enable autotest + * tests: Timeval: adapt to have reproducible output and enable autotest + * tests: Log: adapt to have reproducible output and enable autotest + * Sockets.cpp: Fix initialization of UDD socket + * tests: Sockets: adapt to have reproducible output and enable autotest + * utils/convolvtest: Remove uneeded libosmocore dependency + * Move ARCH_LA to Makefile.common + * tests: Migrate convtest util to autotest infrastructure + * arm/convert.c: Fix compilation error + * arm/convert.c: Add missing convert_init implementation + * .gitignore: Add missing test related files + * Remove UDDSocket class + * tests: SocketTests: Pick OS-assigned instead of setting one manually + * tests: SocketsTest: Avoid hang forever if test fails + * tests: SocketsTest: Fail test on write fail + * tests: TimevalTest: refactor and avoid double comparison + * contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests with ARM instruction set + * tests: convolve: Disable due to difference in output in different archs + * Remove unneeded libdl dependency + * Fix whitespace + * Add support to set Rx/TxAntenna + * UHDDevice: Initialize async_event_thrd in constructor + * Logger: Drop unused gLogEarly + * Logger: Remove unused logging macros + * Logger: get rid of alarm APIs + * Logger: Drop syslog support + * Logger: Drop support to log into file + * Logger: Remove unused includes + * Logger: Remove gLogToConsole flag + * configure.ac: Check for pkg-config + * Depend on libosmocore + * osmo-trx: set up signals using libosmocore helpers + * osmo-trx: Set up talloc ctx + * debian: Depend on libtalloc and libosmocore + * Add initial support for logging, vty, ctrl + * Logger: Use libosmocore logging system + * osmo-trx.cpp: Move trx start and stop to helper functions + * Move enums required by VTY to a separate header + * vty: Implement VTY cfg parsing for current parameters + * doc: Add sample cfg file for LimeSDR + * osmo-trx: Use VTY cfg structures while still allowing cmd line options + * osmo-trx: Re-introduce -l cmd line parameter + * Makefile.am: Avoid using subdir if arch is not required + * Build Transceiver52M/common as an .la lib + * use osmo_init_logging2() + * tests: Makefile.am: Fix typo in include path + * configure.ac: Add --enable-sanitize option + * Move arch specific fiels to arch subdir + * Move device specific files to device subdir + * Change configure define USRP1 to DEVICE_USRP1 + * Move device specific code out of radioInterface + * Transceiver: Move device specific code to radioDevice class + * Build one osmo-trx binary for each device support enabled + * Logger: Print correct source file and line number + * Transceiver: log timing info of stale bursts + * build: Fix make distcheck + * build: More OBS build failure fixes + * jenkins.sh: Enable build of osmo-trx-usrp1 + * debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb + * debian: Fix OBS build + * build: Fix OBS build for ARM + * git-version-gen: Take into account tags not in master + + [ Alexander Huemer ] + * Unbreak `./configure --with-usrp1` build + * Fix USRP1 build with support for setting Rx/TxAntenna + + [ Alexander Couzens ] + * jenkins.sh: fix the download url if the qemu image wasn't setup + * jenkins.sh: cleanup always the workspace + * jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of /opt/qemu-img + + [ Vadim Yanitskiy ] + * Transceiver.cpp: use a define for the MAX_PACKET_LENGTH + * Transceiver.cpp: properly zero-terminate received commands + * Transceiver.cpp: use pointer arithmetics for CMD parsing + * Transceiver.cpp: fix incorrect format string for SETTSC + * Transceiver.cpp: prevent out-of-range array access + + [ Martin Hauke ] + * configure.ac: Fix typo + + -- Pau Espin Pedrol Wed, 02 May 2018 20:16:34 +0200 + osmo-trx (0.2.0) unstable; urgency=medium [ Alexander Chemeris ] -- To view, visit https://gerrit.osmocom.org/7985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 18:40:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 2 May 2018 18:40:54 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E38-93c5-dirty_=E2=86=92_0=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/7986 Bump version: 0.1.0.38-93c5-dirty ? 0.2.0 Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 --- M configure.ac M debian/changelog 2 files changed, 61 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/86/7986/1 diff --git a/configure.ac b/configure.ac index 723c43f..a632a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 7d8b208..be463d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,59 @@ +osmo-hlr (0.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * hlr_db_tool: fix error log strerror invocation + * cosmetic: add comment on ignored return value + * db-tool: add command 'create' + * db-tool: cosmetic: tweak printf output + * db-tool: error-exit on too many arguments + * add --enable-sanitize config option + * db_test: don't verify SQLite issued error messages, they might change + * cosmetic: rx_send_auth_info(): decide error cause with switch() + * return GMM_CAUSE_IMSI_UNKNOWN if there is no auth data + * db_get_auth_data / db_get_auc: clarify return values + * osmo-hlr: log details for unknown IMSI / no auth data / db error + * db_test: also test db_get_auc() return values + * fix test_subscriber_errors.ctrl after libosmocore change + * fix debug log: put 'deriving 2G from 3G' in proper place + * ctrl test: fix: adjust expectations after stricter ctrl parsing + * fix build: db_test: missing LIBOSMOABIS_CFLAGS and _LIBS + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * hlr.c: Avoid overflow of lu_operation.subscr.imsi + * Fix expected test output after new 'logging print file 1' vty command + * osmo-hlr: Add talloc context introspection via VTY + * vty: Don't print error if removing auth data while none present + * Fix responses to PURGE MS + + [ Alexander Couzens ] + * debian: include systemd service osmo-hlr.service + * doc: install example .cfg files to $(docdir)/examples/ + * debian: install osmo-hlr.cfg to /etc/osmocom + + [ Max ] + * Remove unused check + * Remove unused ipa.py + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * luop.c: Transform FIXME from warning to pragma message + * contrib:jenkins.sh: Enable Werror + * use osmo_init_logging2 + * Remove unused src/db_test.c + + [ Alexander Huemer ] + * Add missing build products in .gitignore + + [ Stefan Sperling ] + * more robust usage of osmo_timer API for osmo-hlr luop timer + * notify GSUP clients when HLR subscriber information changes + * rewrite subscriber_update_notify() without calls into luop + + -- Pau Espin Pedrol Wed, 02 May 2018 20:39:19 +0200 + osmo-hlr (0.1.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/7986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 21:17:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:17:42 +0000 Subject: osmo-ci[master]: jobs: Osmocom_latest_packages: change node to obs In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7971 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:17:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:17:56 +0000 Subject: osmo-ci[master]: jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7972 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:18:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:18:04 +0000 Subject: osmo-ci[master]: jobs: osmocom-obs: introduce template var type In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7973 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I315215eb1d5ade257262d0717711c11f3787319f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:18:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:18:12 +0000 Subject: osmo-ci[master]: jobs: osmocom-obs: add support for the nightly build In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7974 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:18:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:18:21 +0000 Subject: osmo-ci[master]: jobs: remove old job Osmocom_nightly_nitb_split In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7975 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:18:41 +0000 Subject: libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:19:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:19:07 +0000 Subject: [MERGED] libosmocore[master]: gsm_utils: call gnutls_global_init() as constructor In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: gsm_utils: call gnutls_global_init() as constructor ...................................................................... gsm_utils: call gnutls_global_init() as constructor gnutls_global_init must be called at least once for gnutls < 3.3.0. It doesn't hurt calling it twice, except a reference counter is increased. gnutls >= 3.3.0 will call it automatic. Fixes: OS#2986 Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 --- M src/gsm/gsm_utils.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 5d8c834..7e6c794 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -112,6 +112,25 @@ #pragma message ("including GnuTLS for getrandom fallback.") #include #include + +/* gnutls < 3.3.0 requires global init. + * gnutls >= 3.3.0 does it automatic. + * It doesn't hurt calling it twice, + * as long it's not done at the same time (threads). + */ +__attribute__((constructor)) +static void on_dso_load_gnutls(void) +{ + if (!gnutls_check_version("3.3.0")) + gnutls_global_init(); +} + +__attribute__((destructor)) +static void on_dso_unload_gnutls(void) +{ + if (!gnutls_check_version("3.3.0")) + gnutls_global_deinit(); +} #endif /* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet -- To view, visit https://gerrit.osmocom.org/7904 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Wed May 2 21:19:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:19:23 +0000 Subject: libosmocore[master]: osmo-release.sh: Remove temporary file TODO-RELEASE.entries ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7968 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1cac39093d43910c2f5b969f5287cf3678110f4e Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:19:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:19:30 +0000 Subject: libosmocore[master]: osmo-release.sh: Exit with error if no description for new c... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7969 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I17894f669e6d3d6d31203a4522dce7fa01da323f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:19:43 +0000 Subject: libosmocore[master]: osmo-release.sh: Fix error condition no LIBVERSION modified In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7970 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2320d6ee29cd528e55c0609be1af350655123b85 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:20:03 +0000 Subject: =?UTF-8?Q?libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E282-f8ca-dirty_=E2=86=92_0=2E11=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 let's please make sure Change-Id I241b6ae5aa8df13dd78f04658cf0953e9561c9e2 is part of the release. thanks! -- To view, visit https://gerrit.osmocom.org/7977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I22d6be1427b126edcd43ae0ae70fd9696108184b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:20:33 +0000 Subject: libosmo-abis[master]: git-version-gen: Check first for new tag format In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7981 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:20:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:20:40 +0000 Subject: [MERGED] libosmo-abis[master]: git-version-gen: Check first for new tag format In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: git-version-gen: Check first for new tag format ...................................................................... git-version-gen: Check first for new tag format Tags starting with "v*" are old ones. We first want to check for the new ones, otherwise the wrong tag is selected as the last one. Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84 --- M git-version-gen 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/git-version-gen b/git-version-gen index 42cf3d2..2a9abb5 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,8 +93,8 @@ then : # use $v elif - v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + v=`git describe --abbrev=4 HEAD 2>/dev/null \ + || git describe --abbrev=4 --match='v*' HEAD 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/7981 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic39bed2fcf7e3ccb6a83e2999d29d129e07c1a84 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:20:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:20:49 +0000 Subject: =?UTF-8?Q?libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:27 +0000 Subject: libgtpnl[master]: configure.ac: Depend on osmo-release.mk In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7964 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5d163535c34369c74ece26574c8b1601bc1697b7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:38 +0000 Subject: libgtpnl[master]: debian/changelog: Set latest release as unstable In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7965 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iedd8311303274dd3be88a11314a61fbdd511679d Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:48 +0000 Subject: libgtpnl[master]: configure.ac: Use git-version-gen to set VERSION In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id6535719321c8bb690936b5ae3ddcb9d8a9aa4d7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:53 +0000 Subject: =?UTF-8?Q?libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E5-b1ad-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7967 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4b72bfb1c9c2413e84e9d8a1c5ebc19d476aada1 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:56 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libgtpnl=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E5-b1ad-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 1.1.0.5-b1ad-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.5-b1ad-dirty ? 1.2.0 Change-Id: I4b72bfb1c9c2413e84e9d8a1c5ebc19d476aada1 --- M debian/changelog M src/Makefile.am 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 851dee5..6499958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgtpnl (1.2.0) unstable; urgency=medium + + * Fix CTRL_ATTR_FAMILY_ID attribute size + + -- Harald Welte Wed, 02 May 2018 16:37:14 +0200 + libgtpnl (1.1.0) unstable; urgency=medium * Add genl_socket_close() function diff --git a/src/Makefile.am b/src/Makefile.am index 5490e42..a87c5cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=1:0:1 +LIBVERSION=1:1:1 lib_LTLIBRARIES = libgtpnl.la -- To view, visit https://gerrit.osmocom.org/7967 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b72bfb1c9c2413e84e9d8a1c5ebc19d476aada1 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:56 +0000 Subject: [MERGED] libgtpnl[master]: configure.ac: Use git-version-gen to set VERSION In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Use git-version-gen to set VERSION ...................................................................... configure.ac: Use git-version-gen to set VERSION Change-Id: Id6535719321c8bb690936b5ae3ddcb9d8a9aa4d7 --- M configure.ac A git-version-gen 2 files changed, 154 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 19e07b2..f7580e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libgtpnl], [1.1.0]) +AC_INIT([libgtpnl], + m4_esyscmd([./git-version-gen .tarball-version]), + [osmocom-net-gprs at lists.osmocom.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/7966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6535719321c8bb690936b5ae3ddcb9d8a9aa4d7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:56 +0000 Subject: [MERGED] libgtpnl[master]: debian/changelog: Set latest release as unstable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/changelog: Set latest release as unstable ...................................................................... debian/changelog: Set latest release as unstable It was left as UNRELEASED but it was actually released (there's a tag on it). Otherwise osmo-release.mk is fooled. Change-Id: Iedd8311303274dd3be88a11314a61fbdd511679d --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 69b49ae..851dee5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libgtpnl (1.1.0) UNRELEASED; urgency=medium +libgtpnl (1.1.0) unstable; urgency=medium * Add genl_socket_close() function * Add contrib/jenkins.sh for jenkins build verification -- To view, visit https://gerrit.osmocom.org/7965 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedd8311303274dd3be88a11314a61fbdd511679d Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:21:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:21:57 +0000 Subject: [MERGED] libgtpnl[master]: configure.ac: Depend on osmo-release.mk In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Depend on osmo-release.mk ...................................................................... configure.ac: Depend on osmo-release.mk The osmo-release.mk script can be found in libosmocore and it is used in most osmocom related projects to help create new releases. LIBVERSION is moved to src/Makefile.am since osmo-release.mk greps for Makefile.am to find LIBVERSIOn changes. In any case, we don't need in the global include makefile. Change-Id: I5d163535c34369c74ece26574c8b1601bc1697b7 --- M Make_global.am M Makefile.am M TODO-RELEASE M configure.ac M src/Makefile.am 5 files changed, 21 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Make_global.am b/Make_global.am index 4037ac1..f2cb36c 100644 --- a/Make_global.am +++ b/Make_global.am @@ -1,24 +1,2 @@ -# This is _NOT_ the library release version, it's an API version. -# Extracted from Chapter 6 "Library interface versions" of the libtool docs. -# -# -# Here are a set of rules to help you update your library version information: -# -# 1. Start with version information of `0:0:0' for each libtool library. -# 2. Update the version information only immediately before a public release -# of your software. More frequent updates are unnecessary, and only guarantee -# that the current interface number gets larger faster. -# 3. If the library source code has changed at all since the last update, -# then increment revision (`c:r:a' becomes `c:r+1:a'). -# 4. If any interfaces have been added, removed, or changed since the last -# update, increment current, and set revision to 0. -# 5. If any interfaces have been added since the last public release, then -# increment age. -# 6. If any interfaces have been removed since the last public release, then -# set age to 0. -# -# -LIBVERSION=1:0:1 - AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff --git a/Makefile.am b/Makefile.am index deb3299..1fabe69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/Make_global.am + at RELMAKE@ + ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src include tools diff --git a/TODO-RELEASE b/TODO-RELEASE index e69de29..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac index f70ead0..19e07b2 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,10 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/src/Makefile.am b/src/Makefile.am index 53adda7..5490e42 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,10 @@ include $(top_srcdir)/Make_global.am + +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +LIBVERSION=1:0:1 + + lib_LTLIBRARIES = libgtpnl.la noinst_HEADERS = internal.h -- To view, visit https://gerrit.osmocom.org/7964 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d163535c34369c74ece26574c8b1601bc1697b7 Gerrit-PatchSet: 1 Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:22:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:22:29 +0000 Subject: osmo-pcu[master]: improve documentation of Encoding::write_paging_request() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7962 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia5bf3f7f8846198b7b4e25ff1accf6206764be74 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:22:34 +0000 Subject: [MERGED] osmo-pcu[master]: improve documentation of Encoding::write_paging_request() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: improve documentation of Encoding::write_paging_request() ...................................................................... improve documentation of Encoding::write_paging_request() Add pointers to relevant parts of the spec. Tweak comments to be more specific about the values being written and abbreviations used. Change-Id: Ia5bf3f7f8846198b7b4e25ff1accf6206764be74 --- M src/encoding.cpp 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/encoding.cpp b/src/encoding.cpp index b2da1e8..1f96458 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -609,7 +609,7 @@ pda_r99->Exist_COMPACT_ReducedMA = 0; } -/* generate paging request */ +/* Generate paging request. See 44.018, sections 10 and 9.1.22 */ int Encoding::write_paging_request(bitvec * dest, uint8_t *ptmsi, uint16_t ptmsi_len) { unsigned wp = 0; @@ -617,7 +617,7 @@ bitvec_write_field(dest, &wp,0x0,4); // Skip Indicator bitvec_write_field(dest, &wp,0x6,4); // Protocol Discriminator - bitvec_write_field(dest, &wp,0x21,8); // Paging Request Message Type + bitvec_write_field(dest, &wp,0x21,8); // Paging Request Message Type 1 bitvec_write_field(dest, &wp,0x0,4); // Page Mode bitvec_write_field(dest, &wp,0x0,4); // Channel Needed @@ -636,7 +636,7 @@ "multiple of 8 bits, PLEASE FIX!\n"); plen = wp / 8; - bitvec_write_field(dest, &wp,0x0,1); // "L" NLN(PCH) = off + bitvec_write_field(dest, &wp,0x0,1); // "L" Notification List Number; NLN(PCH) = off bitvec_write_field(dest, &wp,0x0,1); // "L" Priority1 = off bitvec_write_field(dest, &wp,0x1,1); // "L" Priority2 = off bitvec_write_field(dest, &wp,0x0,1); // "L" Group Call information = off -- To view, visit https://gerrit.osmocom.org/7962 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5bf3f7f8846198b7b4e25ff1accf6206764be74 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:23:06 +0000 Subject: osmo-bsc[master]: cosmetic: Add note about libosmo-legacy-mgcp to configure.ac In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7963 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia496bd9ec02c0028aa541a798b1358a68ad18e21 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:23:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:23:12 +0000 Subject: [MERGED] osmo-bsc[master]: cosmetic: Add note about libosmo-legacy-mgcp to configure.ac In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: cosmetic: Add note about libosmo-legacy-mgcp to configure.ac ...................................................................... cosmetic: Add note about libosmo-legacy-mgcp to configure.ac Change-Id: Ia496bd9ec02c0028aa541a798b1358a68ad18e21 Closes: OS#3226 --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index c74402a..a077fd5 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,9 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.2.0) + +#NOTE: osmo-bsc does not depend on libosmo-legacy-mgcp anymore, but we still +# need the dependancy for osmo-bsc-nat, which still uses the old API. PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.0.0) dnl checks for header files -- To view, visit https://gerrit.osmocom.org/7963 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia496bd9ec02c0028aa541a798b1358a68ad18e21 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:23:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:23:54 +0000 Subject: osmo-ci[master]: osmocom-nightly-packages: replace version string with by git... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7976 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:24:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:24:31 +0000 Subject: osmo-trx[master]: doc: add example config for usrp B200 series In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7978 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:24:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:24:34 +0000 Subject: [MERGED] osmo-trx[master]: doc: add example config for usrp B200 series In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: doc: add example config for usrp B200 series ...................................................................... doc: add example config for usrp B200 series Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b --- A doc/examples/osmo-trx-usrp_b200.cfg 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-usrp_b200.cfg new file mode 100644 index 0000000..1d6656e --- /dev/null +++ b/doc/examples/osmo-trx-usrp_b200.cfg @@ -0,0 +1,20 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging level all info +! +line vty + no login +! +trx + bind-ip 127.0.0.1 + remote-ip 127.0.0.1 + base-port 5700 + egprs disable + tx-sps 4 + rx-sps 4 + clock-ref external + chan 0 + -- To view, visit https://gerrit.osmocom.org/7978 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a80ddd9ca9b143e9c89618616f30fe3f3547d7b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 2 21:25:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:25:40 +0000 Subject: =?UTF-8?Q?osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/7979/1/debian/changelog File debian/changelog: Line 3: * libgtp: Changes in tun_new, Add gtp_kernel APIs. I really don't think this is the entire changelog between October 2017 and May 2018... -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 21:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:26:43 +0000 Subject: =?UTF-8?Q?libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E282-f8ca-dirty_=E2=86=92_0=2E11=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/7977/1/debian/changelog File debian/changelog: Line 3: * core: msgb_queue_free(): add inline func to msgb.h also here, I somehow doubt that the changelog is complete. We're talking about 6 months of development work with 280 commits... -- To view, visit https://gerrit.osmocom.org/7977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I22d6be1427b126edcd43ae0ae70fd9696108184b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 21:28:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:28:13 +0000 Subject: =?UTF-8?Q?libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: -Code-Review (1 comment) https://gerrit.osmocom.org/#/c/7982/1/debian/changelog File debian/changelog: Line 2: 20 commits since 0.4.0. Why is there only one item mentioned. I wonder how this was sellected over all the other ones? -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 2 21:28:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:28:41 +0000 Subject: =?UTF-8?Q?osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E38-93c5-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:29:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:29:01 +0000 Subject: osmo-trx[master]: git-version-gen: Take into account tags not in master In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7984 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:29:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:29:06 +0000 Subject: [MERGED] osmo-trx[master]: git-version-gen: Take into account tags not in master In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: git-version-gen: Take into account tags not in master ...................................................................... git-version-gen: Take into account tags not in master Latest tag 0.3.0 was created in a release branch instead of master. As a result, git describe doesn't show them. Let's instead reuse git command used in osmo-ci to get latest tag from tag list when OBS latest repository is built. Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27 --- M git-version-gen 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/git-version-gen b/git-version-gen index 42cf3d2..51d4bf7 100755 --- a/git-version-gen +++ b/git-version-gen @@ -93,8 +93,7 @@ then : # use $v elif - v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + v=`git tag -l --sort=v:refname | grep "^[0-9]*.[0-9]*.[0-9]*$" | tail -n 1 2>/dev/null` \ && case $v in [0-9]*) ;; v[0-9]*) ;; -- To view, visit https://gerrit.osmocom.org/7984 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e461d4270b5e6d4c42126df4deef5651dca1e27 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:29:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:29:41 +0000 Subject: =?UTF-8?Q?osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:30:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:30:07 +0000 Subject: =?UTF-8?Q?osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E114-33c5-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:30:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:30:30 +0000 Subject: [MERGED] libosmocore[master]: osmo-release.sh: Fix error condition no LIBVERSION modified In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-release.sh: Fix error condition no LIBVERSION modified ...................................................................... osmo-release.sh: Fix error condition no LIBVERSION modified It turns out git status doesn't return an error code in any of the modified/unmodified cases. It's not clear anyway why we check TODO-RELEASE when we actually care about the file containing the LIBVERSION (non-)change. Change-Id: I2320d6ee29cd528e55c0609be1af350655123b85 --- M osmo-release.sh 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index 7ae4da0..0e85023 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -40,11 +40,8 @@ grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE if [ "z$MAKEMOD" = "z" ]; then - git status -s -uno TODO-RELEASE - if [ $? -ne 0 ]; then - echo "Before releasing, please modify some of the libversions: $LIBVERS" - exit 1 - fi + echo "Before releasing, please modify some of the libversions: $LIBVERS" + exit 1 fi xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" rm TODO-RELEASE.entries -- To view, visit https://gerrit.osmocom.org/7970 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2320d6ee29cd528e55c0609be1af350655123b85 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:30:31 +0000 Subject: [MERGED] libosmocore[master]: osmo-release.sh: Exit with error if no description for new c... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-release.sh: Exit with error if no description for new changelog entry provided ...................................................................... osmo-release.sh: Exit with error if no description for new changelog entry provided If no line is provided, then the xargs line doesn't call dch (due to -r param) and as a result no new version entry is created in the log, and the old one is updated. Change-Id: I17894f669e6d3d6d31203a4522dce7fa01da323f --- M osmo-release.sh 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index fbaf63d..7ae4da0 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -32,6 +32,11 @@ echo "You should NOT be doing this unless you've read and understood following article:" echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" grep -v '#' TODO-RELEASE | sed 's/\t\+/: /g' > TODO-RELEASE.entries + if [ "$(wc -l /dev/null)" -eq "0" ]; then + rm TODO-RELEASE.entries + echo "TODO-RELEASE must contain at least one line with change descriptions" + exit 1 + fi grep '#' TODO-RELEASE > TODO-RELEASE.clean mv TODO-RELEASE.clean TODO-RELEASE if [ "z$MAKEMOD" = "z" ]; then -- To view, visit https://gerrit.osmocom.org/7969 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17894f669e6d3d6d31203a4522dce7fa01da323f Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:30:31 +0000 Subject: [MERGED] libosmocore[master]: osmo-release.sh: Remove temporary file TODO-RELEASE.entries ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-release.sh: Remove temporary file TODO-RELEASE.entries after use ...................................................................... osmo-release.sh: Remove temporary file TODO-RELEASE.entries after use Change-Id: I1cac39093d43910c2f5b969f5287cf3678110f4e --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index ed40d0b..fbaf63d 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -42,6 +42,7 @@ fi fi xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" + rm TODO-RELEASE.entries fi dch -r -m --distribution "unstable" "" git add -u -- To view, visit https://gerrit.osmocom.org/7968 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cac39093d43910c2f5b969f5287cf3678110f4e Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 2 21:31:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:31:11 +0000 Subject: osmo-sgsn[master]: GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7980 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1d1cf64500f1295ab58d157d4d4dab16fcddbbf3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 2 21:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 2 May 2018 21:31:17 +0000 Subject: [MERGED] osmo-sgsn[master]: GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is unknown ...................................................................... GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is unknown Change-Id: I1d1cf64500f1295ab58d157d4d4dab16fcddbbf3 --- M src/gprs/gprs_gmm.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 28fba71..93d64a4 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1933,6 +1933,13 @@ if (gh->msg_type == GSM48_MT_GMM_DETACH_ACK) return gprs_llgmm_unassign(llme); + /* Don't reply to deatch requests, reason power off */ + if (gh->msg_type == GSM48_MT_GMM_DETACH_REQ && + gh->data[0] & 0x8) { + return 0; + } + + gprs_llgmm_reset(llme); /* Don't force it into re-attachment */ -- To view, visit https://gerrit.osmocom.org/7980 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d1cf64500f1295ab58d157d4d4dab16fcddbbf3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From jenkins at lists.osmocom.org Wed May 2 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 2 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#22?= In-Reply-To: <1019174913.266.1525214480617.JavaMail.jenkins@jenkins.osmocom.org> References: <1019174913.266.1525214480617.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1220530372.319.1525300880577.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-17422/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-17422/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-17422/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-17422/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-17422/ libtool: install: (cd /tmp/am-dc-17422/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-17422/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-17422/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-17422/ libtool: install: chmod 644 /tmp/am-dc-17422/ libtool: install: ranlib /tmp/am-dc-17422/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-17422/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-17422/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-17422/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-17422/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-17422/ /bin/mkdir -p '/tmp/am-dc-17422/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-17422/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-17422/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-17422/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-17422/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-17422/ libtool: uninstall: rm -f /tmp/am-dc-17422/ /tmp/am-dc-17422/ /tmp/am-dc-17422/ /tmp/am-dc-17422/ /tmp/am-dc-17422/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-17422/ && rm -f html.tar ) ( cd '/tmp/am-dc-17422/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-17422/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Thu May 3 00:07:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 3 May 2018 00:07:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1943?= Message-ID: <140971427.321.1525306071857.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 10.26 KB...] checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... /usr/bin/doxygen checking whether SYS_getrandom is declared... no checking if gcc supports -fvisibility=hidden... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.10.2.283-0b0f > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmocore' Making install in include make[2]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/core/bit16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc32gen.h make[4]: Entering directory '/build/deps/libosmocore/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/include' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h osmocom/core/statistics.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/coding' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h '/build/deps/install/stow/libosmocore/include/osmocom/coding' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/vty' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h '/build/deps/install/stow/libosmocore/include/osmocom/vty' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/sim' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h '/build/deps/install/stow/libosmocore/include/osmocom/sim' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/codec' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h '/build/deps/install/stow/libosmocore/include/osmocom/codec' make[4]: Leaving directory '/build/deps/libosmocore/include' make[3]: Leaving directory '/build/deps/libosmocore/include' make[2]: Leaving directory '/build/deps/libosmocore/include' Making install in src make[2]: Entering directory '/build/deps/libosmocore/src' GEN crc32gen.c GEN crc8gen.c GEN crc16gen.c GEN crc64gen.c make install-am make[3]: Entering directory '/build/deps/libosmocore/src' CC timer.lo CC timer_clockgettime.lo CC select.lo CC timer_gettimeofday.lo CC bitvec.lo CC bits.lo CC signal.lo CC msgb.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo /bin/bash: line 2: 4338 Segmentation fault (core dumped) /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT logging_syslog.lo -MD -MP -MF $depbase.Tpo -c -o logging_syslog.lo logging_syslog.c Makefile:534: recipe for target 'logging_syslog.lo' failed make[3]: *** [logging_syslog.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/deps/libosmocore/src' Makefile:638: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/libosmocore/src' make[2]: *** [install] Error 2 Makefile:588: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:887: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu May 3 00:58:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 3 May 2018 00:58:15 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1944?= In-Reply-To: <140971427.321.1525306071857.JavaMail.jenkins@jenkins.osmocom.org> References: <140971427.321.1525306071857.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <538408529.322.1525309095409.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu May 3 02:39:44 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 3 May 2018 02:39:44 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi Message-ID: Review at https://gerrit.osmocom.org/7987 sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi Change-Id: I544a626d914075c0fcf13017553017b898525e8c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/7987/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 912a507..bccee7f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -80,7 +80,7 @@ type record BSSGP_ConnHdlrPars { /* IMEI of the simulated ME */ hexstring imei, - /* IMEI of the simulated MS */ + /* IMSI of the simulated MS */ hexstring imsi, /* MSISDN of the simulated MS (probably unused) */ hexstring msisdn, -- To view, visit https://gerrit.osmocom.org/7987 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I544a626d914075c0fcf13017553017b898525e8c Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Thu May 3 02:39:45 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 3 May 2018 02:39:45 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: sgsn: add test for attach_second_attempt Message-ID: Review at https://gerrit.osmocom.org/7988 sgsn: add test for attach_second_attempt Do an attach direct after an attach succeeded. Relates: OS#2958 Change-Id: I767c3e3b0af6e7c6a1f9436fd17e2f515b0bbd05 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/7988/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index bccee7f..adf87f2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1228,6 +1228,24 @@ vc_conn.done; } +/* ATTACH + ATTACH (2nd) */ +private function f_TC_attach_forget_tlli_attach(charstring id) runs on BSSGP_ConnHdlr { + g_pars.t_guard := 5.0; + + /* first perform regular attach */ + f_TC_attach(id); + + /* second to perform regular attach */ + f_TC_attach(id); +} + + +testcase TC_attach_second_attempt() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22); + vc_conn.done; +} control { @@ -1255,6 +1273,7 @@ execute( TC_attach_pdp_act_ggsn_reject() ); execute( TC_attach_pdp_act_user_deact_mo() ); execute( TC_attach_pdp_act_user_deact_mt() ); + execute( TC_attach_second_attempt() ); } -- To view, visit https://gerrit.osmocom.org/7988 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I767c3e3b0af6e7c6a1f9436fd17e2f515b0bbd05 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Thu May 3 09:54:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 3 May 2018 09:54:34 +0000 Subject: [PATCH] libosmocore[master]: define a constant for the max length of called party BCD IE Message-ID: Review at https://gerrit.osmocom.org/7989 define a constant for the max length of called party BCD IE According to TS 24.008 10.5.4.7 the called party BSC number IE has a maximum length of 43 octets. This length is assumed inside osmo-hlr with a magic number: uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ This change makes libosmocore provide a constant which osmo-hlr can use. Change-Id: Ia0bf6ceadcac38a8c75d166402b54058e5c6c6d4 --- M include/osmocom/gsm/gsup.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/7989/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 1a8a3b2..a7fa820 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -52,6 +52,7 @@ #define OSMO_GSUP_MAX_NUM_AUTH_INFO 5 /*! Maximum number of octets encoding MSISDN in BCD format */ #define OSMO_GSUP_MAX_MSISDN_LEN 9 +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ #define OSMO_GSUP_PDP_TYPE_SIZE 2 -- To view, visit https://gerrit.osmocom.org/7989 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0bf6ceadcac38a8c75d166402b54058e5c6c6d4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Thu May 3 11:46:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 11:46:59 +0000 Subject: libosmocore[master]: define a constant for the max length of called party BCD IE In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7989 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia0bf6ceadcac38a8c75d166402b54058e5c6c6d4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 11:47:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 11:47:14 +0000 Subject: osmo-ttcn3-hacks[master]: sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7987 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I544a626d914075c0fcf13017553017b898525e8c Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 11:47:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 11:47:38 +0000 Subject: osmo-ttcn3-hacks[master]: sgsn: add test for attach_second_attempt In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7988 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I767c3e3b0af6e7c6a1f9436fd17e2f515b0bbd05 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 12:08:41 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 3 May 2018 12:08:41 +0000 Subject: [PATCH] osmo-hlr[master]: don't forget to mark luop as a packet switched connection Message-ID: Review at https://gerrit.osmocom.org/7990 don't forget to mark luop as a packet switched connection In rx_upd_loc_req() we set the connection's supports_ps field but forgot to also set the equivalent field in the corresponding luop. Change-Id: Ie175a067ac1324cdd39d7f756a40fab923421793 Related: OS#2785 --- M src/hlr.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/90/7990/1 diff --git a/src/hlr.c b/src/hlr.c index 479b5cf..195e5d2 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -262,6 +262,7 @@ * 11.6.15 "CN Domain" says "if no CN Domain IE is present within * a request, the PS Domain is assumed." */ conn->supports_ps = true; + luop->is_ps = true; } llist_add(&luop->list, &g_lu_ops); -- To view, visit https://gerrit.osmocom.org/7990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie175a067ac1324cdd39d7f756a40fab923421793 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Thu May 3 12:27:08 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 May 2018 12:27:08 +0000 Subject: [PATCH] docker-playground[master]: ttcn3-{mgw, ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh Message-ID: Review at https://gerrit.osmocom.org/7991 ttcn3-{mgw,ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh Do not brush over VOL_BASE_DIR with a new temp dir, since jenkins-common.sh has already figured out where these should run. Should fix jenkins job build failures for mgw and ggsn, after the merge of I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e. Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b --- M ttcn3-ggsn-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/7991/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 487da31..2da6aed 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -2,7 +2,6 @@ . ../jenkins-common.sh -VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 7933e1c..ee624b9 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -2,7 +2,6 @@ . ../jenkins-common.sh -VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ -- To view, visit https://gerrit.osmocom.org/7991 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:03 +0000 Subject: docker-playground[master]: ttcn3-{mgw, ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7991 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:06 +0000 Subject: docker-playground[master]: ttcn3-{mgw, ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7991 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:07 +0000 Subject: [MERGED] docker-playground[master]: ttcn3-{mgw, ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: ttcn3-{mgw,ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh ...................................................................... ttcn3-{mgw,ggsn}-test: use VOL_BASE_DIR from jenkins-common.sh Do not brush over VOL_BASE_DIR with a new temp dir, since jenkins-common.sh has already figured out where these should run. Should fix jenkins job build failures for mgw and ggsn, after the merge of I8cf6014725ae8ba602be5f3ec31dfb8e49ff993e. Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b --- M ttcn3-ggsn-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 487da31..2da6aed 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -2,7 +2,6 @@ . ../jenkins-common.sh -VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 7933e1c..ee624b9 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -2,7 +2,6 @@ . ../jenkins-common.sh -VOL_BASE_DIR=`mktemp -d` mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ -- To view, visit https://gerrit.osmocom.org/7991 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee034df93bf8e8b995262749cf4654886032af2b Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:41 +0000 Subject: osmo-hlr[master]: don't forget to mark luop as a packet switched connection In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie175a067ac1324cdd39d7f756a40fab923421793 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:43 +0000 Subject: [MERGED] osmo-hlr[master]: don't forget to mark luop as a packet switched connection In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: don't forget to mark luop as a packet switched connection ...................................................................... don't forget to mark luop as a packet switched connection In rx_upd_loc_req() we set the connection's supports_ps field but forgot to also set the equivalent field in the corresponding luop. Change-Id: Ie175a067ac1324cdd39d7f756a40fab923421793 Related: OS#2785 --- M src/hlr.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/hlr.c b/src/hlr.c index 479b5cf..195e5d2 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -262,6 +262,7 @@ * 11.6.15 "CN Domain" says "if no CN Domain IE is present within * a request, the PS Domain is assumed." */ conn->supports_ps = true; + luop->is_ps = true; } llist_add(&luop->list, &g_lu_ops); -- To view, visit https://gerrit.osmocom.org/7990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie175a067ac1324cdd39d7f756a40fab923421793 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:54 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: sgsn: add test for attach_second_attempt In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: sgsn: add test for attach_second_attempt ...................................................................... sgsn: add test for attach_second_attempt Do an attach direct after an attach succeeded. Relates: OS#2958 Change-Id: I767c3e3b0af6e7c6a1f9436fd17e2f515b0bbd05 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index bccee7f..adf87f2 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1228,6 +1228,24 @@ vc_conn.done; } +/* ATTACH + ATTACH (2nd) */ +private function f_TC_attach_forget_tlli_attach(charstring id) runs on BSSGP_ConnHdlr { + g_pars.t_guard := 5.0; + + /* first perform regular attach */ + f_TC_attach(id); + + /* second to perform regular attach */ + f_TC_attach(id); +} + + +testcase TC_attach_second_attempt() runs on test_CT { + var BSSGP_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22); + vc_conn.done; +} control { @@ -1255,6 +1273,7 @@ execute( TC_attach_pdp_act_ggsn_reject() ); execute( TC_attach_pdp_act_user_deact_mo() ); execute( TC_attach_pdp_act_user_deact_mt() ); + execute( TC_attach_second_attempt() ); } -- To view, visit https://gerrit.osmocom.org/7988 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I767c3e3b0af6e7c6a1f9436fd17e2f515b0bbd05 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 12:28:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 12:28:56 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi ...................................................................... sgsn: fix typo in comment of BSSGP_ConnHdlrPars:imsi Change-Id: I544a626d914075c0fcf13017553017b898525e8c --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 912a507..bccee7f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -80,7 +80,7 @@ type record BSSGP_ConnHdlrPars { /* IMEI of the simulated ME */ hexstring imei, - /* IMEI of the simulated MS */ + /* IMSI of the simulated MS */ hexstring imsi, /* MSISDN of the simulated MS (probably unused) */ hexstring msisdn, -- To view, visit https://gerrit.osmocom.org/7987 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I544a626d914075c0fcf13017553017b898525e8c Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 12:29:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 3 May 2018 12:29:19 +0000 Subject: [PATCH] osmo-hlr[master]: move creation of insert subscriber data messages to a common... Message-ID: Review at https://gerrit.osmocom.org/7992 move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 98 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/1 diff --git a/src/gsup_server.c b/src/gsup_server.c index 24ba738..e4329a3 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsup_server.h" @@ -351,3 +352,47 @@ /* FIXME: use real value: */ gsup->pdp_infos[0].context_id = 1; } + +struct osmo_gsup_message * +osmo_gsup_create_insert_subscriber_data_msg(char *imsi, char *msisdn, enum osmo_gsup_cn_domain cn_domain) +{ + struct osmo_gsup_message *gsup; + int len; + uint8_t *msisdn_enc; + + gsup = talloc_zero(NULL, struct osmo_gsup_message); + if (gsup == NULL) { + LOGP(DLGSUP, LOGL_ERROR, "IMSI='%s': cannot allocate Insert Subscriber Data Message\n", imsi); + return NULL; + } + gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST; + + osmo_strlcpy(gsup->imsi, imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + msisdn_enc = talloc_size(gsup, OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN); + if (msisdn_enc == NULL) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'; could not allocate buffer\n", + imsi, msisdn); + talloc_free(gsup); + return NULL; + } + len = gsm48_encode_bcd_number(msisdn_enc, OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN, 0, msisdn); + if (len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn); + talloc_free(gsup); + return NULL; + } + gsup->msisdn_enc = msisdn_enc; + gsup->msisdn_enc_len = len; + + #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" + + gsup->cn_domain = cn_domain; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(gsup); + } + + return gsup; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 3d36bff..55a8c3e 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -6,6 +6,10 @@ #include #include +#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#endif + struct osmo_gsup_conn; /* Expects message in msg->l2h */ @@ -54,3 +58,5 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); +struct osmo_gsup_message *osmo_gsup_create_insert_subscriber_data_msg(char *imsi, char *msisdn, + enum osmo_gsup_cn_domain cn_domain); diff --git a/src/hlr.c b/src/hlr.c index 195e5d2..36aad94 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -61,46 +60,28 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct osmo_gsup_message gsup = { - .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST - }; + struct osmo_gsup_message *gsup; + struct msgb *msg_out; uint8_t *peer; int peer_len; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - int len; - struct msgb *msg_out; + enum osmo_gsup_cn_domain cn_domain; - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { + if (co->supports_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else if (co->supports_cs) + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + gsup = osmo_gsup_create_insert_subscriber_data_msg(subscr->imsi, subscr->msisdn, cn_domain); + if (gsup == NULL) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "IMSI='%s': Cannot notify GSUP client; could not allocate gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - - osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); - - len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); - if (len < 1) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", - subscr->imsi, subscr->msisdn); - continue; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = len; - - if (co->supports_ps) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); - } else if (co->supports_cs) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - } else { - /* We have not yet received a location update from this subscriber .*/ continue; } @@ -112,10 +93,23 @@ "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); + talloc_free(gsup); + gsup = NULL; + continue; + } + osmo_gsup_encode(msg_out, gsup); + talloc_free(gsup); + gsup = NULL; + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_gsup_encode(msg_out, &gsup); if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " diff --git a/src/luop.c b/src/luop.c index 7150b64..2d257f3 100644 --- a/src/luop.c +++ b/src/luop.c @@ -25,7 +25,6 @@ #include #include -#include #include #include "gsup_server.h" @@ -51,6 +50,11 @@ struct msgb *msg_out; msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP"); + if (msg_out == NULL) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': Cannot encode GSUP message; could not allocate msg buffer\n", luop->subscr.imsi); + return; + } osmo_gsup_encode(msg_out, gsup); osmo_gsup_addr_send(luop->gsup_server, luop->peer, @@ -231,37 +235,29 @@ /*! Transmit Insert Subscriber Data to new VLR/SGSN */ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { - struct osmo_gsup_message gsup; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - int l; + struct hlr_subscriber *subscr = &luop->subscr; + struct osmo_gsup_message *gsup; + enum osmo_gsup_cn_domain cn_domain; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || luop->state == LU_S_CANCEL_ACK_RECEIVED); - fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST); + if (luop->is_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, - luop->subscr.msisdn); - if (l < 1) { + gsup = osmo_gsup_create_insert_subscriber_data_msg(subscr->imsi, subscr->msisdn, cn_domain); + if (gsup == NULL) { LOGP(DMAIN, LOGL_ERROR, - "%s: Error: cannot encode MSISDN '%s'\n", - luop->subscr.imsi, luop->subscr.msisdn); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + "IMSI='%s': Cannot notify GSUP client; could not allocate gsup message " + "for %s\n", subscr->imsi, luop->peer); return; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = l; - - #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" - - if (luop->is_ps) { - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); } /* Send ISD to new VLR/SGSN */ - _luop_tx_gsup(luop, &gsup); + _luop_tx_gsup(luop, gsup); + talloc_free(gsup); lu_op_statechg(luop, LU_S_ISD_SENT); osmo_timer_schedule(&luop->timer, ISD_TIMEOUT_SECS, 0); -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Thu May 3 13:27:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 May 2018 13:27:09 +0000 Subject: [PATCH] osmo-bsc[master]: resurrect meas_feed.c from openbsc.git history Message-ID: Review at https://gerrit.osmocom.org/7993 resurrect meas_feed.c from openbsc.git history meas_feed.c used to live in libmsc, to send out measurement reports to external entities for evaluation. When splitting osmo-bsc and osmo-msc from openbsc.git, meas_feed.c should have moved to osmo-bsc.git, but was dropped with libmsc. Re-add the old meas_feed.c now into libbsc. This is the latest version that existed in libmsc, and will not compile as-is here. Modifications to incorporate in the osmo-bsc build will follow with subsequent patches. Change-Id: Ic070d82e61c122061fe7297a8c5aabbbcef6b301 --- A src/libbsc/meas_feed.c 1 file changed, 168 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/7993/1 diff --git a/src/libbsc/meas_feed.c b/src/libbsc/meas_feed.c new file mode 100644 index 0000000..1e7b4cd --- /dev/null +++ b/src/libbsc/meas_feed.c @@ -0,0 +1,168 @@ +/* UDP-Feed of measurement reports */ + +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "meas_feed.h" + +struct meas_feed_state { + struct osmo_wqueue wqueue; + char scenario[31+1]; + char *dst_host; + uint16_t dst_port; +}; + + +static struct meas_feed_state g_mfs; + +static int process_meas_rep(struct gsm_meas_rep *mr) +{ + struct msgb *msg; + struct meas_feed_meas *mfm; + struct vlr_subscr *vsub; + + /* ignore measurements as long as we don't know who it is */ + if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub) + return 0; + + vsub = mr->lchan->conn->vsub; + + msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); + if (!msg) + return 0; + + /* fill in the header */ + mfm = (struct meas_feed_meas *) msgb_put(msg, sizeof(*mfm)); + mfm->hdr.msg_type = MEAS_FEED_MEAS; + mfm->hdr.version = MEAS_FEED_VERSION; + + /* fill in MEAS_FEED_MEAS specific header */ + osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi)); + osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name)); + osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); + + /* copy the entire measurement report */ + memcpy(&mfm->mr, mr, sizeof(mfm->mr)); + + /* copy channel information */ + /* we assume that the measurement report always belong to some timeslot */ + mfm->lchan_type = (uint8_t)mr->lchan->type; + mfm->pchan_type = (uint8_t)mr->lchan->ts->pchan; + mfm->bts_nr = mr->lchan->ts->trx->bts->nr; + mfm->trx_nr = mr->lchan->ts->trx->nr; + mfm->ts_nr = mr->lchan->ts->nr; + mfm->ss_nr = mr->lchan->nr; + + /* and send it to the socket */ + if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) + msgb_free(msg); + + return 0; +} + +static int meas_feed_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct lchan_signal_data *sdata = signal_data; + + if (subsys != SS_LCHAN) + return 0; + + if (signal == S_LCHAN_MEAS_REP) + process_meas_rep(sdata->mr); + + return 0; +} + +static int feed_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + return write(ofd->fd, msgb_data(msg), msgb_length(msg)); +} + +static int feed_read_cb(struct osmo_fd *ofd) +{ + int rc; + char buf[256]; + + rc = read(ofd->fd, buf, sizeof(buf)); + ofd->fd &= ~BSC_FD_READ; + + return rc; +} + +int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) +{ + int rc; + int already_initialized = 0; + + if (g_mfs.wqueue.bfd.fd) + already_initialized = 1; + + + if (already_initialized && + !strcmp(dst_host, g_mfs.dst_host) && + dst_port == g_mfs.dst_port) + return 0; + + if (!already_initialized) { + osmo_wqueue_init(&g_mfs.wqueue, 10); + g_mfs.wqueue.write_cb = feed_write_cb; + g_mfs.wqueue.read_cb = feed_read_cb; + osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + } + + if (already_initialized) { + osmo_wqueue_clear(&g_mfs.wqueue); + osmo_fd_unregister(&g_mfs.wqueue.bfd); + close(g_mfs.wqueue.bfd.fd); + /* don't set to zero, as that would mean 'not yet initialized' */ + g_mfs.wqueue.bfd.fd = -1; + } + rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM, + IPPROTO_UDP, dst_host, dst_port, + OSMO_SOCK_F_CONNECT); + if (rc < 0) + return rc; + + g_mfs.wqueue.bfd.when &= ~BSC_FD_READ; + + if (g_mfs.dst_host) + talloc_free(g_mfs.dst_host); + g_mfs.dst_host = talloc_strdup(NULL, dst_host); + g_mfs.dst_port = dst_port; + + return 0; +} + +void meas_feed_cfg_get(char **host, uint16_t *port) +{ + *port = g_mfs.dst_port; + *host = g_mfs.dst_host; +} + +void meas_feed_scenario_set(const char *name) +{ + osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); +} + +const char *meas_feed_scenario_get(void) +{ + return g_mfs.scenario; +} -- To view, visit https://gerrit.osmocom.org/7993 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic070d82e61c122061fe7297a8c5aabbbcef6b301 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 3 13:27:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 May 2018 13:27:10 +0000 Subject: [PATCH] osmo-bsc[master]: resurrect meas_feed.c: make it compile, add logging Message-ID: Review at https://gerrit.osmocom.org/7994 resurrect meas_feed.c: make it compile, add logging Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f --- M src/libbsc/Makefile.am M src/libbsc/meas_feed.c 2 files changed, 34 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/7994/1 diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 8956363..744278b 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -64,5 +64,6 @@ penalty_timers.c \ handover_decision_2.c \ bsc_subscr_conn_fsm.c \ + meas_feed.c \ $(NULL) diff --git a/src/libbsc/meas_feed.c b/src/libbsc/meas_feed.c index 1e7b4cd..2e80754 100644 --- a/src/libbsc/meas_feed.c +++ b/src/libbsc/meas_feed.c @@ -13,14 +13,12 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "meas_feed.h" +#include +#include +#include +#include +#include +#include struct meas_feed_state { struct osmo_wqueue wqueue; @@ -29,20 +27,25 @@ uint16_t dst_port; }; - -static struct meas_feed_state g_mfs; +static struct meas_feed_state g_mfs = {}; static int process_meas_rep(struct gsm_meas_rep *mr) { struct msgb *msg; struct meas_feed_meas *mfm; - struct vlr_subscr *vsub; + struct bsc_subscr *bsub; /* ignore measurements as long as we don't know who it is */ - if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub) + if (!mr->lchan) { + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending report\n"); return 0; + } + if (!mr->lchan->conn) { + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: lchan without conn, not sending report\n"); + return 0; + } - vsub = mr->lchan->conn->vsub; + bsub = mr->lchan->conn->bsub; msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); if (!msg) @@ -54,8 +57,16 @@ mfm->hdr.version = MEAS_FEED_VERSION; /* fill in MEAS_FEED_MEAS specific header */ - osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi)); - osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name)); + if (bsub) + osmo_strlcpy(mfm->imsi, bsub->imsi, sizeof(mfm->imsi)); + /* This used to be a human readable meaningful name set in the old osmo-nitb's subscriber + * database. Now we're several layers away from that (and possibly don't even have a name in + * osmo-hlr either), hence this is a legacy item now that we should leave empty ... *but*: + * here in the BSC we often don't know the subscriber's full identity information. For example, + * we might only know the TMSI, and hence would pass an empty IMSI above. So after all, feed + * bsc_subscr_name(), which possibly will feed the IMSI again, but in case only the TMSI is known + * would add that to the information set as "TMSI:0x12345678". */ + osmo_strlcpy(mfm->name, bsc_subscr_name(bsub), sizeof(mfm->name)); osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); /* copy the entire measurement report */ @@ -71,8 +82,13 @@ mfm->ss_nr = mr->lchan->nr; /* and send it to the socket */ - if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) + if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) { + LOGP(DMEAS, LOGL_ERROR, "meas_feed %s: sending measurement report failed\n", + gsm_lchan_name(mr->lchan)); msgb_free(msg); + } else + LOGP(DMEAS, LOGL_DEBUG, "meas_feed %s: sent measurement report\n", + gsm_lchan_name(mr->lchan)); return 0; } @@ -126,6 +142,7 @@ g_mfs.wqueue.write_cb = feed_write_cb; g_mfs.wqueue.read_cb = feed_read_cb; osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); } if (already_initialized) { -- To view, visit https://gerrit.osmocom.org/7994 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 3 13:27:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 May 2018 13:27:10 +0000 Subject: [PATCH] osmo-bsc[master]: resurrect meas_feed.c: vty, vty-test Message-ID: Review at https://gerrit.osmocom.org/7995 resurrect meas_feed.c: vty, vty-test At this point, meas-feed is usable again, however, osmo-bsc is not able to include the IMSI in every report like osmo-nitb did. In consequence, the meas-vis and meas-web tools are unable to handle the current measurement reports: these so far use the IMSI to list reports, and all reports without an IMSI are collapsed onto the same line, swapping values. So though osmo-bsc now sends usable measurement reports via meas-feed, two avenues to improve should be pursued: OS#3192: the visualization tools should use bts,ts,ss numbers, not IMSI. OS#2969: osmo-bsc should always know a mobile identity. Related: OS#2968 Change-Id: I186c7a995dd2b81746c32a58b55da64ed195a1ce --- M include/osmocom/bsc/meas_feed.h M src/libbsc/bsc_vty.c A tests/osmo-bsc.vty 3 files changed, 69 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/7995/1 diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h index 55bce09..1849a89 100644 --- a/include/osmocom/bsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -1,5 +1,4 @@ -#ifndef _OPENBSC_MEAS_FEED_H -#define _OPENBSC_MEAS_FEED_H +#pragma once #include @@ -37,5 +36,8 @@ #define MEAS_FEED_VERSION 1 +int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port); +void meas_feed_scenario_set(const char *name); -#endif +void meas_feed_cfg_get(char **host, uint16_t *port); +const char *meas_feed_scenario_get(void); diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index c8d1637..1efca0c 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -61,6 +61,7 @@ #include #include #include +#include #include @@ -1016,6 +1017,22 @@ else vty_out(vty, " periodic location update %u%s", gsmnet->t3212 * 6, VTY_NEWLINE); + + { + uint16_t meas_port; + char *meas_host; + const char *meas_scenario; + + meas_feed_cfg_get(&meas_host, &meas_port); + meas_scenario = meas_feed_scenario_get(); + + if (meas_port) + vty_out(vty, " meas-feed destination %s %u%s", + meas_host, meas_port, VTY_NEWLINE); + if (strlen(meas_scenario) > 0) + vty_out(vty, " meas-feed scenario %s%s", + meas_scenario, VTY_NEWLINE); + } return CMD_SUCCESS; } @@ -4699,6 +4716,32 @@ return CMD_SUCCESS; } +#define MEAS_FEED_STR "Measurement Report export\n" + +DEFUN(cfg_net_meas_feed_dest, cfg_net_meas_feed_dest_cmd, + "meas-feed destination ADDR <0-65535>", + MEAS_FEED_STR "Where to forward Measurement Report feeds\n" "address or hostname\n" "port number\n") +{ + int rc; + const char *host = argv[0]; + uint16_t port = atoi(argv[1]); + + rc = meas_feed_cfg_set(host, port); + if (rc < 0) + return CMD_WARNING; + + return CMD_SUCCESS; +} + +DEFUN(cfg_net_meas_feed_scenario, cfg_net_meas_feed_scenario_cmd, + "meas-feed scenario NAME", + MEAS_FEED_STR "Set a name to include in the Measurement Report feeds\n" "Name string, up to 31 characters\n") +{ + meas_feed_scenario_set(argv[0]); + + return CMD_SUCCESS; +} + extern int bsc_vty_init_extra(void); int bsc_vty_init(struct gsm_network *network) @@ -4741,6 +4784,8 @@ install_element(GSMNET_NODE, &cfg_net_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd); install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty new file mode 100644 index 0000000..560fb36 --- /dev/null +++ b/tests/osmo-bsc.vty @@ -0,0 +1,19 @@ +OsmoBSC> enable + +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# list +... + meas-feed destination ADDR <0-65535> + meas-feed scenario NAME +... + +OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 +OsmoBSC(config-net)# meas-feed scenario foo23 +OsmoBSC(config-net)# show running-config +... +network +... + meas-feed destination 127.0.0.23 4223 + meas-feed scenario foo23 +... -- To view, visit https://gerrit.osmocom.org/7995 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I186c7a995dd2b81746c32a58b55da64ed195a1ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 3 13:41:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 3 May 2018 13:41:36 +0000 Subject: [PATCH] osmo-bsc[master]: bsc_api.c: actually log with context Message-ID: Review at https://gerrit.osmocom.org/7996 bsc_api.c: actually log with context bsc_api.c notoriously lacks log context. Provide gsm_lchan_name() and/or bsc_subscr_name() in roughly a million instances, using new LOGPLCHAN macro. Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 --- M src/libbsc/bsc_api.c 1 file changed, 57 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/7996/1 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 142efef..f126bd4 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -44,6 +44,13 @@ #define HO_DTAP_CACHE_MSGB_CB_LINK_ID 0 #define HO_DTAP_CACHE_MSGB_CB_ALLOW_SACCH 1 +#define LOGPLCHAN(lchan, ss, level, fmt, args...) \ + LOGP(ss, level, "%s%s (%s) " fmt, \ + lchan ? gsm_lchan_name(lchan) : "-", \ + lchan ? gsm_lchant_name(lchan->type) : "", \ + bsc_subscr_name(lchan && lchan->conn ? lchan->conn->bsub : NULL), \ + ## args) + static void rll_ind_cb(struct gsm_lchan *, uint8_t, void *, enum bsc_rllr_ind); static void send_sapi_reject(struct gsm_subscriber_connection *conn, int link_id); static void handle_release(struct gsm_subscriber_connection *conn, struct bsc_api *bsc, struct gsm_lchan *lchan); @@ -117,17 +124,17 @@ new_lchan = lchan_alloc(conn_get_bts(conn), chan_type, 0); if (!new_lchan) { - LOGP(DMSC, LOGL_NOTICE, "No free channel.\n"); + LOGP(DMSC, LOGL_NOTICE, "%s No free channel for %s\n", + bsc_subscr_name(conn->bsub), gsm_lchant_name(chan_type)); return -1; } /* check if we are on TCH/F and requested TCH/H, but got TCH/F */ if (conn->lchan->type == new_lchan->type && chan_type != new_lchan->type) { - LOGP(DHO, LOGL_NOTICE, "%s -> %s Will not re-assign to identical channel type," - " %s was requested\n", - gsm_lchan_name(conn->lchan), gsm_lchan_name(new_lchan), - gsm_lchant_name(chan_type)); + LOGPLCHAN(conn->lchan, DHO, LOGL_NOTICE, + "-> %s Will not re-assign to identical channel type, %s was requested\n", + gsm_lchan_name(new_lchan), gsm_lchant_name(chan_type)); lchan_free(new_lchan); return -1; } @@ -148,7 +155,7 @@ handle_mr_config(conn, new_lchan, full_rate); if (rsl_chan_activate_lchan(new_lchan, 0x1, 0) < 0) { - LOGP(DHO, LOGL_ERROR, "could not activate channel\n"); + LOGPLCHAN(new_lchan, DHO, LOGL_ERROR, "could not activate channel\n"); lchan_free(new_lchan); return -1; } @@ -219,7 +226,8 @@ if (!conn->lchan) { LOGP(DMSC, LOGL_ERROR, - "Called submit dtap without an lchan.\n"); + "%s Called submit dtap without an lchan.\n", + bsc_subscr_name(conn->bsub)); msgb_free(msg); return -1; } @@ -316,11 +324,9 @@ if (chan_mode == GSM48_CMODE_SPEECH_AMR) handle_mr_config(conn, conn->lchan, full_rate); - LOGP(DMSC, LOGL_NOTICE, - "Sending %s ChanModify for speech: %s on channel %s\n", - gsm_lchan_name(conn->lchan), - get_value_string(gsm48_chan_mode_names, chan_mode), - get_value_string(gsm_chan_t_names, conn->lchan->type)); + LOGPLCHAN(conn->lchan, DMSC, LOGL_NOTICE, + "Sending ChanModify for speech: %s\n", + get_value_string(gsm48_chan_mode_names, chan_mode)); gsm48_lchan_modify(conn->lchan, chan_mode); } @@ -348,8 +354,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "ASSIGNMENT COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", + rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -363,14 +369,15 @@ } if (conn->secondary_lchan != msg->lchan) { - LOGP(DMSC, LOGL_ERROR, "Assignment Compl should occur on second lchan.\n"); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, + "Assignment Compl should occur on second lchan.\n"); return; } gh = msgb_l3(msg); if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGP(DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", + msgb_l3len(msg) - sizeof(*gh)); return; } @@ -401,8 +408,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "ASSIGNMENT FAILED cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT FAILED cause = %s\n", + rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -416,7 +423,8 @@ } if (conn->lchan != msg->lchan) { - LOGP(DMSC, LOGL_ERROR, "Assignment failure should occur on primary lchan.\n"); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, + "Assignment failure should occur on primary lchan.\n"); return; } @@ -432,8 +440,8 @@ gh = msgb_l3(msg); if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGP(DMSC, LOGL_ERROR, "assignment failure unhandled: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(conn->lchan, DMSC, LOGL_ERROR, "assignment failure unhandled: %zu\n", + msgb_l3len(msg) - sizeof(*gh)); rr_failure = NULL; } else { rr_failure = &gh->data[0]; @@ -453,7 +461,7 @@ uint8_t cm2_len, cm3_len = 0; uint8_t *cm2, *cm3 = NULL; - DEBUGP(DRR, "CLASSMARK CHANGE "); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "CLASSMARK CHANGE "); /* classmark 2 */ cm2_len = gh->data[0]; @@ -488,8 +496,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "HANDOVER COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "HANDOVER COMPLETE cause = %s\n", rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -506,8 +514,12 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); - DEBUGP(DHO, "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); + /* Log on both RR and HO categories: it is an RR message, but is still quite important when + * filtering on HO. */ + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DHO, LOGL_DEBUG, + "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -529,7 +541,8 @@ int rc; if (msgb_l3len(msg) < sizeof(*gh)) { - LOGP(DMSC, LOGL_ERROR, "Message too short for a GSM48 header.\n"); + LOGP(DMSC, LOGL_ERROR, "(%s) Message too short for a GSM48 header.\n", + bsc_subscr_name(conn->bsub)); return; } @@ -547,19 +560,20 @@ case GSM48_PDISC_RR: switch (msg_type) { case GSM48_MT_RR_GPRS_SUSP_REQ: - DEBUGP(DRR, "%s\n", - gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ)); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "%s\n", gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ)); break; case GSM48_MT_RR_STATUS: - LOGP(DRR, LOGL_NOTICE, "%s (cause: %s)\n", - gsm48_rr_msg_name(GSM48_MT_RR_STATUS), - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_NOTICE, + "%s (cause: %s)\n", gsm48_rr_msg_name(GSM48_MT_RR_STATUS), + rr_cause_name(gh->data[0])); break; case GSM48_MT_RR_MEAS_REP: /* This shouldn't actually end up here, as RSL treats * L3 Info of 08.58 MEASUREMENT REPORT different by calling * directly into gsm48_parse_meas_rep */ - LOGP(DMEAS, LOGL_ERROR, "DIRECT GSM48 MEASUREMENT REPORT ?!? "); + LOGPLCHAN(msg->lchan, DMEAS, LOGL_ERROR, + "DIRECT GSM48 MEASUREMENT REPORT ?!?\n"); gsm48_tx_rr_status(conn, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); break; case GSM48_MT_RR_HANDO_COMPL: @@ -601,9 +615,8 @@ break; default: /* Drop unknown RR message */ - LOGP(DRR, LOGL_NOTICE, - "%s Dropping %s 04.08 RR message\n", - gsm_lchan_name(conn->lchan), gsm48_rr_msg_name(msg_type)); + LOGPLCHAN(msg->lchan, DRR, LOGL_NOTICE, + "Dropping %s 04.08 RR message\n", gsm48_rr_msg_name(msg_type)); gsm48_tx_rr_status(conn, GSM48_RR_CAUSE_MSG_TYPE_N); break; } @@ -624,8 +637,7 @@ lchan = msg->lchan; if (lchan->state != LCHAN_S_ACTIVE) { - LOGP(DRSL, LOGL_INFO, "Got data in non active state(%s), " - "discarding.\n", gsm_lchans_name(lchan->state)); + LOGPLCHAN(msg->lchan, DRSL, LOGL_INFO, "Got data in non active state, discarding.\n"); return -1; } @@ -660,12 +672,14 @@ const uint8_t *key, int len, int include_imeisv) { if (cipher > 0 && key == NULL) { - LOGP(DRSL, LOGL_ERROR, "Need to have an encryption key.\n"); + LOGP(DRSL, LOGL_ERROR, "%s: Need to have an encryption key.\n", + bsc_subscr_name(conn->bsub)); return -1; } if (len > MAX_A5_KEY_LEN) { - LOGP(DRSL, LOGL_ERROR, "The key is too long: %d\n", len); + LOGP(DRSL, LOGL_ERROR, "%s: The key is too long: %d\n", + bsc_subscr_name(conn->bsub), len); return -1; } @@ -807,7 +821,7 @@ if (conn->secondary_lchan != lchan) return; - LOGP(DMSC, LOGL_NOTICE, "Sending assignment on chan: %p\n", lchan); + LOGPLCHAN(lchan, DMSC, LOGL_NOTICE, "Sending RR Assignment\n"); gsm48_send_rr_ass_cmd(conn->lchan, lchan, lchan->ms_power); } @@ -817,7 +831,7 @@ if (conn->secondary_lchan != lchan) return; - LOGP(DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n"); + LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n"); conn->secondary_lchan->conn = NULL; conn->secondary_lchan = NULL; } -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:28 +0000 Subject: [PATCH] libosmocore[master]: osmo-release.sh: Always generate entire commit changelog Message-ID: Review at https://gerrit.osmocom.org/7997 osmo-release.sh: Always generate entire commit changelog Before this commit, for library projects (containing LIBVERSION in some Makefile), the entire commit list was not stored into the changelog, but only a few lines from TODO-RELEASE files. This is a bad approach for several reasons. First, because that file was only aimed at containing API/ABI breaks, and not the full relevant changeset (like bugfixes, new features, etc.). Second, because it relies on every developer making API/ABI changes to remember to store the change in there during commit break time. Let's instead always store the entire commit list in changelog, and let's use TODO-RELEASE only as a list of hints for the maintainer to help him evaluate how LIBVERSION needs to be bumped for each library. Other tools such as osmo-abi-check.git can be used to help with the process of decission too. Let's take the opportunity too to only commit stuff already added to the staging area, as it proved easier to manage from my personal experinece making latest releases. Change-Id: Ibf662173ce2b4ff3966e9ad5f56c65dfb13607ff --- M TODO-RELEASE M osmo-release.sh 2 files changed, 13 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/7997/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 16496d6..146ab33 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,6 +1,6 @@ # When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install -# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info -# In short: +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info # LIBVERSION=c:r:a # If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. # If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. diff --git a/osmo-release.sh b/osmo-release.sh index 0e85023..3b50ded 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -11,7 +11,7 @@ NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` -MAKEMOD=`git diff -GLIBVERSION --stat | grep Makefile.am` +MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` ISODATE=`date -I` if [ "z$BUMPVER" = "z" ]; then @@ -26,28 +26,22 @@ echo "Releasing $VERSION -> $NEW_VER..." -if [ "z$LIBVERS" = "z" ]; then - gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" -else - echo "You should NOT be doing this unless you've read and understood following article:" - echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" - grep -v '#' TODO-RELEASE | sed 's/\t\+/: /g' > TODO-RELEASE.entries - if [ "$(wc -l /dev/null)" -eq "0" ]; then - rm TODO-RELEASE.entries - echo "TODO-RELEASE must contain at least one line with change descriptions" - exit 1 - fi - grep '#' TODO-RELEASE > TODO-RELEASE.clean - mv TODO-RELEASE.clean TODO-RELEASE +if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ]; then echo "Before releasing, please modify some of the libversions: $LIBVERS" + echo "You should NOT be doing this unless you've read and understood following article:" + echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi - xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" - rm TODO-RELEASE.entries + if [ -f "TODO-RELEASE" ]; then + grep '#' TODO-RELEASE > TODO-RELEASE.clean + mv TODO-RELEASE.clean TODO-RELEASE + git add TODO-RELEASE + fi fi +gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" -git add -u +git add debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." echo "Release $NEW_VER prepared, tagged and signed." -- To view, visit https://gerrit.osmocom.org/7997 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf662173ce2b4ff3966e9ad5f56c65dfb13607ff Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:28 +0000 Subject: [PATCH] libosmocore[master]: osmo-release.sh: Allow user to add extra information to the ... Message-ID: Review at https://gerrit.osmocom.org/7998 osmo-release.sh: Allow user to add extra information to the release commit Change-Id: Ie25d921dd27fb7653bd616cb2912330964108663 --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/7998/1 diff --git a/osmo-release.sh b/osmo-release.sh index 3b50ded..86b41d8 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -43,5 +43,6 @@ dch -r -m --distribution "unstable" "" git add debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty +git commit --amend # let the user add extra information to the release commit. git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." echo "Release $NEW_VER prepared, tagged and signed." -- To view, visit https://gerrit.osmocom.org/7998 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie25d921dd27fb7653bd616cb2912330964108663 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:28 +0000 Subject: [PATCH] libosmocore[master]: debian: libosmoctrl: Use correct library version in pkg name Message-ID: Review at https://gerrit.osmocom.org/7999 debian: libosmoctrl: Use correct library version in pkg name The number used in debian packaging is actually current-age, which is still 0 in this case after it was bumped a while ago. As a result, we had a libosmoctrl1_*.deb package installing a libosmoctrl.so.0 file. Fixes: OS#3175 Change-Id: I771f6c68570bc3b2bab68e1165c7284fd43e904d --- M debian/control R debian/libosmoctrl0.install 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/99/7999/1 diff --git a/debian/control b/debian/control index d911f32..29dbd16 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ libosmogb6 (= ${binary:Version}), libosmogsm9 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), - libosmoctrl1 (= ${binary:Version}), + libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), ${misc:Depends} Description: Open Source MObile COMmunications CORE library (metapackage) @@ -245,7 +245,7 @@ . This package contains the documentation for the libosmovty library. -Package: libosmoctrl1 +Package: libosmoctrl0 Section: libs Architecture: any Multi-Arch: same @@ -259,7 +259,7 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmoctrl1 library in particular contains an SNMP-like status interface. + The libosmoctrl library in particular contains an SNMP-like status interface. Package: libosmosim0 Section: libs diff --git a/debian/libosmoctrl1.install b/debian/libosmoctrl0.install similarity index 100% rename from debian/libosmoctrl1.install rename to debian/libosmoctrl0.install -- To view, visit https://gerrit.osmocom.org/7999 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I771f6c68570bc3b2bab68e1165c7284fd43e904d Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:29 +0000 Subject: [PATCH] libosmocore[master]: debian/changelog: Fix typo in maintainer e-mail Message-ID: Review at https://gerrit.osmocom.org/8000 debian/changelog: Fix typo in maintainer e-mail Change-Id: I74bef283090fd7601491c9fef9637f845853d032 --- M debian/changelog 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/8000/1 diff --git a/debian/changelog b/debian/changelog index a50e30b..3ce3fad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,20 +3,20 @@ * Revert "vty: Fix bad use of vector_slot()" * New upstream release of libosmocore - -- Harald Welte Thu, 02 Nov 2017 18:51:02 +0100 + -- Harald Welte Thu, 02 Nov 2017 18:51:02 +0100 libosmocore (0.10.1) unstable; urgency=medium * New upstream release of libosmocore - -- Harald Welte Sun, 29 Oct 2017 10:46:47 +0100 + -- Harald Welte Sun, 29 Oct 2017 10:46:47 +0100 libosmocore (0.10.0+nmu1) UNRELEASED; urgency=medium * Non-maintainer upload. * New upstream release of libosmocore - -- Harald Welte Fri, 27 Oct 2017 19:45:00 +0200 + -- Harald Welte Fri, 27 Oct 2017 19:45:00 +0200 libosmocore (0.9.6) unstable; urgency=medium @@ -148,7 +148,7 @@ libosmocore (0.5.3+git1-2) unstable; urgency=low - * New upstream version + * New upstream version -- Holger Hans Peter Freyther Mon, 05 Nov 2012 21:35:57 +0100 -- To view, visit https://gerrit.osmocom.org/8000 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74bef283090fd7601491c9fef9637f845853d032 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:29 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E284-bc47-dirty_=E2=86=92_0=2E11=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8001 Bump version: 0.10.2.284-bc47-dirty ? 0.11.0 Remark: For libosmogb and libosmogsm, LIBVERSION was already bumped in c4fce1425e19d604c199c895e227dc2519110456. Change-Id: Ib4fa53a9bb9954ae48d0a610ba9a81dd8e8b4ef6 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmocore10.install M src/Makefile.am M src/codec/Makefile.am M src/coding/Makefile.am M src/ctrl/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 10 files changed, 333 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/01/8001/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 146ab33..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,9 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -core msgb_queue_free() add inline func to msgb.h -coding gsm0503_rach_ext-encode() add func to gsm0503_coding.h -codec ecu.c / ecu.h implement ECU for FR (Error Concealment Unit) -fsm fsmc / fsm.h added callback for graceful exit => ABI changed -gsm gsm0480.c / gsm0480.h the 'ss_request' struct extended with ussd_data, - ussd_data_len, and ussd_data_dcs => ABI changed diff --git a/debian/changelog b/debian/changelog index 3ce3fad..393ea17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,326 @@ +libosmocore (0.11.0) unstable; urgency=medium + + [ Max ] + * Enable GnuTLS fallback + * Ctrl: add rate counter group introspection + * ctrl: log incorrect interval values + * Improve get_rate_ctr() error handling + * ctrl: make response easier to parse + * coding test: cosmetic cleanup + * coding test: enable debug output + * coding test: move bit dump into functions + * coding test: use OSMO_ASSERT + * Fix embedded build + * embedded: fix tests + * Embedded: fix sercomm test + * Add functions for extended RACH coding + * Do not allocate already existing counter group + * Fix incorrect spec reference + * Use 127.0.0.1 for GSMTAP logging by default + * coding: move eB adjustement to appropriate place + * Add function to properly encode RAI + * Use existing function for TLLI encoding + * log: print loginfo assertions source + * Allow multiple 'log gsmtap' sinks + * Deprecate gsm48_construct_ra() + * Log lapd_datalink state on errors + * jenkins: add dispatcher script + * Embedded: disable stats test + * Embedded: add sercomm stubs + * GSUP: don't fail test on first error + * jenkins: remove obsolete scripts + * jenkins: move make invocation into shared function + * utils: add helper wrapper for osmo_strlcpy() + * GSUP: change osmo_gsup_encode() return type + * Use python 3 for utilities + * Add test for gsm48_generate_mid_from_imsi() + * Add generic Mobile Identity encoder + * Add function to encode classmark + + [ Niro Mahasinghe ] + * gsm0503_coding.c: Fix tch_efr_unreorder() of one bit + * gsm0503_coding.c: Use majority vote in tch_efr_unreorder() + + [ Harald Welte ] + * debian: build now depends on libgnutls + * Fix/Update copyright notices; Add SPDX annotation + * Print /proc/cpuinfo before executing testsuite + * conv_acc: Our code requires SSSE3, not just SSE3 + * ports.h: Use same VTY port number for osmo-mgw and osmo-bsc_mgcp + * gsmtap.h: Introduce new GSMTAP type for LTE NAS messages + * gsm0808_create_cipher_reject: Fix encoding of Cause IE + * rate_ctr: print proper error message if rate_ctr already exists + * timer: fixup whitespace issues + * control_if: Close control connection socket/fd on read/write == 0 + * control_if: Log the disconnect of a CTRL client + * CTRL: Ensure peer/connection info is always printed the same way + * MNCC: Add MNCC to string dumper + * gsm48_pdisc_names: Use conscise, short names + * SMS: Add value_string for TS 04.11 CP and RP state + * gsm_04_08.h: Clearly annotate timers that don't have a 3GPP Default value + * gsm_04_08.h: Reduce T310 default to 30s. + * gsm48_hdr_msg_type[_r99]: Fix bit-masks + * gsm48_hdr_msg_type(): SS is in the same group as MM/CC + * tlv_parser: Report *first* occurrence of repeated IEs + * msgb: Add msgb_hexdump_{l2,l3}() to dump l2 or l3 part of message buffer + * Revert "Use python 3 for utilities" + * Revert "fsm: do not terminate child FSMs early" + * osmo_msgbdump_{l2,l3}(): Proper typecast + * debian/control: Fix Vcs-Browser URL + * Add GSM 04.08 type-of-number / numbering-plan-id definitions + * talloc_ctx_vty: Fix help strings (missing \n at end of line) + * Revert "Add function to encode classmark" + * rate_ctr: Add rate_ctr_inc2() as convenience wrapper + * coding: Add BER-reporting RACH decode functions + * l1sap: Add RSSI, BER and quarter-bit accurate timing to PH-RACH.ind + * l1sap: Add fields for higher-precision timing offset values + * abis_nm: Introduce abis_nm_dump_foh() + * VTY: Don't welcome the user to the "control" interface, if it's VTY + * prevent integer underflow in ipa_ccm_make_id_resp_from_req() + * RSL/LAPDm: Not all RLL message are "transparent" + + [ Neels Hofmeyr ] + * vty: deprecate now empty node commands + * memleak: osmo_config_list_parse: getline() needs free also on error + * abis_test: sanitize: fix msgb memleak + * lapd_test: sanitize: fix msgb memleaks + * gsm0408_test: sanitize: cleanup msgb + * gsm0808_test: sanitize: fix msgb memleak + * msgb: add inline msgb_queue_free() + * rate_ctr: fix mem leak for mangled desc + * bssgp_fc_test: remove rounding to deciseconds + * bssgp_fc_test: clarify by outputting ok / failure messages + * bssgp_fc_test: sanitizer: free msgb context when done + * gprs_bssgp: bssgp_fc_in(): fix mem leak on queue overflow + * bssgp_fc_test: sanitize: free fc struct when done + * tlv_put: guard against NULL val and 0 len + * sercomm_test: sanitize: fix msgb mem leak + * osmo_strlcpy: sanitize: don't memcpy from NULL src even if len is 0 + * fsm_tmr_cb: don't set T=0, the fi may no longer exist + * vty XML export: avoid repeating common node commands for each node + * VTY reference: do not list empty nodes + * VTY reference: use node names as section names + * vty: set name for VIEW+ENABLE nodes, for VTY reference + * vty reference: merge_doc.xsl: do not omit description tag + * comment: utils: more accurately describe OSMO_STRINGIFY macro + * logging vty: describe 'logging set-log-mask' command, add OSMO_STRINGIFY_VAL() + * fix osmo_identifier_valid(): only allow printable characters + * utils: add osmo_separated_identifiers_valid() + * add osmo_auth_c3() (separate from gsm_milenage()) + * utils: add osmo_escape_str() + * ctrl_test.c: replace print_escaped() with new osmo_escape_str() + * ctrl: prep test: separate new ctrl_handle_msg() from handle_control_read() + * ctrl_test: expand to test message handling and detect mem leaks + * ctrl_test: show memleak when receiving GET_REPLY and SET_REPLY commands + * ctrl: fix mem leak when handling GET_REPLY and SET_REPLY + * ctrl_test: add two more current parsing bugs to prep for fix + * add ctrl_cmd_parse2() to return parsing errors + * ctrl: on parse errors, return a detailed message to sender + * rate_ctr: fix osmo-sgsn DoS: don't return NULL on already used index + * ports: define proper VTY and CTRL ports for OsmoHNBGW + * ctrl: tighten CTRL input parsing + * ctrl: separate handling of GET_REPLY, SET_REPLY and TRAP + * jenkins: add 'make V=1' for more verbose build logs + * logging vty: tweak general 'logging' command doc + * gsm: add gsm0808_speech_codec_type_names + * logging-gsmtap: send only basename of source file + * logging: add ability to log the log-level with API and vty + * logging: color the log level + * logging: color the log category according to level + * fix -Werror build: logging.c: always use literal with snprintf + * cosmetic: logging: if color is disabled, don't print "" + * logging: separate the '<000b>' subsys from filename logging + * logging: allow to log only the basename of each source + * logging vty: add 'logging print file (0|1|basename)' cmd + * vty: fix 'logging print file' output + * gsmtap_sendmsg(): clarify API doc concerning msgb ownership + * memleak: gsmtap_sendmsg(): don't return 0 when no data was written + * memleak: fix all libosmocore callers of gsmtap_sendmsg() to free on failure + * memleak: _gsmtap_raw_output(): free msg in case of vsnprintf failure + * cosmetic: gsm0408_test: RA test cases as array-of-struct + * gsm0408_test: cosmetically re-order MCC to come before MNC + * gsm0408_test: include BCD and leading zeros in test output + * gsm0408_test: RA test: include min/max value cases + * gsm0408_test: also test gsm48_generate_lai() and gsm48_decode_lai() + * implement support for 3-digit MNC with leading zeros + * gsm0408_test: check for new mnc_3_digits flag + * gsm0408_test: test new gsm48_{decode,generate}_lai2() functions + * gsm0408_test: add test cases for MNC with leading zeros + * gsm: add osmo_mnc_from_str(), osmo_mnc_cmp(), osmo_plmn_cmp() for 3-digit MNC + * introduce GSM_MCC_MNC_INVALID + * gsm23003_test: fix: compare members instead of bcmp + * fix osmo_mnc_from_str(): don't try to parse NULL + * gsm23003: add osmo_mcc_from_str() + * configure: add --enable-werror + * jenkins_amd64.sh: use --enable-werror configure flag, not CFLAGS + * gsm0808_test: cosmetic: re-arrange struct init; print hexdump on failure + * gsm0808_test: cosmetic: test non-hex MCC + * show failure in gsm0808_enc_cell_id_list2() in gsm0808_test + * fix gsm0808_enc_cell_id_list2 for leading-zero MNC + * cosmetic: gsm0808_test: drop extraneous assertion + * contrib/fsm-to-dot: add -h option to print basic instructions + * contrib/fsm-to-dot: allow transition from and to the same state + * contrib/fsm-to-dot: don't match on event names in comments + * contrib/fsm-to-dot: warn and draw unallowed state transitions + * contrib/fsm-to-dot: add default edge label '-' + * contrib/fsm-to-dot: mark arrows that feed events + * contrib/fsm-to-dot: less false positives on event parsing + * contrib/fsm-to-dot: mark illegal states in red + * contrib/fsm-to-dot: warn about identically named FSMs + * vty/command.c: write_config_file(): sanely compose temp path + * fix logging talloc ctx: add osmo_init_logging2() + * ctrl: test deferred cmd, show current failure + * ctrl: fix deferred commands (and hence fix osmo-bts-sysmo 'clock-info' cmd) + * cosmetic: flatten ctrl_handle_msg() + * fix ctrl_test sanitizer issues + * use osmo_init_logging2() with proper talloc ctx + * add osmo_quote_str(),osmo_quote_str_buf() and test + * fsm_test: terminate the main loop instead of exit on timeout + * osmo_fsm_inst_find_by_name(): guard against strcmp(NULL) + * fsm_test: more thoroughly test FSM inst ids and names + * fsm: id: properly set name in case of NULL id + * cosmetic: osmo_fsm_inst_update_id(): don't log "allocate" + * add osmo_fsm_inst_update_id_f() + * add gsm48_reject_value_names + * deprecate PLMN de-/coding functions incapable of 3-digit MNC with leading zeros + * avoid warning in gsm0808_create_layer3 + * add osmo_cgi_name() + * add gsm0808_cell_id_list_add() to combine two cell identifier lists + * add tlv_parse2(), capable of multiple instances of the same IE + * add gsm0808_{enc,dec}_cell_id + * test_gsm0808_enc_dec_cell_id_list_lac(): validate encoded bytes + * test_gsm0808_enc_dec_cell_id_list_lac(): populate all LACs + * test_gsm0808_enc_dec_speech_codec_with_cfg: initialize properly + * cosmetic: log: fix typo, clarify msg for rate_ctr name mangling + * tlv: add TLV_GET() and TLV_GET_MINLEN() + * add gsm0808_cell_{id,id_list}_name() and friends + * gsm0808_test: fix more missing inits (address sanitizer issues) + * gsm0808_test: silence deprecation: use gsm0808_create_layer3_2() + + [ Philipp Maier ] + * vty: add port number for osmo-mgw + * libosmocodec: add FR bit offset definitions + * libosmocodec: implement ECU (Error Concealment Unit) for FR + * fsm: fix double llist_del in osmo_fsm_inst_term() + * socket: fix socket leak in osmo_sock_local_ip() + * socket: use inet_ntop() instead of inet_ntoa() in osmo_sock_local_ip() + * fsm: add functions for unlinking and changing parents + * fsm: do not terminate child FSMs early + * fsm: allow graceful exit on FSM termination + * features: move bts feature related functionality to libosmocore + * features: define osmo_bts_*_feature() as static inline + * gsm_08_08: correct speech codec defaults + * gsm0808: Add value strings for BSSMAP cause codes + + [ Pau Espin Pedrol ] + * vty: Fix bad use of vector_slot() + * gsm: Use correct include for getrandom + * utils: Fix false positive in compiler warning + * cosmetic: Fix trailing whitespace + * Fix malformed Abis/RSL messages with extra L3 Information field + * tests: coding_test: Fix compilation with -O0 + * tests: utils_test: Fix test failure when compiling with -O0 + * ports.h: Add VTY and CTRL ports for osmo-trx + * core: Add timespec helper macros and make timer_compat.h public + * core/logging.h: Add logging category for jitter buffer + * timer: Introduce osmo_clock_gettime to override clock_gettime + * timer: Document osmo_gettimeofday API + * osmo-release.sh: Set correct version when generating the changelog + * socket.c: osmo_sock_init2: bind: Several logic fixes and log improvements + * socket.c: osmo_sock_init2: connect: Several logic fixes and log improvements + * socket.c: osmo_sock_init: Several logic fixes and log improvements + * msgb: msgb_get: Drop unneeded tmp var + * msgb: msgb_pull: Abort when pulling more than avail size + * osmo_get_macaddr: Fix buffer read out of bounds + * osmo_sockaddr_is_local: Fix memleak + * gsm_08_58.h: Add Ericsson vendor-specific RSL message types + * osmo-release.sh: Remove temporary file TODO-RELEASE.entries after use + * osmo-release.sh: Exit with error if no description for new changelog entry provided + * osmo-release.sh: Fix error condition no LIBVERSION modified + * osmo-release.sh: Always generate entire commit changelog + * osmo-release.sh: Allow user to add extra information to the release commit + * debian: libosmoctrl: Use correct library version in pkg name + * debian/changelog: Fix typo in maintainer e-mail + + [ Holger Hans Peter Freyther ] + * logging: Extend the LOGPSRC macro to put cont in it as well + * license: Fix the license to GPL + + [ Alexander Couzens ] + * counters: add osmo_counters_count() returns the amount of counters + * vty: show asciidoc counters: don't create an empty table for osmo_counters + * gsm_08_58.h: introduce RSL_IE_ERIC_PAGING_GROUP + * gsm_utils: call gnutls_global_init() as constructor + + [ Jean-Francois Dionne ] + * Fix LAPD UA msgb memory leak. + + [ Vadim Yanitskiy ] + * libosmocodec: add FR/HR/EFR frame length definitions + * ussd_test.c: fix rc / len debug output confusion + * gsm0480: fix USSD OCTET STRING length confusion + * gsm0480: clean up the parse_process_uss_req() code + * gsm0480: handle UnstructuredSS Request with DSC != 0x0F + * gsm0480: parse GSM0480_MTYPE_FACILITY separately + * gsm0480: handle GSM0480_CTYPE_RETURN_RESULT + * gsm0480: handle USS_NOTIFY and USS_REQUEST with PROCESS_USS_REQ + * gsm0480: handle GSM0480_OP_CODE_PROCESS_USS_DATA + * gsm0480: add specification reference to SS message type + * gsm0480: pass exact GSM 04.80 payload length to parse_ss() + * gsm0480: move SS request length check to parse_ss() + * gsm0480: refactor gsm0480_decode_ss_request + * gsm0480: correct parse_ss_info_elements() declaration + * tests/ussd: fix wrong GSM 04.80 payload length + * gsm0480: parse all SS info elements in a message + * gsm0480: parse optional IEs for RELEASE COMPLETE message + * tests/ussd: prevent uninitialized memory access + * libosmocoding: fix typo in library documentation + * libosmocoding: use frame length definitions from codec.h + * src/msgb.c: cosmetic: fix spelling mistakes + * src/msgb.c: remove dead includes from OpenBSC + * src/msgb.c: print an error if msgb allocation failed + * src/msgb.c: avoid using internal talloc API + * gsm0480: document the 'ss_request' structure + * gsm0480: copy the raw USSD data, its DCS and length + * gsm0480: drop messages with incorrect data length + * protocol/gsm_04_08.h: drop incorrect GSM48_PDISC_USSD + * gsm/gsm48.c: add call independent SS message names + + [ Stefan Sperling ] + * TLVP_PRESENT() should not return TRUE after tlv_parse() fails. + * Add helper functions for ACC bit flags in rach control IE. + * ensure that osmo_fsm vty commands are only installed once + * print BIG FAT ERROR message if osmo_fsm lacks event names + * ensure VTY commands don't segfault if an FSM has no event names + * support for more cell ID list types in libosmocore + * fix a cell identifier parsing bug in libosmocore + * fix cell identifier decoding in libosmocore + * use gsm48_decode_lai2() in gsm0808_dec_cell_id_list() + * fix bug in parse_cell_id_ci_list() + * fix parse_cell_id_lac_and_ci_list() + * add a test for CELL_IDENT_WHOLE_GLOBAL cell identifier lists + * add a regression test for TLV parsing with repeated IEs + + [ Sergey Kostanbaev ] + * gsm0480: skip length check for 'RELEASE COMPLETE' message + + [ allesklar2 ] + * gsmtap.h: define TETRA DMO mode channels + + [ Martin Hauke ] + * build: Ensure all .pc files are installed + + [ Daniel Willmann ] + * fsm: Add a function to change the FSM instance ID later + * contrib/jenkins_arch.sh: Fix script comparison and arm support + * fsm: Update the name as well if the id is updated and accept NULL + + [ Thorsten Alteholz ] + * fix spelling + * fix issue on big endian architecture + + -- Pau Espin Pedrol Thu, 03 May 2018 15:47:11 +0200 + libosmocore (0.10.2) unstable; urgency=medium * Revert "vty: Fix bad use of vector_slot()" diff --git a/debian/control b/debian/control index 29dbd16..912582b 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore9 (= ${binary:Version}), + libosmocore10 (= ${binary:Version}), libosmogb6 (= ${binary:Version}), libosmogsm9 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), @@ -110,7 +110,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore9 +Package: libosmocore10 Section: libs Architecture: any Multi-Arch: same @@ -124,14 +124,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore9 library in particular is a collection of common code used in + The libosmocore10 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore9, + libosmocore10, libjs-jquery, libosmocodec-doc, libosmocoding-doc, diff --git a/debian/libosmocore9.install b/debian/libosmocore10.install similarity index 100% rename from debian/libosmocore9.install rename to debian/libosmocore10.install diff --git a/src/Makefile.am b/src/Makefile.am index 2641a97..60b76b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=9:0:0 +LIBVERSION=10:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index f77d910..60fce5e 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index dcbbd8f..a17e3d1 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION = 0:0:0 +LIBVERSION = 1:0:1 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 2bda5b7..71cc9a3 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:0:1 +LIBVERSION=2:0:2 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 869e12d..ebf4739 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:1:0 +LIBVERSION=0:2:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 7b5e1e5..18d3a84 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:0 +LIBVERSION=4:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8001 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib4fa53a9bb9954ae48d0a610ba9a81dd8e8b4ef6 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 13:49:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 13:49:50 +0000 Subject: =?UTF-8?Q?=5BABANDON=5D_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E282-f8ca-dirty_=E2=86=92_0=2E11=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has abandoned this change. Change subject: Bump version: 0.10.2.282-f8ca-dirty ? 0.11.0 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I22d6be1427b126edcd43ae0ae70fd9696108184b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:07:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:07:36 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7979 to look at the new patch set (#2). Bump version: 1.1.0.90-5468-dirty ? 1.2.0 Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a --- M configure.ac M debian/changelog M debian/control R debian/libgtp3.install M gtp/Makefile.am 5 files changed, 116 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/79/7979/2 diff --git a/configure.ac b/configure.ac index b9073e9..62812ae 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ [enable_gtp_linux="$enableval"], [enable_gtp_linux="no"]) AS_IF([test "x$enable_gtp_linux" = "xyes"], [ - PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.0.0]) + PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.2.0]) ]) AM_CONDITIONAL([ENABLE_GTP_KERNEL], [test "$enable_gtp_linux" = "yes"]) @@ -135,9 +135,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index 47e02f1..83fd823 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-ggsn (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix compiler warnings: return 0 in main(), in 3 tests + * add --enable-sanitize config option + * sanitize build: ensure uint16/32 alignment in gtpie_test and in46a_test + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * sgsnemu: Don't leak FILE handle in proc_read() + * sgsnemu: Fix format string in printing tun-device name + * sgsnemu: Make sure buffer has space for terminating-NUL + * sgsnemu: Free strings in error path + * gtp: Fix buffer overflow in imsi_gtp2str() + * gtp: Explicit OSMO_ASSERT to ensure pdp variable is set + * tun: Don't copy 16byte IPv6 address to 'struct in_addr' + * ippool: Correctly compute size of static pool + * remove unused argument to alloc_ippool_blacklist() + * factor out netdev_ip_local_get() from tun_ip_local_get() + * Properly NULL-out blacklist in alloc_ippool_blacklist() + * gtp_kernel: Change gtp_kernel_init() function signature + * gtp-kernel: Re-add support for kernel GTP-U acceleration + * gtp-kernel: Get rid of hard-coded kernel GTP device name + * gtp-kernel: shut down kernel GTP device in apn_down() + * gtp-kernel: Align logging for APN start in kernel-gtp case with that of TUN + * gtp-kernel: Avoid global state variable + * gtp-kernel: Make sure repeated calls to gtp_kernel_init() are safe + * gtp-kernel: proper cleanup in error path + * gtp-kernel: Get rid of SYS_ERR where not applicable + * gtp-kernel: Add function name to pdp_debug() function calls + * gtp-kernel: Add device nime in pdp_debug() log statements + * contrib/jenkins.sh: Allow jenkins job to specify if kernel GTP is used + * ggsn.c: Fix byte order of IPCP IPv4 DNS servers + * ggsn: Ignore PCO with length 0, don't abort processing + * README.md: Remove misleading sentence on sgsnemu + * Add talloc context introspection via VTY + * fix segfault in case of kernel gtp-u + * lib/tun.c: Generalize tun_sifflags() to netdev_sifflags + * lib/tun.c: generalize tun_*route() to netdev_*route() + * lib/tun.c: Generalize tun_{set,add}addr*() functions + * lib/tun: split generic network device related stuff to lib/netdev + * lib/netdev.c: Cosmetic changes (coding style / cleanups) + * ggsn: Don't explicitly use tun_setaddr() API anymore + * sgsnemu: Convert from tun_setaddr() to tun_addaddr() + * lib/tun: Remove tun_setaddr() API, as everyone is using tun_addaddr() now + * Move kernel GTP support from ggsn/ to lib/ + * ggsn: don't use gtp_kernel_tunnel_{add,del}() for userspace tun + + [ Pau Espin Pedrol ] + * ggsn_vty: Stop using deprecated API vty_install_default + * contrib/jenkins.sh: Enable Werror in C(PP)FLAGS + * examples: Add secondary ipv6 google DNS to osmo-ggsn.cfg + * tun_setaddr6: Fix log typo + * cosmetic: Reorder tun_addaddr to get rid of decl of tun_setaddr4 + * ggsn.c: Print version of unhandled ip packet + * Remove unused empty src/Makefile.in + * tests: Split ipv6 specific tests into a new test group + * Add support for IPv4v6 End User Addresses + * contrib: jenkins.sh: Build libgtpnl as dep when building with gtp kernel support + * cosmetic: sgsnemu.c: Fix trailing whitespace + * ggsn.c: Improve logging info on link-local ipv6 addr not found + * tun.c: tun_addaddr: Fix segfault and wrong usage of tun_nlattr + * Set tun_addaddr ipv agnostic and add support for ipv6 + * ggsn: Add 'ipv6 link-local' vty cmd + * ggsn_vty.c: Print ipv6 link-local cmd when writing config to file + * gtp.c: Fix trailing whitespace + * gtp.c: Determine GTP version from header + * gtp.c: Log unsupported GTP version number + * gtp/pdp: Fix trailing whitespace + * gtp/pdp: Remove unused APIs pdp_ntoeua pdp_euaton + * gtp.c: gtp_gpdu_ind: Convert ifelse to switch statement + * gtp.c: gtp_gpdu_ind: Early return to avoid use of uninitialized var + * gtp/gtp.c: Remove unused function char2ul_t + * gtp/gtp.c: Mark non exported functions as static + * gtp/gtp.c: Use uint8_t for version param in static functions + * ggsn: encaps_tun: Avoid forwarding packet if EUA is unassigned, fix crash + * ggsn: Validate packet src addr from MS + * ggsn: Parse PCO_IPCP + * ggsn: Parse PCO_IPCP for IPv4v6 pdp ctx + * ggsn: Print all addresses on successful pdp ctx creation + * ggsn.c: cb_tun_ind: Convert ifelse to switch statement + * ggsn.c: cb_tun_ind: log dst addr of packet without pdp ctx + * ggsn.c: cb_tun_ind: Don't drop packets targeting pdp ctx ll addr + * sgsnemu: Fix bad ptr during context deallocation + * sgsnemu: listen param is a host, not an interface + * use osmo_init_logging2 + + [ Max ] + * Log APN and tun names for packets + * Enable sanitize for CI tests + * Fix stow-enabled jenkins build failure + * Add GTP message names + + [ Viktor Tsymbalyuk ] + * sgsnemu: sgsnemu stopped after recieving "Request accepted" from ggsn + * sgsnemu: created "pinghost" and "createif" modes for mutual exclusion + * sgsnemu: fix: no outgoing GTP-U in "createif" mode + + [ Martin Hauke ] + * build: Remove AC_PROG_CXX, C++ is never used + + [ Stefan Sperling ] + * remove the -f option from osmo-ggsn.service + + -- Pau Espin Pedrol Thu, 03 May 2018 16:05:27 +0200 + osmo-ggsn (1.1.0) unstable; urgency=medium * libgtp: pdp.h: Addition of new tx_gpdu_seq struct member member diff --git a/debian/control b/debian/control index f31248e..c8aa0b7 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp2 +Package: libgtp3 Architecture: any Multi-Arch: same Section: libs @@ -41,7 +41,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp2 (= ${binary:Version}) + libgtp3 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -54,7 +54,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -65,7 +65,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp2.install b/debian/libgtp3.install similarity index 100% rename from debian/libgtp2.install rename to debian/libgtp3.install diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a0ff0a..7a41a88 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=3:0:0 lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h @@ -11,7 +11,3 @@ libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libgtp_la_LIBADD = $(LIBOSMOCORE_LIBS) - - - - -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:13:14 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7982 to look at the new patch set (#2). Bump version: 0.4.0.21-60fd-dirty ? 0.5.0 libosmotrau library version in debian package was wrong, fix it while releasing. Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmotrau2.install M src/Makefile.am 6 files changed, 45 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/7982/2 diff --git a/TODO-RELEASE b/TODO-RELEASE index b02e1eb..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmotrau addition New osmo_rtp_set_source_desc() wrapper around libortp diff --git a/configure.ac b/configure.ac index 05fbb12..0aca550 100644 --- a/configure.ac +++ b/configure.ac @@ -59,9 +59,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/debian/changelog b/debian/changelog index 13c0996..4c48e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +libosmo-abis (0.5.0) unstable; urgency=medium + + [ Max ] + * Use value string check from osmo-ci + * cosmetic: update ipaccess_bts_handle_ccm() + * IPA: log remote address + + [ Neels Hofmeyr ] + * cosmetic: ipa.c: use msgb_dequeue(), drop local var + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Alexander Couzens ] + * debian/rules: show testsuite.log when tests are failing + * unixsocket: fix a potential string overflow + + [ Harald Welte ] + * debian/copyright: fix upstream-name + * Add SPDX-License-Identifier to all source files + * Add a new osmo_rtp_set_source_desc() function to set the RTCP SDES items + * debian/control: Fix Vcs-Browser + + [ Pau Espin Pedrol ] + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * e1_input.h: Remove dead declaration of unexistent API ipaccess_setup + * configure.ac: Fix condition check for RTP_SIGNAL_PTR_CAST define + * use osmo_init_logging2 + * git-version-gen: Check first for new tag format + + [ Stefan Sperling ] + * preserve 'when' flags of new osmo_fd in ipaccess_rcvmsg() + + -- Pau Espin Pedrol Thu, 03 May 2018 16:12:04 +0200 + libosmo-abis (0.4.0) unstable; urgency=medium * Move forward towards a new release. diff --git a/debian/control b/debian/control index dd958c8..10295e6 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one @@ -40,7 +40,7 @@ It also implements drivers for mISDN and DAHDI based E1 cards, as well as some A-bis/IP dialects. -Package: libosmotrau1 +Package: libosmotrau2 Section: libs Architecture: any Multi-Arch: same @@ -58,7 +58,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis @@ -72,7 +72,7 @@ Section: debug Priority: extra Depends: libosmoabis5 (= ${binary:Version}), - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis diff --git a/debian/libosmotrau1.install b/debian/libosmotrau2.install similarity index 100% rename from debian/libosmotrau1.install rename to debian/libosmotrau2.install diff --git a/src/Makefile.am b/src/Makefile.am index 7395d17..ab42d38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html ABIS_LIBVERSION=6:0:0 -TRAU_LIBVERSION=2:0:0 +TRAU_LIBVERSION=3:0:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:20:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:20:32 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E115-513c-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7983 to look at the new patch set (#2). Bump version: 0.4.0.115-513c-dirty ? 0.5.0 Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e --- M configure.ac M debian/changelog 2 files changed, 137 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/83/7983/2 diff --git a/configure.ac b/configure.ac index 6365fcb..86b4ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.1) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/changelog b/debian/changelog index 4caccc8..8ece776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,136 @@ +osmo-pcu (0.5.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * implement support for 3-digit MNC with leading zeros + * configure: add --enable-werror + * mslot_class: find_free_tfi(): use uint32_t to shift 1 << 31 + * mslot_class: two more: use uint32_t to shift 1 << 31 + * Revert "Use Timing Advance Index in UL assignments" + * Revert "Rewrite Packet Uplink Assignment" + * Revert "Rewrite Packet Downlink Assignment" + * configure: fix --enable-sysmocom-dsp and --with-sysmobts flags + * configure: properly quote CFLAGS in lc15 check + * Revert "Rewrite EGPRS Packet Uplink Assignment" + * use osmo_init_logging2() with proper talloc ctx + + [ Minh-Quang Nguyen ] + * PCU: Fix TA adjustment + * PCU: display TA information in TBF stats + + [ Max ] + * Remove unused parameter + * Move multislot table to separate file + * Replace '.' in counter names with ':' + * Fix compiler warning + * TBF: log timer override + * TBF: fix compiler warning in test + * TBF: expand timer logging + * vty: print class and TBFs for each MS + * DL window: constify resend_needed() function + * TBF: move EGPRS enablement into (U|D)L-TBF + * TBF-DL: fix misleading idle time check + * TBF: remove unused variable + * Remove unused includes and forward declarations + * Fix tests after rate_ctr change + * Introduce LOGTBF* for consistent logging + * TBF: implement independent T31xx timers + * TBF: add N3101 counter + * Fix warnings + * Add function to get max supported MS class + * Add --enable-sanitize configure option + * Enable sanitize for CI test + * Add tests for pcu_lsb() + * Add optional profiling support + * TBF: unify timer handling + * TBF: log timer invocation source + * TBF: bail out for unknown timers + * Fix llc_queue_size() type + * TBF-DL: mark rcvd_dl_ack() parameters as boolean + * window: move encoding into functions + * cosmetic: clarify coding scheme and puncturing + * Make TBF state private + * TBF: cleanup state flag handling + * Clarify RACH-related interfaces + * TBF-UL: add simpler test helper + * Avoid code duplication in TBF test + * TBF: move window parameters to UL/DL level + * TBF-DL: move priority computation into function + * TBF: unify EGPRS window calculation + * Don't access TBF internals in vty functions + * Fix jenkins.sh to match jenkins job axis filter + * Allocate global context for TypesTest + * Fix sanitizer build + * Rewrite EGPRS Packet Uplink Assignment + * Rewrite Packet Downlink Assignment + * Rewrite Packet Uplink Assignment + * Use Timing Advance Index in UL assignments + * Allow specifying sysmocom headers explicitly + * TBF: log source of state transitions + * jenkins.sh: Disable building doxygen for deps + * Set V_N and V_B to known initial state + * TBF: add dedicated log categories + * TBF: make UL/DL state internal + * TBF: make UL ack state internal + * TBF: make poll state internal + * TBF: adjust test log levels + * Add tests for find_multi_slots() + * AllocTest: adjust test_alloc_b() + * AllocTest: expand test output + * AllocTest: remove assumption on max MS class + * Add multislot classes from latest spec + * cosmetic: fix whitespace issue with include files + * TBF: decrease L1 logging verbosity in test + * TBF: override send function via linker option + * Simplify TS alloc: adjust allocator signatures + * Simplify TS alloc: fix allocation calls + * Simplify TS alloc: avoid TS reassignment + * Simplify TS alloc: use defines for constants + * Simplify TS alloc: adjust function signatures + * TS alloc: print suggested TRX on allocation errors + * Simplify TS alloc: internalize TRX check + * TBF: decrease logging verbosity for traffic + * TBF: add helpers for assignment type handling + * TBF: show assignment kind in vty + * vty: drop unused function + * RACH: improve single block detection + * TBF: move common test code into functions + * emu: use libosmocore definitions + * Use explicit type for pcu_lsb() + * Move paging generation into PDCH + * Move include guard to the top + * Update header includes + * Simplify TS alloc: split off RX mask computation + * Simplify TS alloc: separate capacity computation + * Simplify TS alloc: split allocation + * Simplify TS alloc: split USF/UL allocation + * Move PDCH-related functions into separate files + * Simplify TS alloc: don't use PDCH for free TFI + * Simplify TS alloc: constify max dl slot func + * TBF: make network counters internal + * Simplify TS alloc: move slot assignment + * Simplify TS alloc: move slot check into functions + + [ Pau Espin Pedrol ] + * Print error cause of pcu socket connect failure + * gprs_bssgp_pcu.cpp: Comment unused function parse_ra_cap + + [ Stefan Sperling ] + * Make osmo-pcu wait for BTS to become available at start-up time. + * improve documentation of Encoding::write_paging_request() + + [ Alexander Couzens ] + * pcuif_proto.h: fix whitespaces and indention + * pcuif_proto: add version 8 features + + [ Philipp Maier ] + * cosmetic: remove runaway semicolon + * pcu_l1_if: add frame number to log output + * tbf: add frame number to log output + + -- Pau Espin Pedrol Thu, 03 May 2018 16:20:00 +0200 + osmo-pcu (0.4.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] -- To view, visit https://gerrit.osmocom.org/7983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:20:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:20:39 +0000 Subject: libosmocore[master]: osmo-release.sh: Always generate entire commit changelog In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7997 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf662173ce2b4ff3966e9ad5f56c65dfb13607ff Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:20:45 +0000 Subject: libosmocore[master]: osmo-release.sh: Allow user to add extra information to the ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7998 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie25d921dd27fb7653bd616cb2912330964108663 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:08 +0000 Subject: libosmocore[master]: debian: libosmoctrl: Use correct library version in pkg name In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7999 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I771f6c68570bc3b2bab68e1165c7284fd43e904d Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:16 +0000 Subject: libosmocore[master]: debian/changelog: Fix typo in maintainer e-mail In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8000 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I74bef283090fd7601491c9fef9637f845853d032 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:22 +0000 Subject: =?UTF-8?Q?libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E284-bc47-dirty_=E2=86=92_0=2E11=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8001 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib4fa53a9bb9954ae48d0a610ba9a81dd8e8b4ef6 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:23 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libosmocore=5Bmaster=5D=3A_Bump_version=3A_0=2E10=2E2=2E284-bc47-dirty_=E2=86=92_0=2E11=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 0.10.2.284-bc47-dirty ? 0.11.0 ...................................................................... Bump version: 0.10.2.284-bc47-dirty ? 0.11.0 Remark: For libosmogb and libosmogsm, LIBVERSION was already bumped in c4fce1425e19d604c199c895e227dc2519110456. Change-Id: Ib4fa53a9bb9954ae48d0a610ba9a81dd8e8b4ef6 --- M TODO-RELEASE M debian/changelog M debian/control R debian/libosmocore10.install M src/Makefile.am M src/codec/Makefile.am M src/coding/Makefile.am M src/ctrl/Makefile.am M src/sim/Makefile.am M src/vty/Makefile.am 10 files changed, 333 insertions(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 146ab33..8ccfa49 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,9 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -core msgb_queue_free() add inline func to msgb.h -coding gsm0503_rach_ext-encode() add func to gsm0503_coding.h -codec ecu.c / ecu.h implement ECU for FR (Error Concealment Unit) -fsm fsmc / fsm.h added callback for graceful exit => ABI changed -gsm gsm0480.c / gsm0480.h the 'ss_request' struct extended with ussd_data, - ussd_data_len, and ussd_data_dcs => ABI changed diff --git a/debian/changelog b/debian/changelog index 3ce3fad..393ea17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,326 @@ +libosmocore (0.11.0) unstable; urgency=medium + + [ Max ] + * Enable GnuTLS fallback + * Ctrl: add rate counter group introspection + * ctrl: log incorrect interval values + * Improve get_rate_ctr() error handling + * ctrl: make response easier to parse + * coding test: cosmetic cleanup + * coding test: enable debug output + * coding test: move bit dump into functions + * coding test: use OSMO_ASSERT + * Fix embedded build + * embedded: fix tests + * Embedded: fix sercomm test + * Add functions for extended RACH coding + * Do not allocate already existing counter group + * Fix incorrect spec reference + * Use 127.0.0.1 for GSMTAP logging by default + * coding: move eB adjustement to appropriate place + * Add function to properly encode RAI + * Use existing function for TLLI encoding + * log: print loginfo assertions source + * Allow multiple 'log gsmtap' sinks + * Deprecate gsm48_construct_ra() + * Log lapd_datalink state on errors + * jenkins: add dispatcher script + * Embedded: disable stats test + * Embedded: add sercomm stubs + * GSUP: don't fail test on first error + * jenkins: remove obsolete scripts + * jenkins: move make invocation into shared function + * utils: add helper wrapper for osmo_strlcpy() + * GSUP: change osmo_gsup_encode() return type + * Use python 3 for utilities + * Add test for gsm48_generate_mid_from_imsi() + * Add generic Mobile Identity encoder + * Add function to encode classmark + + [ Niro Mahasinghe ] + * gsm0503_coding.c: Fix tch_efr_unreorder() of one bit + * gsm0503_coding.c: Use majority vote in tch_efr_unreorder() + + [ Harald Welte ] + * debian: build now depends on libgnutls + * Fix/Update copyright notices; Add SPDX annotation + * Print /proc/cpuinfo before executing testsuite + * conv_acc: Our code requires SSSE3, not just SSE3 + * ports.h: Use same VTY port number for osmo-mgw and osmo-bsc_mgcp + * gsmtap.h: Introduce new GSMTAP type for LTE NAS messages + * gsm0808_create_cipher_reject: Fix encoding of Cause IE + * rate_ctr: print proper error message if rate_ctr already exists + * timer: fixup whitespace issues + * control_if: Close control connection socket/fd on read/write == 0 + * control_if: Log the disconnect of a CTRL client + * CTRL: Ensure peer/connection info is always printed the same way + * MNCC: Add MNCC to string dumper + * gsm48_pdisc_names: Use conscise, short names + * SMS: Add value_string for TS 04.11 CP and RP state + * gsm_04_08.h: Clearly annotate timers that don't have a 3GPP Default value + * gsm_04_08.h: Reduce T310 default to 30s. + * gsm48_hdr_msg_type[_r99]: Fix bit-masks + * gsm48_hdr_msg_type(): SS is in the same group as MM/CC + * tlv_parser: Report *first* occurrence of repeated IEs + * msgb: Add msgb_hexdump_{l2,l3}() to dump l2 or l3 part of message buffer + * Revert "Use python 3 for utilities" + * Revert "fsm: do not terminate child FSMs early" + * osmo_msgbdump_{l2,l3}(): Proper typecast + * debian/control: Fix Vcs-Browser URL + * Add GSM 04.08 type-of-number / numbering-plan-id definitions + * talloc_ctx_vty: Fix help strings (missing \n at end of line) + * Revert "Add function to encode classmark" + * rate_ctr: Add rate_ctr_inc2() as convenience wrapper + * coding: Add BER-reporting RACH decode functions + * l1sap: Add RSSI, BER and quarter-bit accurate timing to PH-RACH.ind + * l1sap: Add fields for higher-precision timing offset values + * abis_nm: Introduce abis_nm_dump_foh() + * VTY: Don't welcome the user to the "control" interface, if it's VTY + * prevent integer underflow in ipa_ccm_make_id_resp_from_req() + * RSL/LAPDm: Not all RLL message are "transparent" + + [ Neels Hofmeyr ] + * vty: deprecate now empty node commands + * memleak: osmo_config_list_parse: getline() needs free also on error + * abis_test: sanitize: fix msgb memleak + * lapd_test: sanitize: fix msgb memleaks + * gsm0408_test: sanitize: cleanup msgb + * gsm0808_test: sanitize: fix msgb memleak + * msgb: add inline msgb_queue_free() + * rate_ctr: fix mem leak for mangled desc + * bssgp_fc_test: remove rounding to deciseconds + * bssgp_fc_test: clarify by outputting ok / failure messages + * bssgp_fc_test: sanitizer: free msgb context when done + * gprs_bssgp: bssgp_fc_in(): fix mem leak on queue overflow + * bssgp_fc_test: sanitize: free fc struct when done + * tlv_put: guard against NULL val and 0 len + * sercomm_test: sanitize: fix msgb mem leak + * osmo_strlcpy: sanitize: don't memcpy from NULL src even if len is 0 + * fsm_tmr_cb: don't set T=0, the fi may no longer exist + * vty XML export: avoid repeating common node commands for each node + * VTY reference: do not list empty nodes + * VTY reference: use node names as section names + * vty: set name for VIEW+ENABLE nodes, for VTY reference + * vty reference: merge_doc.xsl: do not omit description tag + * comment: utils: more accurately describe OSMO_STRINGIFY macro + * logging vty: describe 'logging set-log-mask' command, add OSMO_STRINGIFY_VAL() + * fix osmo_identifier_valid(): only allow printable characters + * utils: add osmo_separated_identifiers_valid() + * add osmo_auth_c3() (separate from gsm_milenage()) + * utils: add osmo_escape_str() + * ctrl_test.c: replace print_escaped() with new osmo_escape_str() + * ctrl: prep test: separate new ctrl_handle_msg() from handle_control_read() + * ctrl_test: expand to test message handling and detect mem leaks + * ctrl_test: show memleak when receiving GET_REPLY and SET_REPLY commands + * ctrl: fix mem leak when handling GET_REPLY and SET_REPLY + * ctrl_test: add two more current parsing bugs to prep for fix + * add ctrl_cmd_parse2() to return parsing errors + * ctrl: on parse errors, return a detailed message to sender + * rate_ctr: fix osmo-sgsn DoS: don't return NULL on already used index + * ports: define proper VTY and CTRL ports for OsmoHNBGW + * ctrl: tighten CTRL input parsing + * ctrl: separate handling of GET_REPLY, SET_REPLY and TRAP + * jenkins: add 'make V=1' for more verbose build logs + * logging vty: tweak general 'logging' command doc + * gsm: add gsm0808_speech_codec_type_names + * logging-gsmtap: send only basename of source file + * logging: add ability to log the log-level with API and vty + * logging: color the log level + * logging: color the log category according to level + * fix -Werror build: logging.c: always use literal with snprintf + * cosmetic: logging: if color is disabled, don't print "" + * logging: separate the '<000b>' subsys from filename logging + * logging: allow to log only the basename of each source + * logging vty: add 'logging print file (0|1|basename)' cmd + * vty: fix 'logging print file' output + * gsmtap_sendmsg(): clarify API doc concerning msgb ownership + * memleak: gsmtap_sendmsg(): don't return 0 when no data was written + * memleak: fix all libosmocore callers of gsmtap_sendmsg() to free on failure + * memleak: _gsmtap_raw_output(): free msg in case of vsnprintf failure + * cosmetic: gsm0408_test: RA test cases as array-of-struct + * gsm0408_test: cosmetically re-order MCC to come before MNC + * gsm0408_test: include BCD and leading zeros in test output + * gsm0408_test: RA test: include min/max value cases + * gsm0408_test: also test gsm48_generate_lai() and gsm48_decode_lai() + * implement support for 3-digit MNC with leading zeros + * gsm0408_test: check for new mnc_3_digits flag + * gsm0408_test: test new gsm48_{decode,generate}_lai2() functions + * gsm0408_test: add test cases for MNC with leading zeros + * gsm: add osmo_mnc_from_str(), osmo_mnc_cmp(), osmo_plmn_cmp() for 3-digit MNC + * introduce GSM_MCC_MNC_INVALID + * gsm23003_test: fix: compare members instead of bcmp + * fix osmo_mnc_from_str(): don't try to parse NULL + * gsm23003: add osmo_mcc_from_str() + * configure: add --enable-werror + * jenkins_amd64.sh: use --enable-werror configure flag, not CFLAGS + * gsm0808_test: cosmetic: re-arrange struct init; print hexdump on failure + * gsm0808_test: cosmetic: test non-hex MCC + * show failure in gsm0808_enc_cell_id_list2() in gsm0808_test + * fix gsm0808_enc_cell_id_list2 for leading-zero MNC + * cosmetic: gsm0808_test: drop extraneous assertion + * contrib/fsm-to-dot: add -h option to print basic instructions + * contrib/fsm-to-dot: allow transition from and to the same state + * contrib/fsm-to-dot: don't match on event names in comments + * contrib/fsm-to-dot: warn and draw unallowed state transitions + * contrib/fsm-to-dot: add default edge label '-' + * contrib/fsm-to-dot: mark arrows that feed events + * contrib/fsm-to-dot: less false positives on event parsing + * contrib/fsm-to-dot: mark illegal states in red + * contrib/fsm-to-dot: warn about identically named FSMs + * vty/command.c: write_config_file(): sanely compose temp path + * fix logging talloc ctx: add osmo_init_logging2() + * ctrl: test deferred cmd, show current failure + * ctrl: fix deferred commands (and hence fix osmo-bts-sysmo 'clock-info' cmd) + * cosmetic: flatten ctrl_handle_msg() + * fix ctrl_test sanitizer issues + * use osmo_init_logging2() with proper talloc ctx + * add osmo_quote_str(),osmo_quote_str_buf() and test + * fsm_test: terminate the main loop instead of exit on timeout + * osmo_fsm_inst_find_by_name(): guard against strcmp(NULL) + * fsm_test: more thoroughly test FSM inst ids and names + * fsm: id: properly set name in case of NULL id + * cosmetic: osmo_fsm_inst_update_id(): don't log "allocate" + * add osmo_fsm_inst_update_id_f() + * add gsm48_reject_value_names + * deprecate PLMN de-/coding functions incapable of 3-digit MNC with leading zeros + * avoid warning in gsm0808_create_layer3 + * add osmo_cgi_name() + * add gsm0808_cell_id_list_add() to combine two cell identifier lists + * add tlv_parse2(), capable of multiple instances of the same IE + * add gsm0808_{enc,dec}_cell_id + * test_gsm0808_enc_dec_cell_id_list_lac(): validate encoded bytes + * test_gsm0808_enc_dec_cell_id_list_lac(): populate all LACs + * test_gsm0808_enc_dec_speech_codec_with_cfg: initialize properly + * cosmetic: log: fix typo, clarify msg for rate_ctr name mangling + * tlv: add TLV_GET() and TLV_GET_MINLEN() + * add gsm0808_cell_{id,id_list}_name() and friends + * gsm0808_test: fix more missing inits (address sanitizer issues) + * gsm0808_test: silence deprecation: use gsm0808_create_layer3_2() + + [ Philipp Maier ] + * vty: add port number for osmo-mgw + * libosmocodec: add FR bit offset definitions + * libosmocodec: implement ECU (Error Concealment Unit) for FR + * fsm: fix double llist_del in osmo_fsm_inst_term() + * socket: fix socket leak in osmo_sock_local_ip() + * socket: use inet_ntop() instead of inet_ntoa() in osmo_sock_local_ip() + * fsm: add functions for unlinking and changing parents + * fsm: do not terminate child FSMs early + * fsm: allow graceful exit on FSM termination + * features: move bts feature related functionality to libosmocore + * features: define osmo_bts_*_feature() as static inline + * gsm_08_08: correct speech codec defaults + * gsm0808: Add value strings for BSSMAP cause codes + + [ Pau Espin Pedrol ] + * vty: Fix bad use of vector_slot() + * gsm: Use correct include for getrandom + * utils: Fix false positive in compiler warning + * cosmetic: Fix trailing whitespace + * Fix malformed Abis/RSL messages with extra L3 Information field + * tests: coding_test: Fix compilation with -O0 + * tests: utils_test: Fix test failure when compiling with -O0 + * ports.h: Add VTY and CTRL ports for osmo-trx + * core: Add timespec helper macros and make timer_compat.h public + * core/logging.h: Add logging category for jitter buffer + * timer: Introduce osmo_clock_gettime to override clock_gettime + * timer: Document osmo_gettimeofday API + * osmo-release.sh: Set correct version when generating the changelog + * socket.c: osmo_sock_init2: bind: Several logic fixes and log improvements + * socket.c: osmo_sock_init2: connect: Several logic fixes and log improvements + * socket.c: osmo_sock_init: Several logic fixes and log improvements + * msgb: msgb_get: Drop unneeded tmp var + * msgb: msgb_pull: Abort when pulling more than avail size + * osmo_get_macaddr: Fix buffer read out of bounds + * osmo_sockaddr_is_local: Fix memleak + * gsm_08_58.h: Add Ericsson vendor-specific RSL message types + * osmo-release.sh: Remove temporary file TODO-RELEASE.entries after use + * osmo-release.sh: Exit with error if no description for new changelog entry provided + * osmo-release.sh: Fix error condition no LIBVERSION modified + * osmo-release.sh: Always generate entire commit changelog + * osmo-release.sh: Allow user to add extra information to the release commit + * debian: libosmoctrl: Use correct library version in pkg name + * debian/changelog: Fix typo in maintainer e-mail + + [ Holger Hans Peter Freyther ] + * logging: Extend the LOGPSRC macro to put cont in it as well + * license: Fix the license to GPL + + [ Alexander Couzens ] + * counters: add osmo_counters_count() returns the amount of counters + * vty: show asciidoc counters: don't create an empty table for osmo_counters + * gsm_08_58.h: introduce RSL_IE_ERIC_PAGING_GROUP + * gsm_utils: call gnutls_global_init() as constructor + + [ Jean-Francois Dionne ] + * Fix LAPD UA msgb memory leak. + + [ Vadim Yanitskiy ] + * libosmocodec: add FR/HR/EFR frame length definitions + * ussd_test.c: fix rc / len debug output confusion + * gsm0480: fix USSD OCTET STRING length confusion + * gsm0480: clean up the parse_process_uss_req() code + * gsm0480: handle UnstructuredSS Request with DSC != 0x0F + * gsm0480: parse GSM0480_MTYPE_FACILITY separately + * gsm0480: handle GSM0480_CTYPE_RETURN_RESULT + * gsm0480: handle USS_NOTIFY and USS_REQUEST with PROCESS_USS_REQ + * gsm0480: handle GSM0480_OP_CODE_PROCESS_USS_DATA + * gsm0480: add specification reference to SS message type + * gsm0480: pass exact GSM 04.80 payload length to parse_ss() + * gsm0480: move SS request length check to parse_ss() + * gsm0480: refactor gsm0480_decode_ss_request + * gsm0480: correct parse_ss_info_elements() declaration + * tests/ussd: fix wrong GSM 04.80 payload length + * gsm0480: parse all SS info elements in a message + * gsm0480: parse optional IEs for RELEASE COMPLETE message + * tests/ussd: prevent uninitialized memory access + * libosmocoding: fix typo in library documentation + * libosmocoding: use frame length definitions from codec.h + * src/msgb.c: cosmetic: fix spelling mistakes + * src/msgb.c: remove dead includes from OpenBSC + * src/msgb.c: print an error if msgb allocation failed + * src/msgb.c: avoid using internal talloc API + * gsm0480: document the 'ss_request' structure + * gsm0480: copy the raw USSD data, its DCS and length + * gsm0480: drop messages with incorrect data length + * protocol/gsm_04_08.h: drop incorrect GSM48_PDISC_USSD + * gsm/gsm48.c: add call independent SS message names + + [ Stefan Sperling ] + * TLVP_PRESENT() should not return TRUE after tlv_parse() fails. + * Add helper functions for ACC bit flags in rach control IE. + * ensure that osmo_fsm vty commands are only installed once + * print BIG FAT ERROR message if osmo_fsm lacks event names + * ensure VTY commands don't segfault if an FSM has no event names + * support for more cell ID list types in libosmocore + * fix a cell identifier parsing bug in libosmocore + * fix cell identifier decoding in libosmocore + * use gsm48_decode_lai2() in gsm0808_dec_cell_id_list() + * fix bug in parse_cell_id_ci_list() + * fix parse_cell_id_lac_and_ci_list() + * add a test for CELL_IDENT_WHOLE_GLOBAL cell identifier lists + * add a regression test for TLV parsing with repeated IEs + + [ Sergey Kostanbaev ] + * gsm0480: skip length check for 'RELEASE COMPLETE' message + + [ allesklar2 ] + * gsmtap.h: define TETRA DMO mode channels + + [ Martin Hauke ] + * build: Ensure all .pc files are installed + + [ Daniel Willmann ] + * fsm: Add a function to change the FSM instance ID later + * contrib/jenkins_arch.sh: Fix script comparison and arm support + * fsm: Update the name as well if the id is updated and accept NULL + + [ Thorsten Alteholz ] + * fix spelling + * fix issue on big endian architecture + + -- Pau Espin Pedrol Thu, 03 May 2018 15:47:11 +0200 + libosmocore (0.10.2) unstable; urgency=medium * Revert "vty: Fix bad use of vector_slot()" diff --git a/debian/control b/debian/control index 29dbd16..912582b 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Multi-Arch: foreign Depends: libosmocodec0 (= ${binary:Version}), libosmocoding0 (= ${binary:Version}), - libosmocore9 (= ${binary:Version}), + libosmocore10 (= ${binary:Version}), libosmogb6 (= ${binary:Version}), libosmogsm9 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), @@ -110,7 +110,7 @@ . This package contains the documentation for the libosmocoding library. -Package: libosmocore9 +Package: libosmocore10 Section: libs Architecture: any Multi-Arch: same @@ -124,14 +124,14 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmocore9 library in particular is a collection of common code used in + The libosmocore10 library in particular is a collection of common code used in various sub-projects inside the Osmocom family of projects. Package: libosmocore-doc Architecture: all Section: doc Depends: ${misc:Depends}, - libosmocore9, + libosmocore10, libjs-jquery, libosmocodec-doc, libosmocoding-doc, diff --git a/debian/libosmocore9.install b/debian/libosmocore10.install similarity index 100% rename from debian/libosmocore9.install rename to debian/libosmocore10.install diff --git a/src/Makefile.am b/src/Makefile.am index 2641a97..60b76b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=9:0:0 +LIBVERSION=10:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index f77d910..60fce5e 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include $(TALLOC_CFLAGS) AM_CFLAGS = -Wall diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index dcbbd8f..a17e3d1 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION = 0:0:0 +LIBVERSION = 1:0:1 AM_CPPFLAGS = \ -I"$(top_srcdir)/include" \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 2bda5b7..71cc9a3 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=1:0:1 +LIBVERSION=2:0:2 AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include $(TALLOC_CFLAGS) diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am index 869e12d..ebf4739 100644 --- a/src/sim/Makefile.am +++ b/src/sim/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=0:1:0 +LIBVERSION=0:2:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index 7b5e1e5..18d3a84 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=4:0:0 +LIBVERSION=4:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8001 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4fa53a9bb9954ae48d0a610ba9a81dd8e8b4ef6 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:23 +0000 Subject: [MERGED] libosmocore[master]: debian/changelog: Fix typo in maintainer e-mail In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/changelog: Fix typo in maintainer e-mail ...................................................................... debian/changelog: Fix typo in maintainer e-mail Change-Id: I74bef283090fd7601491c9fef9637f845853d032 --- M debian/changelog 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index a50e30b..3ce3fad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,20 +3,20 @@ * Revert "vty: Fix bad use of vector_slot()" * New upstream release of libosmocore - -- Harald Welte Thu, 02 Nov 2017 18:51:02 +0100 + -- Harald Welte Thu, 02 Nov 2017 18:51:02 +0100 libosmocore (0.10.1) unstable; urgency=medium * New upstream release of libosmocore - -- Harald Welte Sun, 29 Oct 2017 10:46:47 +0100 + -- Harald Welte Sun, 29 Oct 2017 10:46:47 +0100 libosmocore (0.10.0+nmu1) UNRELEASED; urgency=medium * Non-maintainer upload. * New upstream release of libosmocore - -- Harald Welte Fri, 27 Oct 2017 19:45:00 +0200 + -- Harald Welte Fri, 27 Oct 2017 19:45:00 +0200 libosmocore (0.9.6) unstable; urgency=medium @@ -148,7 +148,7 @@ libosmocore (0.5.3+git1-2) unstable; urgency=low - * New upstream version + * New upstream version -- Holger Hans Peter Freyther Mon, 05 Nov 2012 21:35:57 +0100 -- To view, visit https://gerrit.osmocom.org/8000 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74bef283090fd7601491c9fef9637f845853d032 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:23 +0000 Subject: [MERGED] libosmocore[master]: debian: libosmoctrl: Use correct library version in pkg name In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian: libosmoctrl: Use correct library version in pkg name ...................................................................... debian: libosmoctrl: Use correct library version in pkg name The number used in debian packaging is actually current-age, which is still 0 in this case after it was bumped a while ago. As a result, we had a libosmoctrl1_*.deb package installing a libosmoctrl.so.0 file. Fixes: OS#3175 Change-Id: I771f6c68570bc3b2bab68e1165c7284fd43e904d --- M debian/control R debian/libosmoctrl0.install 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index d911f32..29dbd16 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ libosmogb6 (= ${binary:Version}), libosmogsm9 (= ${binary:Version}), libosmovty4 (= ${binary:Version}), - libosmoctrl1 (= ${binary:Version}), + libosmoctrl0 (= ${binary:Version}), libosmosim0 (= ${binary:Version}), ${misc:Depends} Description: Open Source MObile COMmunications CORE library (metapackage) @@ -245,7 +245,7 @@ . This package contains the documentation for the libosmovty library. -Package: libosmoctrl1 +Package: libosmoctrl0 Section: libs Architecture: any Multi-Arch: same @@ -259,7 +259,7 @@ (at least) other programs that are developed in the sphere of Free Software / Open Source mobile communication. . - The libosmoctrl1 library in particular contains an SNMP-like status interface. + The libosmoctrl library in particular contains an SNMP-like status interface. Package: libosmosim0 Section: libs diff --git a/debian/libosmoctrl1.install b/debian/libosmoctrl0.install similarity index 100% rename from debian/libosmoctrl1.install rename to debian/libosmoctrl0.install -- To view, visit https://gerrit.osmocom.org/7999 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I771f6c68570bc3b2bab68e1165c7284fd43e904d Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:23 +0000 Subject: [MERGED] libosmocore[master]: osmo-release.sh: Allow user to add extra information to the ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-release.sh: Allow user to add extra information to the release commit ...................................................................... osmo-release.sh: Allow user to add extra information to the release commit Change-Id: Ie25d921dd27fb7653bd616cb2912330964108663 --- M osmo-release.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index 3b50ded..86b41d8 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -43,5 +43,6 @@ dch -r -m --distribution "unstable" "" git add debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty +git commit --amend # let the user add extra information to the release commit. git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." echo "Release $NEW_VER prepared, tagged and signed." -- To view, visit https://gerrit.osmocom.org/7998 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie25d921dd27fb7653bd616cb2912330964108663 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:24 +0000 Subject: [MERGED] libosmocore[master]: osmo-release.sh: Always generate entire commit changelog In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-release.sh: Always generate entire commit changelog ...................................................................... osmo-release.sh: Always generate entire commit changelog Before this commit, for library projects (containing LIBVERSION in some Makefile), the entire commit list was not stored into the changelog, but only a few lines from TODO-RELEASE files. This is a bad approach for several reasons. First, because that file was only aimed at containing API/ABI breaks, and not the full relevant changeset (like bugfixes, new features, etc.). Second, because it relies on every developer making API/ABI changes to remember to store the change in there during commit break time. Let's instead always store the entire commit list in changelog, and let's use TODO-RELEASE only as a list of hints for the maintainer to help him evaluate how LIBVERSION needs to be bumped for each library. Other tools such as osmo-abi-check.git can be used to help with the process of decission too. Let's take the opportunity too to only commit stuff already added to the staging area, as it proved easier to manage from my personal experinece making latest releases. Change-Id: Ibf662173ce2b4ff3966e9ad5f56c65dfb13607ff --- M TODO-RELEASE M osmo-release.sh 2 files changed, 13 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 16496d6..146ab33 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,6 +1,6 @@ # When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install -# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info -# In short: +# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release +# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info # LIBVERSION=c:r:a # If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. # If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. diff --git a/osmo-release.sh b/osmo-release.sh index 0e85023..3b50ded 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -11,7 +11,7 @@ NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'` LIBVERS=`git grep -n LIBVERSION | grep '=' | grep am | grep -v LDFLAGS` -MAKEMOD=`git diff -GLIBVERSION --stat | grep Makefile.am` +MAKEMOD=`git diff --cached -GLIBVERSION --stat | grep Makefile.am` ISODATE=`date -I` if [ "z$BUMPVER" = "z" ]; then @@ -26,28 +26,22 @@ echo "Releasing $VERSION -> $NEW_VER..." -if [ "z$LIBVERS" = "z" ]; then - gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" -else - echo "You should NOT be doing this unless you've read and understood following article:" - echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" - grep -v '#' TODO-RELEASE | sed 's/\t\+/: /g' > TODO-RELEASE.entries - if [ "$(wc -l /dev/null)" -eq "0" ]; then - rm TODO-RELEASE.entries - echo "TODO-RELEASE must contain at least one line with change descriptions" - exit 1 - fi - grep '#' TODO-RELEASE > TODO-RELEASE.clean - mv TODO-RELEASE.clean TODO-RELEASE +if [ "z$LIBVERS" != "z" ]; then if [ "z$MAKEMOD" = "z" ]; then echo "Before releasing, please modify some of the libversions: $LIBVERS" + echo "You should NOT be doing this unless you've read and understood following article:" + echo "https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info" exit 1 fi - xargs -a TODO-RELEASE.entries -r -d'\n' -I entry dch -m -v $NEW_VER "entry" - rm TODO-RELEASE.entries + if [ -f "TODO-RELEASE" ]; then + grep '#' TODO-RELEASE > TODO-RELEASE.clean + mv TODO-RELEASE.clean TODO-RELEASE + git add TODO-RELEASE + fi fi +gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER" dch -r -m --distribution "unstable" "" -git add -u +git add debian/changelog bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE." echo "Release $NEW_VER prepared, tagged and signed." -- To view, visit https://gerrit.osmocom.org/7997 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf662173ce2b4ff3966e9ad5f56c65dfb13607ff Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:21:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:21:50 +0000 Subject: =?UTF-8?Q?libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:22:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:22:10 +0000 Subject: =?UTF-8?Q?osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E115-513c-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:22:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:22:44 +0000 Subject: =?UTF-8?Q?osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:23:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:23:55 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7985 to look at the new patch set (#2). Bump version: 0.3.0-dirty ? 0.4.0 Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad --- M configure.ac M debian/changelog 2 files changed, 125 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/85/7985/2 diff --git a/configure.ac b/configure.ac index 2b2dab7..5f66225 100644 --- a/configure.ac +++ b/configure.ac @@ -74,9 +74,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index ec65036..a9724d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,125 @@ +osmo-trx (0.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + + [ Harald Welte ] + * SocketsTest: Fix printing of non-nul-terminated string + * Revert "debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb" + * debian/control: Remove "Maintainer" from binary package section + * debian/rules: Make sure we always require libusrp + * debian: Ensure USRP1 firmware is part of osmo-trx-usrp1 + * debian/control: Add build dependency to libusrp-dev + * update .gitignore for new executable names + * osmo-trx: s/GSM Core Address/GSM BTS Address/ + + [ Piotr Krysik ] + * UHDDevice.cpp: add USRP B205mini support + + [ Max ] + * Mark release target as virtual + * Remove outdated references to OpenBTS + * Remove unused headers + * Update installation instructions + * Update legal disclaimer + * Update license notes + * tests: null-terminate buffer + + [ Pau Espin Pedrol ] + * cosmetic: Remove trailing whitespace + * Logger: Stop using Log.Alarms.Max from config + * Logger: Stop using Log.File and Log.Level from config + * Drop use of ConfigurationTable gConfig + * Remove Configuration module and libsqlite dependency + * cosmetic: AUTHORS: fix trailing whitespace + * Set up GNU Autotest infrastructure + * tests: InterThread: adapt to have reproducible output and enable autotest + * tests: Timeval: adapt to have reproducible output and enable autotest + * tests: Log: adapt to have reproducible output and enable autotest + * Sockets.cpp: Fix initialization of UDD socket + * tests: Sockets: adapt to have reproducible output and enable autotest + * utils/convolvtest: Remove uneeded libosmocore dependency + * Move ARCH_LA to Makefile.common + * tests: Migrate convtest util to autotest infrastructure + * arm/convert.c: Fix compilation error + * arm/convert.c: Add missing convert_init implementation + * .gitignore: Add missing test related files + * Remove UDDSocket class + * tests: SocketTests: Pick OS-assigned instead of setting one manually + * tests: SocketsTest: Avoid hang forever if test fails + * tests: SocketsTest: Fail test on write fail + * tests: TimevalTest: refactor and avoid double comparison + * contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests with ARM instruction set + * tests: convolve: Disable due to difference in output in different archs + * Remove unneeded libdl dependency + * Fix whitespace + * Add support to set Rx/TxAntenna + * UHDDevice: Initialize async_event_thrd in constructor + * Logger: Drop unused gLogEarly + * Logger: Remove unused logging macros + * Logger: get rid of alarm APIs + * Logger: Drop syslog support + * Logger: Drop support to log into file + * Logger: Remove unused includes + * Logger: Remove gLogToConsole flag + * configure.ac: Check for pkg-config + * Depend on libosmocore + * osmo-trx: set up signals using libosmocore helpers + * osmo-trx: Set up talloc ctx + * debian: Depend on libtalloc and libosmocore + * Add initial support for logging, vty, ctrl + * Logger: Use libosmocore logging system + * osmo-trx.cpp: Move trx start and stop to helper functions + * Move enums required by VTY to a separate header + * vty: Implement VTY cfg parsing for current parameters + * doc: Add sample cfg file for LimeSDR + * osmo-trx: Use VTY cfg structures while still allowing cmd line options + * osmo-trx: Re-introduce -l cmd line parameter + * Makefile.am: Avoid using subdir if arch is not required + * Build Transceiver52M/common as an .la lib + * use osmo_init_logging2() + * tests: Makefile.am: Fix typo in include path + * configure.ac: Add --enable-sanitize option + * Move arch specific fiels to arch subdir + * Move device specific files to device subdir + * Change configure define USRP1 to DEVICE_USRP1 + * Move device specific code out of radioInterface + * Transceiver: Move device specific code to radioDevice class + * Build one osmo-trx binary for each device support enabled + * Logger: Print correct source file and line number + * Transceiver: log timing info of stale bursts + * build: Fix make distcheck + * build: More OBS build failure fixes + * jenkins.sh: Enable build of osmo-trx-usrp1 + * debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb + * debian: Fix OBS build + * build: Fix OBS build for ARM + * git-version-gen: Take into account tags not in master + + [ Alexander Huemer ] + * Unbreak `./configure --with-usrp1` build + * Fix USRP1 build with support for setting Rx/TxAntenna + + [ Alexander Couzens ] + * jenkins.sh: fix the download url if the qemu image wasn't setup + * jenkins.sh: cleanup always the workspace + * jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of /opt/qemu-img + + [ Vadim Yanitskiy ] + * Transceiver.cpp: use a define for the MAX_PACKET_LENGTH + * Transceiver.cpp: properly zero-terminate received commands + * Transceiver.cpp: use pointer arithmetics for CMD parsing + * Transceiver.cpp: fix incorrect format string for SETTSC + * Transceiver.cpp: prevent out-of-range array access + + [ Martin Hauke ] + * configure.ac: Fix typo + + [ Philipp Maier ] + * doc: add example config for usrp B200 series + + -- Pau Espin Pedrol Thu, 03 May 2018 16:23:29 +0200 + osmo-trx (0.2.0) unstable; urgency=medium [ Alexander Chemeris ] -- To view, visit https://gerrit.osmocom.org/7985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:27:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:27:44 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E39-1cb4-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7986 to look at the new patch set (#2). Bump version: 0.1.0.39-1cb4-dirty ? 0.2.0 Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 --- M configure.ac M debian/changelog 2 files changed, 62 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/86/7986/2 diff --git a/configure.ac b/configure.ac index 723c43f..a632a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 7d8b208..dce4dd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +osmo-hlr (0.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * hlr_db_tool: fix error log strerror invocation + * cosmetic: add comment on ignored return value + * db-tool: add command 'create' + * db-tool: cosmetic: tweak printf output + * db-tool: error-exit on too many arguments + * add --enable-sanitize config option + * db_test: don't verify SQLite issued error messages, they might change + * cosmetic: rx_send_auth_info(): decide error cause with switch() + * return GMM_CAUSE_IMSI_UNKNOWN if there is no auth data + * db_get_auth_data / db_get_auc: clarify return values + * osmo-hlr: log details for unknown IMSI / no auth data / db error + * db_test: also test db_get_auc() return values + * fix test_subscriber_errors.ctrl after libosmocore change + * fix debug log: put 'deriving 2G from 3G' in proper place + * ctrl test: fix: adjust expectations after stricter ctrl parsing + * fix build: db_test: missing LIBOSMOABIS_CFLAGS and _LIBS + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * hlr.c: Avoid overflow of lu_operation.subscr.imsi + * Fix expected test output after new 'logging print file 1' vty command + * osmo-hlr: Add talloc context introspection via VTY + * vty: Don't print error if removing auth data while none present + * Fix responses to PURGE MS + + [ Alexander Couzens ] + * debian: include systemd service osmo-hlr.service + * doc: install example .cfg files to $(docdir)/examples/ + * debian: install osmo-hlr.cfg to /etc/osmocom + + [ Max ] + * Remove unused check + * Remove unused ipa.py + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * luop.c: Transform FIXME from warning to pragma message + * contrib:jenkins.sh: Enable Werror + * use osmo_init_logging2 + * Remove unused src/db_test.c + + [ Alexander Huemer ] + * Add missing build products in .gitignore + + [ Stefan Sperling ] + * more robust usage of osmo_timer API for osmo-hlr luop timer + * notify GSUP clients when HLR subscriber information changes + * rewrite subscriber_update_notify() without calls into luop + * don't forget to mark luop as a packet switched connection + + -- Pau Espin Pedrol Thu, 03 May 2018 16:27:13 +0200 + osmo-hlr (0.1.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/7986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 14:32:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:32:16 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libosmo-abis=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E21-60fd-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.4.0.21-60fd-dirty ? 0.5.0 ...................................................................... Bump version: 0.4.0.21-60fd-dirty ? 0.5.0 libosmotrau library version in debian package was wrong, fix it while releasing. Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmotrau2.install M src/Makefile.am 6 files changed, 45 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index b02e1eb..d0852fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmotrau addition New osmo_rtp_set_source_desc() wrapper around libortp diff --git a/configure.ac b/configure.ac index 05fbb12..0aca550 100644 --- a/configure.ac +++ b/configure.ac @@ -59,9 +59,9 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.10) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) diff --git a/debian/changelog b/debian/changelog index 13c0996..4c48e6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,40 @@ +libosmo-abis (0.5.0) unstable; urgency=medium + + [ Max ] + * Use value string check from osmo-ci + * cosmetic: update ipaccess_bts_handle_ccm() + * IPA: log remote address + + [ Neels Hofmeyr ] + * cosmetic: ipa.c: use msgb_dequeue(), drop local var + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Alexander Couzens ] + * debian/rules: show testsuite.log when tests are failing + * unixsocket: fix a potential string overflow + + [ Harald Welte ] + * debian/copyright: fix upstream-name + * Add SPDX-License-Identifier to all source files + * Add a new osmo_rtp_set_source_desc() function to set the RTCP SDES items + * debian/control: Fix Vcs-Browser + + [ Pau Espin Pedrol ] + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * e1_input.h: Remove dead declaration of unexistent API ipaccess_setup + * configure.ac: Fix condition check for RTP_SIGNAL_PTR_CAST define + * use osmo_init_logging2 + * git-version-gen: Check first for new tag format + + [ Stefan Sperling ] + * preserve 'when' flags of new osmo_fd in ipaccess_rcvmsg() + + -- Pau Espin Pedrol Thu, 03 May 2018 16:12:04 +0200 + libosmo-abis (0.4.0) unstable; urgency=medium * Move forward towards a new release. diff --git a/debian/control b/debian/control index dd958c8..10295e6 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one @@ -40,7 +40,7 @@ It also implements drivers for mISDN and DAHDI based E1 cards, as well as some A-bis/IP dialects. -Package: libosmotrau1 +Package: libosmotrau2 Section: libs Architecture: any Multi-Arch: same @@ -58,7 +58,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) Description: Development headers for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis @@ -72,7 +72,7 @@ Section: debug Priority: extra Depends: libosmoabis5 (= ${binary:Version}), - libosmotrau1 (= ${binary:Version}), + libosmotrau2 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for A-bis interface The libosmo-abis library contains common/shared code regarding the A-bis diff --git a/debian/libosmotrau1.install b/debian/libosmotrau2.install similarity index 100% rename from debian/libosmotrau1.install rename to debian/libosmotrau2.install diff --git a/src/Makefile.am b/src/Makefile.am index 7395d17..ab42d38 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html ABIS_LIBVERSION=6:0:0 -TRAU_LIBVERSION=2:0:0 +TRAU_LIBVERSION=3:0:1 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -- To view, visit https://gerrit.osmocom.org/7982 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I399618c7353a4150e3d571758b522dd2e9d9724f Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:37:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:37:58 +0000 Subject: =?UTF-8?Q?osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:38:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 14:38:04 +0000 Subject: =?UTF-8?Q?osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E39-1cb4-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 14:38:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:38:26 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E0=2E39-1cb4-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.1.0.39-1cb4-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.0.39-1cb4-dirty ? 0.2.0 Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 --- M configure.ac M debian/changelog 2 files changed, 62 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 723c43f..a632a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -34,11 +34,11 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.9.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/debian/changelog b/debian/changelog index 7d8b208..dce4dd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +osmo-hlr (0.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * hlr_db_tool: fix error log strerror invocation + * cosmetic: add comment on ignored return value + * db-tool: add command 'create' + * db-tool: cosmetic: tweak printf output + * db-tool: error-exit on too many arguments + * add --enable-sanitize config option + * db_test: don't verify SQLite issued error messages, they might change + * cosmetic: rx_send_auth_info(): decide error cause with switch() + * return GMM_CAUSE_IMSI_UNKNOWN if there is no auth data + * db_get_auth_data / db_get_auc: clarify return values + * osmo-hlr: log details for unknown IMSI / no auth data / db error + * db_test: also test db_get_auc() return values + * fix test_subscriber_errors.ctrl after libosmocore change + * fix debug log: put 'deriving 2G from 3G' in proper place + * ctrl test: fix: adjust expectations after stricter ctrl parsing + * fix build: db_test: missing LIBOSMOABIS_CFLAGS and _LIBS + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * hlr.c: Avoid overflow of lu_operation.subscr.imsi + * Fix expected test output after new 'logging print file 1' vty command + * osmo-hlr: Add talloc context introspection via VTY + * vty: Don't print error if removing auth data while none present + * Fix responses to PURGE MS + + [ Alexander Couzens ] + * debian: include systemd service osmo-hlr.service + * doc: install example .cfg files to $(docdir)/examples/ + * debian: install osmo-hlr.cfg to /etc/osmocom + + [ Max ] + * Remove unused check + * Remove unused ipa.py + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * luop.c: Transform FIXME from warning to pragma message + * contrib:jenkins.sh: Enable Werror + * use osmo_init_logging2 + * Remove unused src/db_test.c + + [ Alexander Huemer ] + * Add missing build products in .gitignore + + [ Stefan Sperling ] + * more robust usage of osmo_timer API for osmo-hlr luop timer + * notify GSUP clients when HLR subscriber information changes + * rewrite subscriber_update_notify() without calls into luop + * don't forget to mark luop as a packet switched connection + + -- Pau Espin Pedrol Thu, 03 May 2018 16:27:13 +0200 + osmo-hlr (0.1.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/7986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a9fdd140d68053bc7c8354bf2b3a0293c514516 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:39:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:39:33 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-trx=5Bmaster=5D=3A_Bump_version=3A_0=2E3=2E0-dirty_=E2=86=92_0=2E4=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.3.0-dirty ? 0.4.0 ...................................................................... Bump version: 0.3.0-dirty ? 0.4.0 Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad --- M configure.ac M debian/changelog 2 files changed, 125 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 2b2dab7..5f66225 100644 --- a/configure.ac +++ b/configure.ac @@ -74,9 +74,9 @@ AC_HEADER_TIME AC_C_BIGENDIAN -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index ec65036..a9724d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,125 @@ +osmo-trx (0.4.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + + [ Harald Welte ] + * SocketsTest: Fix printing of non-nul-terminated string + * Revert "debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb" + * debian/control: Remove "Maintainer" from binary package section + * debian/rules: Make sure we always require libusrp + * debian: Ensure USRP1 firmware is part of osmo-trx-usrp1 + * debian/control: Add build dependency to libusrp-dev + * update .gitignore for new executable names + * osmo-trx: s/GSM Core Address/GSM BTS Address/ + + [ Piotr Krysik ] + * UHDDevice.cpp: add USRP B205mini support + + [ Max ] + * Mark release target as virtual + * Remove outdated references to OpenBTS + * Remove unused headers + * Update installation instructions + * Update legal disclaimer + * Update license notes + * tests: null-terminate buffer + + [ Pau Espin Pedrol ] + * cosmetic: Remove trailing whitespace + * Logger: Stop using Log.Alarms.Max from config + * Logger: Stop using Log.File and Log.Level from config + * Drop use of ConfigurationTable gConfig + * Remove Configuration module and libsqlite dependency + * cosmetic: AUTHORS: fix trailing whitespace + * Set up GNU Autotest infrastructure + * tests: InterThread: adapt to have reproducible output and enable autotest + * tests: Timeval: adapt to have reproducible output and enable autotest + * tests: Log: adapt to have reproducible output and enable autotest + * Sockets.cpp: Fix initialization of UDD socket + * tests: Sockets: adapt to have reproducible output and enable autotest + * utils/convolvtest: Remove uneeded libosmocore dependency + * Move ARCH_LA to Makefile.common + * tests: Migrate convtest util to autotest infrastructure + * arm/convert.c: Fix compilation error + * arm/convert.c: Add missing convert_init implementation + * .gitignore: Add missing test related files + * Remove UDDSocket class + * tests: SocketTests: Pick OS-assigned instead of setting one manually + * tests: SocketsTest: Avoid hang forever if test fails + * tests: SocketsTest: Fail test on write fail + * tests: TimevalTest: refactor and avoid double comparison + * contrib/jenkins.sh: Use qemu+proot+debootstrap to run tests with ARM instruction set + * tests: convolve: Disable due to difference in output in different archs + * Remove unneeded libdl dependency + * Fix whitespace + * Add support to set Rx/TxAntenna + * UHDDevice: Initialize async_event_thrd in constructor + * Logger: Drop unused gLogEarly + * Logger: Remove unused logging macros + * Logger: get rid of alarm APIs + * Logger: Drop syslog support + * Logger: Drop support to log into file + * Logger: Remove unused includes + * Logger: Remove gLogToConsole flag + * configure.ac: Check for pkg-config + * Depend on libosmocore + * osmo-trx: set up signals using libosmocore helpers + * osmo-trx: Set up talloc ctx + * debian: Depend on libtalloc and libosmocore + * Add initial support for logging, vty, ctrl + * Logger: Use libosmocore logging system + * osmo-trx.cpp: Move trx start and stop to helper functions + * Move enums required by VTY to a separate header + * vty: Implement VTY cfg parsing for current parameters + * doc: Add sample cfg file for LimeSDR + * osmo-trx: Use VTY cfg structures while still allowing cmd line options + * osmo-trx: Re-introduce -l cmd line parameter + * Makefile.am: Avoid using subdir if arch is not required + * Build Transceiver52M/common as an .la lib + * use osmo_init_logging2() + * tests: Makefile.am: Fix typo in include path + * configure.ac: Add --enable-sanitize option + * Move arch specific fiels to arch subdir + * Move device specific files to device subdir + * Change configure define USRP1 to DEVICE_USRP1 + * Move device specific code out of radioInterface + * Transceiver: Move device specific code to radioDevice class + * Build one osmo-trx binary for each device support enabled + * Logger: Print correct source file and line number + * Transceiver: log timing info of stale bursts + * build: Fix make distcheck + * build: More OBS build failure fixes + * jenkins.sh: Enable build of osmo-trx-usrp1 + * debian: Remove osmo-trx-usrp1 until we can build libusrp1.deb + * debian: Fix OBS build + * build: Fix OBS build for ARM + * git-version-gen: Take into account tags not in master + + [ Alexander Huemer ] + * Unbreak `./configure --with-usrp1` build + * Fix USRP1 build with support for setting Rx/TxAntenna + + [ Alexander Couzens ] + * jenkins.sh: fix the download url if the qemu image wasn't setup + * jenkins.sh: cleanup always the workspace + * jenkins.sh: change qemu-img default location to $HOME/qemu-img instead of /opt/qemu-img + + [ Vadim Yanitskiy ] + * Transceiver.cpp: use a define for the MAX_PACKET_LENGTH + * Transceiver.cpp: properly zero-terminate received commands + * Transceiver.cpp: use pointer arithmetics for CMD parsing + * Transceiver.cpp: fix incorrect format string for SETTSC + * Transceiver.cpp: prevent out-of-range array access + + [ Martin Hauke ] + * configure.ac: Fix typo + + [ Philipp Maier ] + * doc: add example config for usrp B200 series + + -- Pau Espin Pedrol Thu, 03 May 2018 16:23:29 +0200 + osmo-trx (0.2.0) unstable; urgency=medium [ Alexander Chemeris ] -- To view, visit https://gerrit.osmocom.org/7985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc469bce89d52012e1f876c847b4535360a602ad Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:42:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:42:48 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E90-5468-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 1.1.0.90-5468-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.0.90-5468-dirty ? 1.2.0 Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a --- M configure.ac M debian/changelog M debian/control R debian/libgtp3.install M gtp/Makefile.am 5 files changed, 116 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index b9073e9..62812ae 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ [enable_gtp_linux="$enableval"], [enable_gtp_linux="no"]) AS_IF([test "x$enable_gtp_linux" = "xyes"], [ - PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.0.0]) + PKG_CHECK_MODULES([LIBGTPNL], [libgtpnl >= 1.2.0]) ]) AM_CONDITIONAL([ENABLE_GTP_KERNEL], [test "$enable_gtp_linux" = "yes"]) @@ -135,9 +135,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index 47e02f1..83fd823 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,110 @@ +osmo-ggsn (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix compiler warnings: return 0 in main(), in 3 tests + * add --enable-sanitize config option + * sanitize build: ensure uint16/32 alignment in gtpie_test and in46a_test + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * sgsnemu: Don't leak FILE handle in proc_read() + * sgsnemu: Fix format string in printing tun-device name + * sgsnemu: Make sure buffer has space for terminating-NUL + * sgsnemu: Free strings in error path + * gtp: Fix buffer overflow in imsi_gtp2str() + * gtp: Explicit OSMO_ASSERT to ensure pdp variable is set + * tun: Don't copy 16byte IPv6 address to 'struct in_addr' + * ippool: Correctly compute size of static pool + * remove unused argument to alloc_ippool_blacklist() + * factor out netdev_ip_local_get() from tun_ip_local_get() + * Properly NULL-out blacklist in alloc_ippool_blacklist() + * gtp_kernel: Change gtp_kernel_init() function signature + * gtp-kernel: Re-add support for kernel GTP-U acceleration + * gtp-kernel: Get rid of hard-coded kernel GTP device name + * gtp-kernel: shut down kernel GTP device in apn_down() + * gtp-kernel: Align logging for APN start in kernel-gtp case with that of TUN + * gtp-kernel: Avoid global state variable + * gtp-kernel: Make sure repeated calls to gtp_kernel_init() are safe + * gtp-kernel: proper cleanup in error path + * gtp-kernel: Get rid of SYS_ERR where not applicable + * gtp-kernel: Add function name to pdp_debug() function calls + * gtp-kernel: Add device nime in pdp_debug() log statements + * contrib/jenkins.sh: Allow jenkins job to specify if kernel GTP is used + * ggsn.c: Fix byte order of IPCP IPv4 DNS servers + * ggsn: Ignore PCO with length 0, don't abort processing + * README.md: Remove misleading sentence on sgsnemu + * Add talloc context introspection via VTY + * fix segfault in case of kernel gtp-u + * lib/tun.c: Generalize tun_sifflags() to netdev_sifflags + * lib/tun.c: generalize tun_*route() to netdev_*route() + * lib/tun.c: Generalize tun_{set,add}addr*() functions + * lib/tun: split generic network device related stuff to lib/netdev + * lib/netdev.c: Cosmetic changes (coding style / cleanups) + * ggsn: Don't explicitly use tun_setaddr() API anymore + * sgsnemu: Convert from tun_setaddr() to tun_addaddr() + * lib/tun: Remove tun_setaddr() API, as everyone is using tun_addaddr() now + * Move kernel GTP support from ggsn/ to lib/ + * ggsn: don't use gtp_kernel_tunnel_{add,del}() for userspace tun + + [ Pau Espin Pedrol ] + * ggsn_vty: Stop using deprecated API vty_install_default + * contrib/jenkins.sh: Enable Werror in C(PP)FLAGS + * examples: Add secondary ipv6 google DNS to osmo-ggsn.cfg + * tun_setaddr6: Fix log typo + * cosmetic: Reorder tun_addaddr to get rid of decl of tun_setaddr4 + * ggsn.c: Print version of unhandled ip packet + * Remove unused empty src/Makefile.in + * tests: Split ipv6 specific tests into a new test group + * Add support for IPv4v6 End User Addresses + * contrib: jenkins.sh: Build libgtpnl as dep when building with gtp kernel support + * cosmetic: sgsnemu.c: Fix trailing whitespace + * ggsn.c: Improve logging info on link-local ipv6 addr not found + * tun.c: tun_addaddr: Fix segfault and wrong usage of tun_nlattr + * Set tun_addaddr ipv agnostic and add support for ipv6 + * ggsn: Add 'ipv6 link-local' vty cmd + * ggsn_vty.c: Print ipv6 link-local cmd when writing config to file + * gtp.c: Fix trailing whitespace + * gtp.c: Determine GTP version from header + * gtp.c: Log unsupported GTP version number + * gtp/pdp: Fix trailing whitespace + * gtp/pdp: Remove unused APIs pdp_ntoeua pdp_euaton + * gtp.c: gtp_gpdu_ind: Convert ifelse to switch statement + * gtp.c: gtp_gpdu_ind: Early return to avoid use of uninitialized var + * gtp/gtp.c: Remove unused function char2ul_t + * gtp/gtp.c: Mark non exported functions as static + * gtp/gtp.c: Use uint8_t for version param in static functions + * ggsn: encaps_tun: Avoid forwarding packet if EUA is unassigned, fix crash + * ggsn: Validate packet src addr from MS + * ggsn: Parse PCO_IPCP + * ggsn: Parse PCO_IPCP for IPv4v6 pdp ctx + * ggsn: Print all addresses on successful pdp ctx creation + * ggsn.c: cb_tun_ind: Convert ifelse to switch statement + * ggsn.c: cb_tun_ind: log dst addr of packet without pdp ctx + * ggsn.c: cb_tun_ind: Don't drop packets targeting pdp ctx ll addr + * sgsnemu: Fix bad ptr during context deallocation + * sgsnemu: listen param is a host, not an interface + * use osmo_init_logging2 + + [ Max ] + * Log APN and tun names for packets + * Enable sanitize for CI tests + * Fix stow-enabled jenkins build failure + * Add GTP message names + + [ Viktor Tsymbalyuk ] + * sgsnemu: sgsnemu stopped after recieving "Request accepted" from ggsn + * sgsnemu: created "pinghost" and "createif" modes for mutual exclusion + * sgsnemu: fix: no outgoing GTP-U in "createif" mode + + [ Martin Hauke ] + * build: Remove AC_PROG_CXX, C++ is never used + + [ Stefan Sperling ] + * remove the -f option from osmo-ggsn.service + + -- Pau Espin Pedrol Thu, 03 May 2018 16:05:27 +0200 + osmo-ggsn (1.1.0) unstable; urgency=medium * libgtp: pdp.h: Addition of new tx_gpdu_seq struct member member diff --git a/debian/control b/debian/control index f31248e..c8aa0b7 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. -Package: libgtp2 +Package: libgtp3 Architecture: any Multi-Arch: same Section: libs @@ -41,7 +41,7 @@ Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, - libgtp2 (= ${binary:Version}) + libgtp3 (= ${binary:Version}) Description: Development files for libgtp OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile operators as the interface between the Internet and the rest of the @@ -54,7 +54,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}), osmo-ggsn (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile @@ -65,7 +65,7 @@ Section: debug Architecture: any Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp2 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgtp3 (= ${binary:Version}) Multi-Arch: same Description: Debug symbols for OsmoGGSN OsmoGGSN is a Gateway GPRS Support Node (GGSN). It is used by mobile diff --git a/debian/libgtp2.install b/debian/libgtp3.install similarity index 100% rename from debian/libgtp2.install rename to debian/libgtp3.install diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a0ff0a..7a41a88 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=2:0:0 +LIBVERSION=3:0:0 lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h @@ -11,7 +11,3 @@ libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libgtp_la_LIBADD = $(LIBOSMOCORE_LIBS) - - - - -- To view, visit https://gerrit.osmocom.org/7979 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2af8c8ff75d5153456b814b9dfe4fbddafe5af7a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:56:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:56:03 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E38-ef190-dirty_=E2=86=92_0=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8002 Bump version: 0.1.1.38-ef190-dirty ? 0.2.0 Change-Id: Ic8a9e44b2f930fed024040777eab58699fdcaadc --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 58 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/02/8002/1 diff --git a/configure.ac b/configure.ac index 8fb338a..a04390c 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 8958b90..aa8e1fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +libosmo-netif (0.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * gitignore: vim swp files + * osmo_stream_{cli,srv}_destroy: fix mem leak: empty msgb queue + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * debian/control: Fix upstream-name + * debian/copyright: There are no AGPL licensed files left + * src/rs232.c: Fix accidential reference to GPLv3+ instead of GPLv2+ + * Add SPDX-License-Identifier + Copyright statements + * debian/control: Fix Vcs-Browser + * osmux: Fix use of uninitialized memory in osmux_out_handle + + [ Pau Espin Pedrol ] + * stream: Avoid re-creating and leaking socket when unneeded + * contrib: jenkins.sh: Disable building doxygen for deps + * test: osmo-pcap-test: Fix clock drift while replaying pcap file + * osmux: Use correct log category DLMUX + * stream.c: osmo_stream_cli_open2: Remove wrong assumption in reconnect decision + * tests: osmo-pcap-test: Fix pcap includes not found in old versions + * osmux: osmux_xfrm_output_pull: Improve checks and log of malformed packets + * jibuf: Add initial implementation of Jitter Buffer + * tests: jibuf_tool: Initial commit + * tests: jibuf_tool: Improve jibuf_test to read pcaps + * tests: jibuf_tool: Add OSMUX support + * tests: jibuf_tool: Add parameters to control size of buffer + * jibuf: Take RTP marker into account + * jibuf: re-sync clock out of sync timestamps + * tests: jibuf_tool: Add seq.plt + * jibuf: Estimate src clock skew + * tests: use osmo_init_logging2 + * Build jibuf_tool based on libpcap availability + * examples: use osmo_init_logging2 + * osmux: Add new API osmux_xfrm_output_sched to fix rtp generation issues + * tests: Add osmux2 testsuite + * osmux: Set Marker bit on osmux frame loss detected + * osmux: Move examples and tests to use new output APIs + + [ Max ] + * Enable sanitize for CI tests + + [ Stefan Sperling ] + * add support for flushing and destroying a server-side stream + + [ Alexey ] + * Update README.md + + -- Pau Espin Pedrol Thu, 03 May 2018 16:55:21 +0200 + libosmo-netif (0.1.1) unstable; urgency=medium * New upstream release. diff --git a/src/Makefile.am b/src/Makefile.am index 79e3685..9dc5e46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=4:0:0 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8002 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8a9e44b2f930fed024040777eab58699fdcaadc Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 14:59:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 14:59:16 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-pcu=5Bmaster=5D=3A_Bump_version=3A_0=2E4=2E0=2E115-513c-dirty_=E2=86=92_0=2E5=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.4.0.115-513c-dirty ? 0.5.0 ...................................................................... Bump version: 0.4.0.115-513c-dirty ? 0.5.0 Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e --- M configure.ac M debian/changelog 2 files changed, 137 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 6365fcb..86b4ee1 100644 --- a/configure.ac +++ b/configure.ac @@ -73,10 +73,10 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.1) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) AC_MSG_CHECKING([whether to enable direct DSP access for PDCH of sysmocom-bts]) AC_ARG_ENABLE(sysmocom-dsp, diff --git a/debian/changelog b/debian/changelog index 4caccc8..8ece776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,136 @@ +osmo-pcu (0.5.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * implement support for 3-digit MNC with leading zeros + * configure: add --enable-werror + * mslot_class: find_free_tfi(): use uint32_t to shift 1 << 31 + * mslot_class: two more: use uint32_t to shift 1 << 31 + * Revert "Use Timing Advance Index in UL assignments" + * Revert "Rewrite Packet Uplink Assignment" + * Revert "Rewrite Packet Downlink Assignment" + * configure: fix --enable-sysmocom-dsp and --with-sysmobts flags + * configure: properly quote CFLAGS in lc15 check + * Revert "Rewrite EGPRS Packet Uplink Assignment" + * use osmo_init_logging2() with proper talloc ctx + + [ Minh-Quang Nguyen ] + * PCU: Fix TA adjustment + * PCU: display TA information in TBF stats + + [ Max ] + * Remove unused parameter + * Move multislot table to separate file + * Replace '.' in counter names with ':' + * Fix compiler warning + * TBF: log timer override + * TBF: fix compiler warning in test + * TBF: expand timer logging + * vty: print class and TBFs for each MS + * DL window: constify resend_needed() function + * TBF: move EGPRS enablement into (U|D)L-TBF + * TBF-DL: fix misleading idle time check + * TBF: remove unused variable + * Remove unused includes and forward declarations + * Fix tests after rate_ctr change + * Introduce LOGTBF* for consistent logging + * TBF: implement independent T31xx timers + * TBF: add N3101 counter + * Fix warnings + * Add function to get max supported MS class + * Add --enable-sanitize configure option + * Enable sanitize for CI test + * Add tests for pcu_lsb() + * Add optional profiling support + * TBF: unify timer handling + * TBF: log timer invocation source + * TBF: bail out for unknown timers + * Fix llc_queue_size() type + * TBF-DL: mark rcvd_dl_ack() parameters as boolean + * window: move encoding into functions + * cosmetic: clarify coding scheme and puncturing + * Make TBF state private + * TBF: cleanup state flag handling + * Clarify RACH-related interfaces + * TBF-UL: add simpler test helper + * Avoid code duplication in TBF test + * TBF: move window parameters to UL/DL level + * TBF-DL: move priority computation into function + * TBF: unify EGPRS window calculation + * Don't access TBF internals in vty functions + * Fix jenkins.sh to match jenkins job axis filter + * Allocate global context for TypesTest + * Fix sanitizer build + * Rewrite EGPRS Packet Uplink Assignment + * Rewrite Packet Downlink Assignment + * Rewrite Packet Uplink Assignment + * Use Timing Advance Index in UL assignments + * Allow specifying sysmocom headers explicitly + * TBF: log source of state transitions + * jenkins.sh: Disable building doxygen for deps + * Set V_N and V_B to known initial state + * TBF: add dedicated log categories + * TBF: make UL/DL state internal + * TBF: make UL ack state internal + * TBF: make poll state internal + * TBF: adjust test log levels + * Add tests for find_multi_slots() + * AllocTest: adjust test_alloc_b() + * AllocTest: expand test output + * AllocTest: remove assumption on max MS class + * Add multislot classes from latest spec + * cosmetic: fix whitespace issue with include files + * TBF: decrease L1 logging verbosity in test + * TBF: override send function via linker option + * Simplify TS alloc: adjust allocator signatures + * Simplify TS alloc: fix allocation calls + * Simplify TS alloc: avoid TS reassignment + * Simplify TS alloc: use defines for constants + * Simplify TS alloc: adjust function signatures + * TS alloc: print suggested TRX on allocation errors + * Simplify TS alloc: internalize TRX check + * TBF: decrease logging verbosity for traffic + * TBF: add helpers for assignment type handling + * TBF: show assignment kind in vty + * vty: drop unused function + * RACH: improve single block detection + * TBF: move common test code into functions + * emu: use libosmocore definitions + * Use explicit type for pcu_lsb() + * Move paging generation into PDCH + * Move include guard to the top + * Update header includes + * Simplify TS alloc: split off RX mask computation + * Simplify TS alloc: separate capacity computation + * Simplify TS alloc: split allocation + * Simplify TS alloc: split USF/UL allocation + * Move PDCH-related functions into separate files + * Simplify TS alloc: don't use PDCH for free TFI + * Simplify TS alloc: constify max dl slot func + * TBF: make network counters internal + * Simplify TS alloc: move slot assignment + * Simplify TS alloc: move slot check into functions + + [ Pau Espin Pedrol ] + * Print error cause of pcu socket connect failure + * gprs_bssgp_pcu.cpp: Comment unused function parse_ra_cap + + [ Stefan Sperling ] + * Make osmo-pcu wait for BTS to become available at start-up time. + * improve documentation of Encoding::write_paging_request() + + [ Alexander Couzens ] + * pcuif_proto.h: fix whitespaces and indention + * pcuif_proto: add version 8 features + + [ Philipp Maier ] + * cosmetic: remove runaway semicolon + * pcu_l1_if: add frame number to log output + * tbf: add frame number to log output + + -- Pau Espin Pedrol Thu, 03 May 2018 16:20:00 +0200 + osmo-pcu (0.4.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] -- To view, visit https://gerrit.osmocom.org/7983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ce6fb40690a66b0980eba4fa03b47da2f59ee6e Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:02:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:02:53 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E183-c45a-dirty_=E2=86=92_0=2E8=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8003 Bump version: 0.7.0.183-c45a-dirty ? 0.8.0 Change-Id: I92b7b584beac870d1dccc9d5637fa54154b6db03 --- M configure.ac M debian/changelog 2 files changed, 215 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/8003/1 diff --git a/configure.ac b/configure.ac index 9767349..6456f8a 100644 --- a/configure.ac +++ b/configure.ac @@ -62,14 +62,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) PKG_CHECK_MODULES(ORTP, ortp) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) diff --git a/debian/changelog b/debian/changelog index 1f6e970..39409d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,210 @@ +osmo-bts (0.8.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * jenkins_common.sh: fix build_bts distcheck for more than one conf_flag + * fix build: tests/sysmobts: add missing -I$(SYSMOBTS_INCDIR) + * fix handover: handle_ph_ra_ind(): evaluate ra_ind before msgb_trim() + * implement support for 3-digit MNC with leading zeros + * configure: add --enable-werror + * use osmo_init_logging2() with proper talloc ctx + + [ Pau Espin Pedrol ] + * lc15: Fix cfg indentation + * l1sap: Fix abort on big RTP packet received + * bts-trx: trx_ctrl_cmd: Simplify var assignment logic + * bts-trx: Avoid enqueueing consecutive duplicate messages to TRX + * Fix malformed Resource Indication packet + * debian/control: Remove uneeded dep libosmo-netif-dev + * jenkins.sh: Disable building doxygen for deps + * oml.c: Fix use of htons instead of ntohs + * bts-trx: trx_if.c: Log timedout+retransmitted CMD + * bts-trx: trx_if.c: trx_ctrl_read_cb: Move error handling to end of func + * bts-trx: trx_if.c: Improve parsing of received RSP messages from TRX + * bts-trx: Detect duplicated responses for retransmitted commands + * gsm_pchan2chan_nr: move warning to pragma message and track issue + * Remove unused variables + * bts-trx: scheduler_trx.c: Fix missing header + * l1sap.c: l1sap_tch_rts_ind: Remove unused variables + * octphy: octpkt.c: Remove unused static functions + * vty.c: Remove warning message + * virtual: l1_if.c: Remove unneeded warning message + * main.c: bts_main: fix typo in error message + * l1sap: Validate incoming RTP payload, drop bw-efficient AMR + * l1sap: Avoid assumption that l1sap is at head of msgb + * contrib: jenkins_bts_model: Fix bashism expr + * Include missing headers for osmo_init_logging2 + * common/sysinfo.c: Fix no return on on-void function + * gsm_data_shared.h: Remove unused enum gsm_paging_event + * scheduler_trx: Fix signed integer overflow in clock calculations + + [ Harald Welte ] + * trx: Better be safe than sorry before calling strlen + * trx: Avoid NULL+1 dereference in trx_ctrl_read_cb() + * trx: Don't call osmo_fr_check_sid with negative 'rc' + * trx: Don't assume phy_instance_by_num() returns non-NULL + * l1sap: fix wrong return value of is_fill_frame() + * measurement.c: Fix various typos in comments + * Comments on individual members of struct gsm_abis_mo + * scheduler: Harmonize log line format; Always print TS name + decoded FN + * scheduler_trx: L1P is for PH (data), L1M for MPH (control) + * l1sap: Fix log subsystem: Use DRTP for RTP related bits, L1C for MPH + * measurment.c: Introduce INFO category for DMEAS logging + * osmo-bts-octphy: Remove bogus warning about BS_AG_BLKS_RES + * rsl.c: Log RTP socket related errors as DRTP, not DRSL + * Put useful information in RTCP SDES. + * osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS + * DTX: avoid illegal character contained in DTX FSM allocation which causes BTS crash + * gsm_lchan: remove unused member fields + * Add 'show (bts|trx|ts|lchan)' commands + * Print much more information during 'show lchan' + * vty: don't print "Bound IP / Port" if it isn't bound [yet] + * osmo-bts: Add talloc context introspection via VTY + * sysmo: Fix compiler warnings in eeprom.c + * sysmo+lc15: Add missign include for readv/writev + * trx: make l1if_fill_meas_res() static + * RSL: Properly reject RSL CHAN_NR IE for incompatible PCHAN + * RSL: Ensure we don't accept DCHAN messages for CCHAN + * osmo-bts-virtual: Shut down gracefully on socket creation failure + * osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values) + * Introduce + use LOG/DEBUGP with frame number prefixing/printing + * osmo-bts-virtual: Make use of LOGL1S() macro for context + * osmo-bts-virtual: Make sure PRIM_INFO_MEAS have non-zero frame number + * scheduler.c: Factor out find_sched_mframe_idx() function + * scheduler: add trx_sched_is_sacch_fn() function + * Revert "measurement: fix measurement computation" + * measurement.c: Hand Frame Number into measurement computation + * l1sap: Pass is_sub from L1 primitive into the Uplink Measurement + * osmo-bts-trx: Add missing frame number to l1if_process_meas_res() + * scheduler.c: Print message when burst substitution happens + * load_indication: Fix start of load indication timer + * RSL: Implement DELETE INDICATION on AGCH overflow + * RSL: Send ERROR REPORT on too short/truncated messages + wrong discriminator + * BTS: add rate_ctr about CCCH (paging, agch, pch) + * paging: Drop + Log paging requests for non-existant paging groups + * paging.c: Fix encoding of optional Mobile ID RR PAGING TYPE 1 / 2 + * rsl: Improve ERROR REPORTing + * paging: Fix encoding of PAGING TYPE 3 Rest Octets + * RSL IPA DLCX: Avoid null-pointer dereference + * RSL: Fix encoding of ConnectionID in IPA_DLCX_ACK + * RSL IPA DLCX: Avoid another null-pointer dereference + * measurement.c: Fix sdcch4_meas_rep_fn102 / sdcch8_meas_rep_fn102 + * counters: split rach:sent into rach:drop, rach:ho, rach:cs and rach:ps + * octphy: Remove code duplication for BER / RSSI conversion + * {sysmo,lc15}: Correctly report BER to L1SAP in INFO_MEAS_IND + * {sysmo,lc15}: Fix RACH reporting in combined CBCH case + * split scheduler_mframe.c from scheduler.c + * measurement: Compute RX{LEV,QUAL}-SUB for SDCCH and non-AMR TCH + * measurement.c: Don't silently copy "FULL" measurements to "SUB" + * scheduler: Add missing \n at end of LOG statement + * Move rach_busy counting above L1SAP + * RACH decoding: Use BER threshold for RACH ghost detection + * trx/scheduler: Use integer math for TOA (Timing of Arrival) + * measurement.c: higher-precision TA/TOA math + * L1SAP: Increase resolution of reported burst timing + * measurement: Keep average of high-accurate ToA value in lchan + * Add high-accuracy ToA value to Uplink Measurement Reports + * pcu_sock: Discard messages that are too short + * pcu_sock: Don't overflow the timeslot array + * pcu_sock: Log an error message and discard PCU primitives for BTS != 0 + * pcu_sock: LOG + drop DATA.req from PCU for non-PDCH timeslot + * pcu_sock: LOG + drop PCU DATA.req for inactive lchan + * sysinfo.c: SI1 is optional; Send SI2 at TC=0 if no SI1 exists + * sysmobts: Compatibility with older firmware versions + * cosmetic: Document some SI scheduling related function API + * sysinfo: Fix scheduling of downlink SACCH information + * gsm_data_shared: Remove unused definitions/members/functions + * cosmetic: Move agch_queue to sub-structure of gsm_bts_role_bts + * Get rid of 'struct gsm_bts_role_bts' + * virtual: Correctly set+report BTS variant in OML attributes + * Add 'osmo-bts-omldummy' to bring up only OML without RSL + * fix inverted logic bug in omldummy patch + * omldummy: Suppress RSL transmission errors + * debian: Split osmo-bts-virtual from osmo-bts-trx + * fox chan_nr_is_dchan() for RSL_CHAN_OSMO_PDCH + * rsl_tx_dyn_pdch_ack: Add missing FRAME_NR information element + * fix activation of osmocom-style dynamic PDCH as TCH/F or TCH/H + + [ Philipp Maier ] + * octphy: override firmware version check + * cosmetic: meas_test: fix section comment + * cosmetic: tests/Makefile.am: remove excess whitespace + * cosmetic: tests/power: remove unused var "ret" + * cosmetic: tests/agch: remove unused var "static_ilv" + * octphy: l1_oml: check returncode of trx_by_l1h() + * meas_test: fix header file references + * rsl: fix double-free in rsl_rx_mode_modif() + * fix nullpointer deref in rsl_tx_mode_modif_nack() + * rsl: do not allow MODE MODIFY request with unsupp. codec/rate + * gsm_data_shared: extend bts feature list with speech codecs + * octphy: ensure all BTS models set features + * vty: display bts features in vty command show bts + * bts: use feature list instead of speech codec table + * octphy: replace #warning with #pragma message + * ipac: fix log output + * rsl: remove unused variable + * l1_tch: remove dead code + * cosmetic: remove dead code + * cosmetic: remove unused variable + * cosmetic: remove unused variable in osmo-bts-omldummy/main.c + * octphy: integrate octasics latest header release + * osmo-bts-trx: perform error concealment for FR frames + + [ Max ] + * Remove leftover comments and checks + * Log filenames on L1 errors + * Add --enable-sanitize configure option + * Use existing function to obtain TSC + * Remove BSC-specific parts + * Print FN delta on L1 errors + * Move sysmobts-calib into osmo-bts-sysmo + * Allow specifying sysmocom headers explicitly + * fix build: tests/misc: missing libosmo-abis and -trau flags + * Enable optional static builds + * Remove unneeded LIBOSMOCORE_CFLAGS from tests + * sysmobts: use proper includes for sbts2050 test + * Move -I inside *INCDIR variable + * sysmobts: remove weird default header location + * sysmobts: move header check to appropriate place + * CI: drop unused OsmoPCU dependency + * Enable sanitize for CI tests + * Add helper to get BCC from BSIC + * osmo-bts-trx: init nbits to know value + * osmo-bts-trx: ignore frame offset error on startup + + [ Vadim Yanitskiy ] + * doc/examples: add CalypsoBTS configuration example + * common/pcu_sock.c: fix double field assignment + * scheduler_trx.c: remove ToA (Time of Arrival) hack + * common/l1sap.c: increase the BTS_CTR_RACH_DROP in RACH BER check + * common/l1sap.c: increment valid RACH counter after all checks + * common/l1sap.c: clean up noise / ghost RACH filtering + * common/l1sap.c: perform noise / ghost filtering for handover RACH + * common/l1sap.c: limit the minimal ToA for RACH bursts + * common/vty.c: remove unused variables + * common/main.c: track talloc NULL contexts by default + + [ Alexander Huemer ] + * cosmetic: Makefile.am whitespace + * various Makefile.am: add missing CFLAGS + * gitignore: add missing entries + + [ Stefan Sperling ] + * Cosmetic fixes for power ramping code. + * respond with NACK for non-hopping BTS with multiple ARFCN + * cosmetic: fix typos in src/common/oml.c + * return NACK codes instead of errno values from oml_tx_attr_resp() + + [ Alexander Couzens ] + * pcuif_proto: correct indention of gsm_pcu_if_data + * pcu_if: move definition PCU_SOCK_DEFAULT into pcuif_proto.h + * pcuif_proto: add version 8 features + + [ Keith ] + * osmo-bts-sysmo eeprom.c Restore ability to read/write EEPROM + + -- Pau Espin Pedrol Thu, 03 May 2018 17:02:19 +0200 + osmo-bts (0.7.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/8003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92b7b584beac870d1dccc9d5637fa54154b6db03 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:09:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:09:18 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E43-7e34-dirty_=E2=86=92_0=2E9=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8004 Bump version: 0.8.1.43-7e34-dirty ? 0.9.0 Change-Id: Ie3d11408f35509138475e7edde285e1bf5bef8e0 --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 62 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/04/8004/1 diff --git a/configure.ac b/configure.ac index a73bc82..d2d4d02 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 64e18fb..9d582a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +libosmo-sccp (0.9.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * add osmo_sccp_inst_addr_name(), a variant of osmo_sccp_addr_name() + * sccp vty: be fatal for addressbook entry errors + * add --enable-sanitize config option + * sccp_test: sanitize: fix msgb mem leaks + * sccp_test: sanitize: don't memcmp NULL pointers + * xua_test: sanitize: fix msgb leak + * osmo_sccp_addr_name / _dump: drop 'NO_GT' output + * typo: osmo-stp main: 'Erro' + * add osmo_sccp_user_name() + * add osmo_ss7_route_name() + * cosmetic: hmrt_message_for_routing(): use osmo_ss7_route_name() + * error log: sccp_scoc.c: log failure to create/resolve conn_id + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Max ] + * Fix typo in .deb dependency + * Enable sanitize for CI tests + * SS7: clarify handling of stream opening error + + [ Harald Welte ] + * xua: Write 'local-ip' only if non-NULL + * vty: Make sure 'point-code override dpc' is saved with correct indent + * ipa: Fix setting of OPC/DPC based on routing-context + override + * ipa: Fix endianness of pseud-M3UA header + * initialize msg->l2h in sccp_msgb_alloc() + * ipa: Patch DPC/OPC information into SCCP Calling/Called Party Address + * ipa: Automatically create / destroy route on IPA connect/disconnect + * osmo-stp: Align prompt formatting with other Osmocom programs + * STP: Add osmoappdesc.py + * debian/copyright: Fix upstream-name + * Add SPDX-License-Identifier + missing copyright statements + * Add "show cs7 (m3ua}sua}ipa)" command to show xUA servers + * xua_as[p]_fsm: Use osmo_timer_del() on FSM cleanup + * sccp_helpers: don't return msgb with l2h set + * Allocate SCCP user primitives with headroom + * sccp_types.h: Fix value for SCCP_REFUSAL_UNEQUIPPED_USER + * debian/control: Fix Vcs-Browser + * ipa_asp_fsm: Prevent against integer underflow + + [ Pau Espin Pedrol ] + * ss7_vty: Fix out-of-bounds access in 'as' cmd + * contrib/test: Fix config of local/remote ports + * ss7: Re-bind xUA server socket after setting new IP + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * use osmo_init_logging2 + + [ Martin Hauke ] + * build: AC_PROG_LIBTOOL is the same as LT_INIT + + -- Pau Espin Pedrol Thu, 03 May 2018 17:08:07 +0200 + libosmo-sccp (0.8.1) unstable; urgency=medium * New upstream 0.8.1 release. diff --git a/src/Makefile.am b/src/Makefile.am index 1001d19..3af23d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/8004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3d11408f35509138475e7edde285e1bf5bef8e0 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From jenkins at lists.osmocom.org Thu May 3 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 3 May 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#111?= Message-ID: <506011951.344.1525360207183.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.73 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 4 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu May 3 15:12:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 15:12:12 +0000 Subject: =?UTF-8?Q?osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E183-c45a-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I92b7b584beac870d1dccc9d5637fa54154b6db03 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 15:12:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 15:12:17 +0000 Subject: =?UTF-8?Q?libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E38-ef190-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8002 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic8a9e44b2f930fed024040777eab58699fdcaadc Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 15:12:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 15:12:26 +0000 Subject: =?UTF-8?Q?libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E43-7e34-dirty_=E2=86=92_0=2E9=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3d11408f35509138475e7edde285e1bf5bef8e0 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 15:18:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:18:30 +0000 Subject: [PATCH] libasn1c[master]: .gitignore: add compile Message-ID: Review at https://gerrit.osmocom.org/8005 .gitignore: add compile Change-Id: I27a8663cc48ca7a76fb1cdf4ad103a854febc812 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/05/8005/1 diff --git a/.gitignore b/.gitignore index 73505b6..4a42306 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ aclocal.m4 config.* configure +compile depcomp libtool ltmain.sh -- To view, visit https://gerrit.osmocom.org/8005 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27a8663cc48ca7a76fb1cdf4ad103a854febc812 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:18:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:18:30 +0000 Subject: [PATCH] libasn1c[master]: build: Support make release target Message-ID: Review at https://gerrit.osmocom.org/8006 build: Support make release target Change-Id: I04b9ff47f55df0e19d8e93530fb6ccf8bdb0660b --- M Makefile.am M configure.ac 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/06/8006/1 diff --git a/Makefile.am b/Makefile.am index 534c86e..5cffc1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ + at RELMAKE@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 1610973..ab63045 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/8006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04b9ff47f55df0e19d8e93530fb6ccf8bdb0660b Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:18:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:18:30 +0000 Subject: [PATCH] libasn1c[master]: debian/changelog: Set previous versions to unstable Message-ID: Review at https://gerrit.osmocom.org/8007 debian/changelog: Set previous versions to unstable Otherwise make rlease overwrittes the latest UNRELEASED one. Change-Id: Ic6a9b1d6c7724b15c69e780d562007b22af141e6 --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/07/8007/1 diff --git a/debian/changelog b/debian/changelog index 20354b0..457e269 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libasn1c (0.9.28) UNRELEASED; urgency=low +libasn1c (0.9.28) unstable; urgency=low * Initial release. -- Harald Welte Fri, 27 Oct 2017 22:08:03 +0000 -libasn1c (0.1.0) UNRELEASED; urgency=low +libasn1c (0.1.0) unstable; urgency=low * Initial release. -- To view, visit https://gerrit.osmocom.org/8007 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6a9b1d6c7724b15c69e780d562007b22af141e6 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:18:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:18:31 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E28_=E2=86=92_0=2E9=2E29?= Message-ID: Review at https://gerrit.osmocom.org/8008 Bump version: 0.9.28 ? 0.9.29 Change-Id: Ib7cc5d297496b7f7235145602f98d6aef614e531 --- M debian/changelog M src/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/08/8008/1 diff --git a/debian/changelog b/debian/changelog index 457e269..c2fd343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libasn1c (0.9.29) unstable; urgency=medium + + [ Harald Welte ] + * link libasn1c against libmath, don't ask users to do it + + [ Neels Hofmeyr ] + * fix compiler warning: drop dead code from BIT_STRING_fromBuf() + * jenkins: add missing set -e to catch build errors + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Pau Espin Pedrol ] + * .gitignore: add compile + * build: Support make release target + * debian/changelog: Set previous versions to unstable + + -- Pau Espin Pedrol Thu, 03 May 2018 17:18:02 +0200 + libasn1c (0.9.28) unstable; urgency=low * Initial release. diff --git a/src/Makefile.am b/src/Makefile.am index 8009c76..27fce6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=1:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include/asn1c AM_CFLAGS = -fPIC -Wall $(LIBTALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8008 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7cc5d297496b7f7235145602f98d6aef614e531 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:19:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:19:09 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libosmo-netif=5Bmaster=5D=3A_Bump_version=3A_0=2E1=2E1=2E38-ef190-dirty_=E2=86=92_0=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.1.1.38-ef190-dirty ? 0.2.0 ...................................................................... Bump version: 0.1.1.38-ef190-dirty ? 0.2.0 Change-Id: Ic8a9e44b2f930fed024040777eab58699fdcaadc --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 58 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 8fb338a..a04390c 100644 --- a/configure.ac +++ b/configure.ac @@ -82,10 +82,10 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 8958b90..aa8e1fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +libosmo-netif (0.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * gitignore: vim swp files + * osmo_stream_{cli,srv}_destroy: fix mem leak: empty msgb queue + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Harald Welte ] + * debian/control: Fix upstream-name + * debian/copyright: There are no AGPL licensed files left + * src/rs232.c: Fix accidential reference to GPLv3+ instead of GPLv2+ + * Add SPDX-License-Identifier + Copyright statements + * debian/control: Fix Vcs-Browser + * osmux: Fix use of uninitialized memory in osmux_out_handle + + [ Pau Espin Pedrol ] + * stream: Avoid re-creating and leaking socket when unneeded + * contrib: jenkins.sh: Disable building doxygen for deps + * test: osmo-pcap-test: Fix clock drift while replaying pcap file + * osmux: Use correct log category DLMUX + * stream.c: osmo_stream_cli_open2: Remove wrong assumption in reconnect decision + * tests: osmo-pcap-test: Fix pcap includes not found in old versions + * osmux: osmux_xfrm_output_pull: Improve checks and log of malformed packets + * jibuf: Add initial implementation of Jitter Buffer + * tests: jibuf_tool: Initial commit + * tests: jibuf_tool: Improve jibuf_test to read pcaps + * tests: jibuf_tool: Add OSMUX support + * tests: jibuf_tool: Add parameters to control size of buffer + * jibuf: Take RTP marker into account + * jibuf: re-sync clock out of sync timestamps + * tests: jibuf_tool: Add seq.plt + * jibuf: Estimate src clock skew + * tests: use osmo_init_logging2 + * Build jibuf_tool based on libpcap availability + * examples: use osmo_init_logging2 + * osmux: Add new API osmux_xfrm_output_sched to fix rtp generation issues + * tests: Add osmux2 testsuite + * osmux: Set Marker bit on osmux frame loss detected + * osmux: Move examples and tests to use new output APIs + + [ Max ] + * Enable sanitize for CI tests + + [ Stefan Sperling ] + * add support for flushing and destroying a server-side stream + + [ Alexey ] + * Update README.md + + -- Pau Espin Pedrol Thu, 03 May 2018 16:55:21 +0200 + libosmo-netif (0.1.1) unstable; urgency=medium * New upstream release. diff --git a/src/Makefile.am b/src/Makefile.am index 79e3685..9dc5e46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=4:0:0 +LIBVERSION=5:0:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8002 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8a9e44b2f930fed024040777eab58699fdcaadc Gerrit-PatchSet: 1 Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:19:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:19:51 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E7=2E0=2E183-c45a-dirty_=E2=86=92_0=2E8=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.7.0.183-c45a-dirty ? 0.8.0 ...................................................................... Bump version: 0.7.0.183-c45a-dirty ? 0.8.0 Change-Id: I92b7b584beac870d1dccc9d5637fa54154b6db03 --- M configure.ac M debian/changelog 2 files changed, 215 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 9767349..6456f8a 100644 --- a/configure.ac +++ b/configure.ac @@ -62,14 +62,14 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 0.5.0) PKG_CHECK_MODULES(ORTP, ortp) AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) diff --git a/debian/changelog b/debian/changelog index 1f6e970..39409d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,210 @@ +osmo-bts (0.8.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * jenkins_common.sh: fix build_bts distcheck for more than one conf_flag + * fix build: tests/sysmobts: add missing -I$(SYSMOBTS_INCDIR) + * fix handover: handle_ph_ra_ind(): evaluate ra_ind before msgb_trim() + * implement support for 3-digit MNC with leading zeros + * configure: add --enable-werror + * use osmo_init_logging2() with proper talloc ctx + + [ Pau Espin Pedrol ] + * lc15: Fix cfg indentation + * l1sap: Fix abort on big RTP packet received + * bts-trx: trx_ctrl_cmd: Simplify var assignment logic + * bts-trx: Avoid enqueueing consecutive duplicate messages to TRX + * Fix malformed Resource Indication packet + * debian/control: Remove uneeded dep libosmo-netif-dev + * jenkins.sh: Disable building doxygen for deps + * oml.c: Fix use of htons instead of ntohs + * bts-trx: trx_if.c: Log timedout+retransmitted CMD + * bts-trx: trx_if.c: trx_ctrl_read_cb: Move error handling to end of func + * bts-trx: trx_if.c: Improve parsing of received RSP messages from TRX + * bts-trx: Detect duplicated responses for retransmitted commands + * gsm_pchan2chan_nr: move warning to pragma message and track issue + * Remove unused variables + * bts-trx: scheduler_trx.c: Fix missing header + * l1sap.c: l1sap_tch_rts_ind: Remove unused variables + * octphy: octpkt.c: Remove unused static functions + * vty.c: Remove warning message + * virtual: l1_if.c: Remove unneeded warning message + * main.c: bts_main: fix typo in error message + * l1sap: Validate incoming RTP payload, drop bw-efficient AMR + * l1sap: Avoid assumption that l1sap is at head of msgb + * contrib: jenkins_bts_model: Fix bashism expr + * Include missing headers for osmo_init_logging2 + * common/sysinfo.c: Fix no return on on-void function + * gsm_data_shared.h: Remove unused enum gsm_paging_event + * scheduler_trx: Fix signed integer overflow in clock calculations + + [ Harald Welte ] + * trx: Better be safe than sorry before calling strlen + * trx: Avoid NULL+1 dereference in trx_ctrl_read_cb() + * trx: Don't call osmo_fr_check_sid with negative 'rc' + * trx: Don't assume phy_instance_by_num() returns non-NULL + * l1sap: fix wrong return value of is_fill_frame() + * measurement.c: Fix various typos in comments + * Comments on individual members of struct gsm_abis_mo + * scheduler: Harmonize log line format; Always print TS name + decoded FN + * scheduler_trx: L1P is for PH (data), L1M for MPH (control) + * l1sap: Fix log subsystem: Use DRTP for RTP related bits, L1C for MPH + * measurment.c: Introduce INFO category for DMEAS logging + * osmo-bts-octphy: Remove bogus warning about BS_AG_BLKS_RES + * rsl.c: Log RTP socket related errors as DRTP, not DRSL + * Put useful information in RTCP SDES. + * osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS + * DTX: avoid illegal character contained in DTX FSM allocation which causes BTS crash + * gsm_lchan: remove unused member fields + * Add 'show (bts|trx|ts|lchan)' commands + * Print much more information during 'show lchan' + * vty: don't print "Bound IP / Port" if it isn't bound [yet] + * osmo-bts: Add talloc context introspection via VTY + * sysmo: Fix compiler warnings in eeprom.c + * sysmo+lc15: Add missign include for readv/writev + * trx: make l1if_fill_meas_res() static + * RSL: Properly reject RSL CHAN_NR IE for incompatible PCHAN + * RSL: Ensure we don't accept DCHAN messages for CCHAN + * osmo-bts-virtual: Shut down gracefully on socket creation failure + * osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values) + * Introduce + use LOG/DEBUGP with frame number prefixing/printing + * osmo-bts-virtual: Make use of LOGL1S() macro for context + * osmo-bts-virtual: Make sure PRIM_INFO_MEAS have non-zero frame number + * scheduler.c: Factor out find_sched_mframe_idx() function + * scheduler: add trx_sched_is_sacch_fn() function + * Revert "measurement: fix measurement computation" + * measurement.c: Hand Frame Number into measurement computation + * l1sap: Pass is_sub from L1 primitive into the Uplink Measurement + * osmo-bts-trx: Add missing frame number to l1if_process_meas_res() + * scheduler.c: Print message when burst substitution happens + * load_indication: Fix start of load indication timer + * RSL: Implement DELETE INDICATION on AGCH overflow + * RSL: Send ERROR REPORT on too short/truncated messages + wrong discriminator + * BTS: add rate_ctr about CCCH (paging, agch, pch) + * paging: Drop + Log paging requests for non-existant paging groups + * paging.c: Fix encoding of optional Mobile ID RR PAGING TYPE 1 / 2 + * rsl: Improve ERROR REPORTing + * paging: Fix encoding of PAGING TYPE 3 Rest Octets + * RSL IPA DLCX: Avoid null-pointer dereference + * RSL: Fix encoding of ConnectionID in IPA_DLCX_ACK + * RSL IPA DLCX: Avoid another null-pointer dereference + * measurement.c: Fix sdcch4_meas_rep_fn102 / sdcch8_meas_rep_fn102 + * counters: split rach:sent into rach:drop, rach:ho, rach:cs and rach:ps + * octphy: Remove code duplication for BER / RSSI conversion + * {sysmo,lc15}: Correctly report BER to L1SAP in INFO_MEAS_IND + * {sysmo,lc15}: Fix RACH reporting in combined CBCH case + * split scheduler_mframe.c from scheduler.c + * measurement: Compute RX{LEV,QUAL}-SUB for SDCCH and non-AMR TCH + * measurement.c: Don't silently copy "FULL" measurements to "SUB" + * scheduler: Add missing \n at end of LOG statement + * Move rach_busy counting above L1SAP + * RACH decoding: Use BER threshold for RACH ghost detection + * trx/scheduler: Use integer math for TOA (Timing of Arrival) + * measurement.c: higher-precision TA/TOA math + * L1SAP: Increase resolution of reported burst timing + * measurement: Keep average of high-accurate ToA value in lchan + * Add high-accuracy ToA value to Uplink Measurement Reports + * pcu_sock: Discard messages that are too short + * pcu_sock: Don't overflow the timeslot array + * pcu_sock: Log an error message and discard PCU primitives for BTS != 0 + * pcu_sock: LOG + drop DATA.req from PCU for non-PDCH timeslot + * pcu_sock: LOG + drop PCU DATA.req for inactive lchan + * sysinfo.c: SI1 is optional; Send SI2 at TC=0 if no SI1 exists + * sysmobts: Compatibility with older firmware versions + * cosmetic: Document some SI scheduling related function API + * sysinfo: Fix scheduling of downlink SACCH information + * gsm_data_shared: Remove unused definitions/members/functions + * cosmetic: Move agch_queue to sub-structure of gsm_bts_role_bts + * Get rid of 'struct gsm_bts_role_bts' + * virtual: Correctly set+report BTS variant in OML attributes + * Add 'osmo-bts-omldummy' to bring up only OML without RSL + * fix inverted logic bug in omldummy patch + * omldummy: Suppress RSL transmission errors + * debian: Split osmo-bts-virtual from osmo-bts-trx + * fox chan_nr_is_dchan() for RSL_CHAN_OSMO_PDCH + * rsl_tx_dyn_pdch_ack: Add missing FRAME_NR information element + * fix activation of osmocom-style dynamic PDCH as TCH/F or TCH/H + + [ Philipp Maier ] + * octphy: override firmware version check + * cosmetic: meas_test: fix section comment + * cosmetic: tests/Makefile.am: remove excess whitespace + * cosmetic: tests/power: remove unused var "ret" + * cosmetic: tests/agch: remove unused var "static_ilv" + * octphy: l1_oml: check returncode of trx_by_l1h() + * meas_test: fix header file references + * rsl: fix double-free in rsl_rx_mode_modif() + * fix nullpointer deref in rsl_tx_mode_modif_nack() + * rsl: do not allow MODE MODIFY request with unsupp. codec/rate + * gsm_data_shared: extend bts feature list with speech codecs + * octphy: ensure all BTS models set features + * vty: display bts features in vty command show bts + * bts: use feature list instead of speech codec table + * octphy: replace #warning with #pragma message + * ipac: fix log output + * rsl: remove unused variable + * l1_tch: remove dead code + * cosmetic: remove dead code + * cosmetic: remove unused variable + * cosmetic: remove unused variable in osmo-bts-omldummy/main.c + * octphy: integrate octasics latest header release + * osmo-bts-trx: perform error concealment for FR frames + + [ Max ] + * Remove leftover comments and checks + * Log filenames on L1 errors + * Add --enable-sanitize configure option + * Use existing function to obtain TSC + * Remove BSC-specific parts + * Print FN delta on L1 errors + * Move sysmobts-calib into osmo-bts-sysmo + * Allow specifying sysmocom headers explicitly + * fix build: tests/misc: missing libosmo-abis and -trau flags + * Enable optional static builds + * Remove unneeded LIBOSMOCORE_CFLAGS from tests + * sysmobts: use proper includes for sbts2050 test + * Move -I inside *INCDIR variable + * sysmobts: remove weird default header location + * sysmobts: move header check to appropriate place + * CI: drop unused OsmoPCU dependency + * Enable sanitize for CI tests + * Add helper to get BCC from BSIC + * osmo-bts-trx: init nbits to know value + * osmo-bts-trx: ignore frame offset error on startup + + [ Vadim Yanitskiy ] + * doc/examples: add CalypsoBTS configuration example + * common/pcu_sock.c: fix double field assignment + * scheduler_trx.c: remove ToA (Time of Arrival) hack + * common/l1sap.c: increase the BTS_CTR_RACH_DROP in RACH BER check + * common/l1sap.c: increment valid RACH counter after all checks + * common/l1sap.c: clean up noise / ghost RACH filtering + * common/l1sap.c: perform noise / ghost filtering for handover RACH + * common/l1sap.c: limit the minimal ToA for RACH bursts + * common/vty.c: remove unused variables + * common/main.c: track talloc NULL contexts by default + + [ Alexander Huemer ] + * cosmetic: Makefile.am whitespace + * various Makefile.am: add missing CFLAGS + * gitignore: add missing entries + + [ Stefan Sperling ] + * Cosmetic fixes for power ramping code. + * respond with NACK for non-hopping BTS with multiple ARFCN + * cosmetic: fix typos in src/common/oml.c + * return NACK codes instead of errno values from oml_tx_attr_resp() + + [ Alexander Couzens ] + * pcuif_proto: correct indention of gsm_pcu_if_data + * pcu_if: move definition PCU_SOCK_DEFAULT into pcuif_proto.h + * pcuif_proto: add version 8 features + + [ Keith ] + * osmo-bts-sysmo eeprom.c Restore ability to read/write EEPROM + + -- Pau Espin Pedrol Thu, 03 May 2018 17:02:19 +0200 + osmo-bts (0.7.0) unstable; urgency=medium [ Max ] -- To view, visit https://gerrit.osmocom.org/8003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92b7b584beac870d1dccc9d5637fa54154b6db03 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:22:37 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libosmo-sccp=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E1=2E43-7e34-dirty_=E2=86=92_0=2E9=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.8.1.43-7e34-dirty ? 0.9.0 ...................................................................... Bump version: 0.8.1.43-7e34-dirty ? 0.9.0 Change-Id: Ie3d11408f35509138475e7edde285e1bf5bef8e0 --- M configure.ac M debian/changelog M src/Makefile.am 3 files changed, 62 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index a73bc82..d2d4d02 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff --git a/debian/changelog b/debian/changelog index 64e18fb..9d582a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +libosmo-sccp (0.9.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * add osmo_sccp_inst_addr_name(), a variant of osmo_sccp_addr_name() + * sccp vty: be fatal for addressbook entry errors + * add --enable-sanitize config option + * sccp_test: sanitize: fix msgb mem leaks + * sccp_test: sanitize: don't memcmp NULL pointers + * xua_test: sanitize: fix msgb leak + * osmo_sccp_addr_name / _dump: drop 'NO_GT' output + * typo: osmo-stp main: 'Erro' + * add osmo_sccp_user_name() + * add osmo_ss7_route_name() + * cosmetic: hmrt_message_for_routing(): use osmo_ss7_route_name() + * error log: sccp_scoc.c: log failure to create/resolve conn_id + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Max ] + * Fix typo in .deb dependency + * Enable sanitize for CI tests + * SS7: clarify handling of stream opening error + + [ Harald Welte ] + * xua: Write 'local-ip' only if non-NULL + * vty: Make sure 'point-code override dpc' is saved with correct indent + * ipa: Fix setting of OPC/DPC based on routing-context + override + * ipa: Fix endianness of pseud-M3UA header + * initialize msg->l2h in sccp_msgb_alloc() + * ipa: Patch DPC/OPC information into SCCP Calling/Called Party Address + * ipa: Automatically create / destroy route on IPA connect/disconnect + * osmo-stp: Align prompt formatting with other Osmocom programs + * STP: Add osmoappdesc.py + * debian/copyright: Fix upstream-name + * Add SPDX-License-Identifier + missing copyright statements + * Add "show cs7 (m3ua}sua}ipa)" command to show xUA servers + * xua_as[p]_fsm: Use osmo_timer_del() on FSM cleanup + * sccp_helpers: don't return msgb with l2h set + * Allocate SCCP user primitives with headroom + * sccp_types.h: Fix value for SCCP_REFUSAL_UNEQUIPPED_USER + * debian/control: Fix Vcs-Browser + * ipa_asp_fsm: Prevent against integer underflow + + [ Pau Espin Pedrol ] + * ss7_vty: Fix out-of-bounds access in 'as' cmd + * contrib/test: Fix config of local/remote ports + * ss7: Re-bind xUA server socket after setting new IP + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * use osmo_init_logging2 + + [ Martin Hauke ] + * build: AC_PROG_LIBTOOL is the same as LT_INIT + + -- Pau Espin Pedrol Thu, 03 May 2018 17:08:07 +0200 + libosmo-sccp (0.8.1) unstable; urgency=medium * New upstream 0.8.1 release. diff --git a/src/Makefile.am b/src/Makefile.am index 1001d19..3af23d1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \ sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \ -- To view, visit https://gerrit.osmocom.org/8004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3d11408f35509138475e7edde285e1bf5bef8e0 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:42:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 15:42:09 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E109-8d064-dirty_=E2=86=92_1=2E3=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8009 Bump version: 1.2.0.109-8d064-dirty ? 1.3.0 Change-Id: I524222f5a056111325087cfb44d83d02571b475f --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-mgcp-client3.install M src/libosmo-legacy-mgcp/Makefile.am M src/libosmo-mgcp-client/Makefile.am 7 files changed, 133 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/09/8009/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 9d0e0dc..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,6 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp API/ABI change parse and represent connection identifiers as hex strings -libosmo-mgcp API/ABI change connection identifiers are assigned by the server, not CA -libosmo-mgcp-client API/ABI change parse and store connection identifier in response \ No newline at end of file diff --git a/configure.ac b/configure.ac index fed44f0..0ded288 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,10 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index bb9a849..a8a850a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,128 @@ +osmo-mgw (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * contrib: Add osmo-mgw systemd service + * legacy: mgcp_protocol: Don't print osmux stats if it is off + * mgcp_stat: Don't print osmux stats if it is off + + [ Neels Hofmeyr ] + * fix segfault: DLCX for unknown endpoint: dont try to log NULL endpoint + * MGCP endpoints: parse as decimal, not hex + * add --enable-sanitize config option + * legacy_mgcp: mgcp_test: sanitize: free msgb_ctx + * mgcp_test: test_packet_error_detection: sanitize: free all conns + * mgcp_test: test_no_cycle: sanitize: free endp + * mgcp_test: sanitize: free msgb_ctx + * mgcp_client: don't configure "bts base" + * Revert "mgcp_client: don't configure "bts base"" until osmo-msc is ready + * mgcp_client: add transaction cleanup + * mgcp_client_test makefile: add update_exp target + * cosmetic: mgcp_network: typo in log + * osmo-mgw: Add talloc context introspection via VTY + * mgcp_client: show failure by MGCP SDP section parsing test + * mgcp_client: cosmetic: clean up SDP params parsing + * mgcp_client: detect SDP section-start parsing errors + * compiler warning: ignore deprecated in mgcp_client_test.c + * configure: add --enable-werror + * jenkins.sh: add --enable-werror to configure flags + * cosmetic: mgcp, legacy_mgcp: drop unused vty.h definitions + * use osmo_init_logging2() with proper talloc ctx + + [ Philipp Maier ] + * osmux: fix nullpointer dereference + * cosmetic: guard dead osmux vty code with ifdef + * cosmetic: remove prefix "net" from rtp related vty commands + * doc: update sample config file + * cosmetic: use correct VTY port number constant + * vty: simplify endpoint allocation + * vty: do not change number_endpoints at runtime + * MGCP: Connection Identifiers are hex strings + * libosmo-mgcp: Connection Identifiers are allocated by MGW, not CA + * client: use osmo_strlcpy instead of strncpy + * cosmetic: fix sourcecode formatting + * cosmetic: clearly mark endpoint numbers as hex + * client: use string as connection identifier + * conn: remove assertions + * mgcp_test: fix wrong strcmp() parameters + * mgcp_test: fix nullpointer dereference + * mgcp_test: add returncode check + * mgcp_test: fix possible double free + * mcgp_client: mgcp_msg_gen(): add checks to verify params + * network: use originating RTP packet address for loopback + * client: mgcp_response_parse_params: check rtp port + * mgcp: allow endpoints beginning from zero + * client/common: move constant MGCP_ENDPOINT_MAXLEN + * mgcp: make domain name configurable + * cosmetic: protocol: remove unnecessary nul termination + * client: do not insist on \n\n when parsing MGCP messages + * main: display mgcp ip/port + * client: make callid in MDCX mandatory + * client: add missing mandatory SDP fields + * mgcp: permit wildcarded endpoint assignment (CRCX) + * mgcp: add prefix to virtual trunk + * client: eliminate destructive parameter parsing + * client: eliminate destructive head parsing + * cosmetic: client: add doxygen comments + * protocol: fix problem with line break and OSMUX + * protocol: fix missing carriage return + * client: fix sdp parameter ordering + * protocol: check the packetization in local cx options + * cosmetic: remove spaces from pointer symbol + * client: Do not accept endpoint ids with wildcards in responses + * client: do not accept endpoint ids without @ character in responses + * client: prohibit endpoint ids without @ character + * protocol: on wildcarded CRCX return endpoint number as hex + * msg: fix response code on exhausted endp resources + * cosmetic: move mgcp_release_endp() to mgcp_ep.c + * client: use heap to store mgcp_response + * ep: move endpoint struct and define to mgcp_ep.h + * cosmetic: rename mgcp_release_endp to mgcp_endp_release + * cosmetic: rename mgcp_ep.c/h to mgcp_endp.c/h + * protocol: reject DLCX/CRCX/MDCX on unsupported parameters + * protocol: exit cleanly when local cx options check fails + * cosmetic: Add missing \n on log line + * protocol: check requested connection mode + * protocol: fix tagging of wildcarded requests + * protocol: prohibit wildcarded requests for MDCX and DLCX + * mgcp: fix use-after-free and add callback for endpoint cleanup + * client: add an optional FSM interface + * mgcp_client_fsm: Add FSM event names + * cosmetic: mgcp_client_fsm: rename enums + * cosmetic: rename function .._conn_reset() to .._conn_init() + * mgcp_conn: do not touch u.rtp in mgcp_conn_alloc() + * cosmetic: rename .._codec_reset() to .._codec_init() + * mgcp_conn: add function mgcp_rtp_conn_cleanup() + * stats: use libosmocore rate counter for in/out_stream.err_ts_counter + + [ Alexander Couzens ] + * debian/control: correct library dependency of osmo-mgw against libosmo-mgcp1 + * debian: include systemd service osmo-mgw.service + * Revert "stats: use libosmocore rate counter for in/out_stream.err_ts_counter" + + [ Harald Welte ] + * cosmetic: fix whitespaces; we use tabs for indentation + * Fix possible buffer overflow in mgcp_conn_dump() + * osmo-mgw: Update copyright statement + * osmo-mgw: Config file is osmo-mgw.cfg, and not mgcp.cfg + * osmo-mgw: Fix copyright notice + * strct mgcp_rtp_state: Group + document struct members related to patching + * mgcp_rtp_state: grup 'stats' members into sub-structure + * mgcp_rtp_end: Group statistics members into 'stats' sub-struct + * libosmo-mgcp: Cosmetic spelling fixes in comments + * mgcp_msg: We must parse endpoint numbers as hex, not decimal! + * mgcp_internal.h: document more struct members with comments + * centralize handling of common errors like "endpoint not found" + * Return proper MGCP Error codes, as per spec + * osmo-mgw: Use libosmocore socket abstraction + * osmo-bsc_mgcp: Add LIBOSMONETIF_{CFLAGS,LIBS} + * libosmo-mgcp-client is GPLv2+, not AGPLv3+ + * Turn libosmo-mgcp into local, non-installed library + + [ Stefan Sperling ] + * enable osmo_fsm vty commands in libosmo-mgcp-client vty + + -- Pau Espin Pedrol Thu, 03 May 2018 17:40:35 +0200 + osmo-mgw (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 383a35a..0fe098e 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client2 +Package: libosmo-mgcp-client3 Section: libs Architecture: any Multi-Arch: same @@ -31,7 +31,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client3 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-bsc-mgcp diff --git a/debian/libosmo-mgcp-client2.install b/debian/libosmo-mgcp-client3.install similarity index 100% rename from debian/libosmo-mgcp-client2.install rename to debian/libosmo-mgcp-client3.install diff --git a/src/libosmo-legacy-mgcp/Makefile.am b/src/libosmo-legacy-mgcp/Makefile.am index 9160586..4ee4e6a 100644 --- a/src/libosmo-legacy-mgcp/Makefile.am +++ b/src/libosmo-legacy-mgcp/Makefile.am @@ -24,7 +24,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -LEGACY_MGCP_LIBVERSION=0:0:0 +LEGACY_MGCP_LIBVERSION=0:1:0 lib_LTLIBRARIES = \ libosmo-legacy-mgcp.la \ diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index a3a920b..01371d7 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=2:0:0 +MGCP_CLIENT_LIBVERSION=3:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/8009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I524222f5a056111325087cfb44d83d02571b475f Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 15:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 15:59:49 +0000 Subject: libasn1c[master]: .gitignore: add compile In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8005 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I27a8663cc48ca7a76fb1cdf4ad103a854febc812 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 15:59:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 15:59:52 +0000 Subject: [MERGED] libasn1c[master]: .gitignore: add compile In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: .gitignore: add compile ...................................................................... .gitignore: add compile Change-Id: I27a8663cc48ca7a76fb1cdf4ad103a854febc812 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 73505b6..4a42306 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ aclocal.m4 config.* configure +compile depcomp libtool ltmain.sh -- To view, visit https://gerrit.osmocom.org/8005 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27a8663cc48ca7a76fb1cdf4ad103a854febc812 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:02 +0000 Subject: =?UTF-8?Q?libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E28_=E2=86=92_0=2E9=2E29?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8008 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib7cc5d297496b7f7235145602f98d6aef614e531 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:05 +0000 Subject: libasn1c[master]: debian/changelog: Set previous versions to unstable In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8007 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic6a9b1d6c7724b15c69e780d562007b22af141e6 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:07 +0000 Subject: =?UTF-8?Q?osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E109-8d064-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I524222f5a056111325087cfb44d83d02571b475f Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:09 +0000 Subject: libasn1c[master]: build: Support make release target In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04b9ff47f55df0e19d8e93530fb6ccf8bdb0660b Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:13 +0000 Subject: [MERGED] libasn1c[master]: build: Support make release target In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: build: Support make release target ...................................................................... build: Support make release target Change-Id: I04b9ff47f55df0e19d8e93530fb6ccf8bdb0660b --- M Makefile.am M configure.ac 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Makefile.am b/Makefile.am index 534c86e..5cffc1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ + at RELMAKE@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 1610973..ab63045 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,10 @@ dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + dnl checks for programs AC_PROG_MAKE_SET AC_PROG_CC -- To view, visit https://gerrit.osmocom.org/8006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04b9ff47f55df0e19d8e93530fb6ccf8bdb0660b Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:14 +0000 Subject: [MERGED] libasn1c[master]: debian/changelog: Set previous versions to unstable In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/changelog: Set previous versions to unstable ...................................................................... debian/changelog: Set previous versions to unstable Otherwise make rlease overwrittes the latest UNRELEASED one. Change-Id: Ic6a9b1d6c7724b15c69e780d562007b22af141e6 --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 20354b0..457e269 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libasn1c (0.9.28) UNRELEASED; urgency=low +libasn1c (0.9.28) unstable; urgency=low * Initial release. -- Harald Welte Fri, 27 Oct 2017 22:08:03 +0000 -libasn1c (0.1.0) UNRELEASED; urgency=low +libasn1c (0.1.0) unstable; urgency=low * Initial release. -- To view, visit https://gerrit.osmocom.org/8007 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6a9b1d6c7724b15c69e780d562007b22af141e6 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:15 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E28_=E2=86=92_0=2E9=2E29?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 0.9.28 ? 0.9.29 ...................................................................... Bump version: 0.9.28 ? 0.9.29 Change-Id: Ib7cc5d297496b7f7235145602f98d6aef614e531 --- M debian/changelog M src/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 457e269..c2fd343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libasn1c (0.9.29) unstable; urgency=medium + + [ Harald Welte ] + * link libasn1c against libmath, don't ask users to do it + + [ Neels Hofmeyr ] + * fix compiler warning: drop dead code from BIT_STRING_fromBuf() + * jenkins: add missing set -e to catch build errors + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Pau Espin Pedrol ] + * .gitignore: add compile + * build: Support make release target + * debian/changelog: Set previous versions to unstable + + -- Pau Espin Pedrol Thu, 03 May 2018 17:18:02 +0200 + libasn1c (0.9.28) unstable; urgency=low * Initial release. diff --git a/src/Makefile.am b/src/Makefile.am index 8009c76..27fce6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -LIBVERSION=1:0:0 +LIBVERSION=1:1:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include/asn1c AM_CFLAGS = -fPIC -Wall $(LIBTALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/8008 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7cc5d297496b7f7235145602f98d6aef614e531 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:00:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:00:21 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-mgw=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E109-8d064-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 1.2.0.109-8d064-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.109-8d064-dirty ? 1.3.0 Change-Id: I524222f5a056111325087cfb44d83d02571b475f --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control R debian/libosmo-mgcp-client3.install M src/libosmo-legacy-mgcp/Makefile.am M src/libosmo-mgcp-client/Makefile.am 7 files changed, 133 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 9d0e0dc..c5a3b36 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,6 +24,3 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line -libosmo-mgcp API/ABI change parse and represent connection identifiers as hex strings -libosmo-mgcp API/ABI change connection identifiers are assigned by the server, not CA -libosmo-mgcp-client API/ABI change parse and store connection identifier in response \ No newline at end of file diff --git a/configure.ac b/configure.ac index fed44f0..0ded288 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,10 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/debian/changelog b/debian/changelog index bb9a849..a8a850a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,128 @@ +osmo-mgw (1.3.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * contrib: Add osmo-mgw systemd service + * legacy: mgcp_protocol: Don't print osmux stats if it is off + * mgcp_stat: Don't print osmux stats if it is off + + [ Neels Hofmeyr ] + * fix segfault: DLCX for unknown endpoint: dont try to log NULL endpoint + * MGCP endpoints: parse as decimal, not hex + * add --enable-sanitize config option + * legacy_mgcp: mgcp_test: sanitize: free msgb_ctx + * mgcp_test: test_packet_error_detection: sanitize: free all conns + * mgcp_test: test_no_cycle: sanitize: free endp + * mgcp_test: sanitize: free msgb_ctx + * mgcp_client: don't configure "bts base" + * Revert "mgcp_client: don't configure "bts base"" until osmo-msc is ready + * mgcp_client: add transaction cleanup + * mgcp_client_test makefile: add update_exp target + * cosmetic: mgcp_network: typo in log + * osmo-mgw: Add talloc context introspection via VTY + * mgcp_client: show failure by MGCP SDP section parsing test + * mgcp_client: cosmetic: clean up SDP params parsing + * mgcp_client: detect SDP section-start parsing errors + * compiler warning: ignore deprecated in mgcp_client_test.c + * configure: add --enable-werror + * jenkins.sh: add --enable-werror to configure flags + * cosmetic: mgcp, legacy_mgcp: drop unused vty.h definitions + * use osmo_init_logging2() with proper talloc ctx + + [ Philipp Maier ] + * osmux: fix nullpointer dereference + * cosmetic: guard dead osmux vty code with ifdef + * cosmetic: remove prefix "net" from rtp related vty commands + * doc: update sample config file + * cosmetic: use correct VTY port number constant + * vty: simplify endpoint allocation + * vty: do not change number_endpoints at runtime + * MGCP: Connection Identifiers are hex strings + * libosmo-mgcp: Connection Identifiers are allocated by MGW, not CA + * client: use osmo_strlcpy instead of strncpy + * cosmetic: fix sourcecode formatting + * cosmetic: clearly mark endpoint numbers as hex + * client: use string as connection identifier + * conn: remove assertions + * mgcp_test: fix wrong strcmp() parameters + * mgcp_test: fix nullpointer dereference + * mgcp_test: add returncode check + * mgcp_test: fix possible double free + * mcgp_client: mgcp_msg_gen(): add checks to verify params + * network: use originating RTP packet address for loopback + * client: mgcp_response_parse_params: check rtp port + * mgcp: allow endpoints beginning from zero + * client/common: move constant MGCP_ENDPOINT_MAXLEN + * mgcp: make domain name configurable + * cosmetic: protocol: remove unnecessary nul termination + * client: do not insist on \n\n when parsing MGCP messages + * main: display mgcp ip/port + * client: make callid in MDCX mandatory + * client: add missing mandatory SDP fields + * mgcp: permit wildcarded endpoint assignment (CRCX) + * mgcp: add prefix to virtual trunk + * client: eliminate destructive parameter parsing + * client: eliminate destructive head parsing + * cosmetic: client: add doxygen comments + * protocol: fix problem with line break and OSMUX + * protocol: fix missing carriage return + * client: fix sdp parameter ordering + * protocol: check the packetization in local cx options + * cosmetic: remove spaces from pointer symbol + * client: Do not accept endpoint ids with wildcards in responses + * client: do not accept endpoint ids without @ character in responses + * client: prohibit endpoint ids without @ character + * protocol: on wildcarded CRCX return endpoint number as hex + * msg: fix response code on exhausted endp resources + * cosmetic: move mgcp_release_endp() to mgcp_ep.c + * client: use heap to store mgcp_response + * ep: move endpoint struct and define to mgcp_ep.h + * cosmetic: rename mgcp_release_endp to mgcp_endp_release + * cosmetic: rename mgcp_ep.c/h to mgcp_endp.c/h + * protocol: reject DLCX/CRCX/MDCX on unsupported parameters + * protocol: exit cleanly when local cx options check fails + * cosmetic: Add missing \n on log line + * protocol: check requested connection mode + * protocol: fix tagging of wildcarded requests + * protocol: prohibit wildcarded requests for MDCX and DLCX + * mgcp: fix use-after-free and add callback for endpoint cleanup + * client: add an optional FSM interface + * mgcp_client_fsm: Add FSM event names + * cosmetic: mgcp_client_fsm: rename enums + * cosmetic: rename function .._conn_reset() to .._conn_init() + * mgcp_conn: do not touch u.rtp in mgcp_conn_alloc() + * cosmetic: rename .._codec_reset() to .._codec_init() + * mgcp_conn: add function mgcp_rtp_conn_cleanup() + * stats: use libosmocore rate counter for in/out_stream.err_ts_counter + + [ Alexander Couzens ] + * debian/control: correct library dependency of osmo-mgw against libosmo-mgcp1 + * debian: include systemd service osmo-mgw.service + * Revert "stats: use libosmocore rate counter for in/out_stream.err_ts_counter" + + [ Harald Welte ] + * cosmetic: fix whitespaces; we use tabs for indentation + * Fix possible buffer overflow in mgcp_conn_dump() + * osmo-mgw: Update copyright statement + * osmo-mgw: Config file is osmo-mgw.cfg, and not mgcp.cfg + * osmo-mgw: Fix copyright notice + * strct mgcp_rtp_state: Group + document struct members related to patching + * mgcp_rtp_state: grup 'stats' members into sub-structure + * mgcp_rtp_end: Group statistics members into 'stats' sub-struct + * libosmo-mgcp: Cosmetic spelling fixes in comments + * mgcp_msg: We must parse endpoint numbers as hex, not decimal! + * mgcp_internal.h: document more struct members with comments + * centralize handling of common errors like "endpoint not found" + * Return proper MGCP Error codes, as per spec + * osmo-mgw: Use libosmocore socket abstraction + * osmo-bsc_mgcp: Add LIBOSMONETIF_{CFLAGS,LIBS} + * libosmo-mgcp-client is GPLv2+, not AGPLv3+ + * Turn libosmo-mgcp into local, non-installed library + + [ Stefan Sperling ] + * enable osmo_fsm vty commands in libosmo-mgcp-client vty + + -- Pau Espin Pedrol Thu, 03 May 2018 17:40:35 +0200 + osmo-mgw (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] diff --git a/debian/control b/debian/control index 383a35a..0fe098e 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks -Package: libosmo-mgcp-client2 +Package: libosmo-mgcp-client3 Section: libs Architecture: any Multi-Arch: same @@ -31,7 +31,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-mgcp-client2 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-mgcp-client3 (= ${binary:Version}), ${misc:Depends} Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities Package: osmo-bsc-mgcp diff --git a/debian/libosmo-mgcp-client2.install b/debian/libosmo-mgcp-client3.install similarity index 100% rename from debian/libosmo-mgcp-client2.install rename to debian/libosmo-mgcp-client3.install diff --git a/src/libosmo-legacy-mgcp/Makefile.am b/src/libosmo-legacy-mgcp/Makefile.am index 9160586..4ee4e6a 100644 --- a/src/libosmo-legacy-mgcp/Makefile.am +++ b/src/libosmo-legacy-mgcp/Makefile.am @@ -24,7 +24,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -LEGACY_MGCP_LIBVERSION=0:0:0 +LEGACY_MGCP_LIBVERSION=0:1:0 lib_LTLIBRARIES = \ libosmo-legacy-mgcp.la \ diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index a3a920b..01371d7 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -20,7 +20,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=2:0:0 +MGCP_CLIENT_LIBVERSION=3:0:0 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/8009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I524222f5a056111325087cfb44d83d02571b475f Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:01:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:01:07 +0000 Subject: osmo-bsc[master]: resurrect meas_feed.c: make it compile, add logging In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7994 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:01:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:01:09 +0000 Subject: osmo-bsc[master]: resurrect meas_feed.c: vty, vty-test In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7995 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I186c7a995dd2b81746c32a58b55da64ed195a1ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:01:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:01:11 +0000 Subject: osmo-bsc[master]: resurrect meas_feed.c from openbsc.git history In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7993 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic070d82e61c122061fe7297a8c5aabbbcef6b301 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:01:21 +0000 Subject: [MERGED] osmo-bsc[master]: resurrect meas_feed.c from openbsc.git history In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: resurrect meas_feed.c from openbsc.git history ...................................................................... resurrect meas_feed.c from openbsc.git history meas_feed.c used to live in libmsc, to send out measurement reports to external entities for evaluation. When splitting osmo-bsc and osmo-msc from openbsc.git, meas_feed.c should have moved to osmo-bsc.git, but was dropped with libmsc. Re-add the old meas_feed.c now into libbsc. This is the latest version that existed in libmsc, and will not compile as-is here. Modifications to incorporate in the osmo-bsc build will follow with subsequent patches. Change-Id: Ic070d82e61c122061fe7297a8c5aabbbcef6b301 --- A src/libbsc/meas_feed.c 1 file changed, 168 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/meas_feed.c b/src/libbsc/meas_feed.c new file mode 100644 index 0000000..1e7b4cd --- /dev/null +++ b/src/libbsc/meas_feed.c @@ -0,0 +1,168 @@ +/* UDP-Feed of measurement reports */ + +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "meas_feed.h" + +struct meas_feed_state { + struct osmo_wqueue wqueue; + char scenario[31+1]; + char *dst_host; + uint16_t dst_port; +}; + + +static struct meas_feed_state g_mfs; + +static int process_meas_rep(struct gsm_meas_rep *mr) +{ + struct msgb *msg; + struct meas_feed_meas *mfm; + struct vlr_subscr *vsub; + + /* ignore measurements as long as we don't know who it is */ + if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub) + return 0; + + vsub = mr->lchan->conn->vsub; + + msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); + if (!msg) + return 0; + + /* fill in the header */ + mfm = (struct meas_feed_meas *) msgb_put(msg, sizeof(*mfm)); + mfm->hdr.msg_type = MEAS_FEED_MEAS; + mfm->hdr.version = MEAS_FEED_VERSION; + + /* fill in MEAS_FEED_MEAS specific header */ + osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi)); + osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name)); + osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); + + /* copy the entire measurement report */ + memcpy(&mfm->mr, mr, sizeof(mfm->mr)); + + /* copy channel information */ + /* we assume that the measurement report always belong to some timeslot */ + mfm->lchan_type = (uint8_t)mr->lchan->type; + mfm->pchan_type = (uint8_t)mr->lchan->ts->pchan; + mfm->bts_nr = mr->lchan->ts->trx->bts->nr; + mfm->trx_nr = mr->lchan->ts->trx->nr; + mfm->ts_nr = mr->lchan->ts->nr; + mfm->ss_nr = mr->lchan->nr; + + /* and send it to the socket */ + if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) + msgb_free(msg); + + return 0; +} + +static int meas_feed_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct lchan_signal_data *sdata = signal_data; + + if (subsys != SS_LCHAN) + return 0; + + if (signal == S_LCHAN_MEAS_REP) + process_meas_rep(sdata->mr); + + return 0; +} + +static int feed_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + return write(ofd->fd, msgb_data(msg), msgb_length(msg)); +} + +static int feed_read_cb(struct osmo_fd *ofd) +{ + int rc; + char buf[256]; + + rc = read(ofd->fd, buf, sizeof(buf)); + ofd->fd &= ~BSC_FD_READ; + + return rc; +} + +int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) +{ + int rc; + int already_initialized = 0; + + if (g_mfs.wqueue.bfd.fd) + already_initialized = 1; + + + if (already_initialized && + !strcmp(dst_host, g_mfs.dst_host) && + dst_port == g_mfs.dst_port) + return 0; + + if (!already_initialized) { + osmo_wqueue_init(&g_mfs.wqueue, 10); + g_mfs.wqueue.write_cb = feed_write_cb; + g_mfs.wqueue.read_cb = feed_read_cb; + osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + } + + if (already_initialized) { + osmo_wqueue_clear(&g_mfs.wqueue); + osmo_fd_unregister(&g_mfs.wqueue.bfd); + close(g_mfs.wqueue.bfd.fd); + /* don't set to zero, as that would mean 'not yet initialized' */ + g_mfs.wqueue.bfd.fd = -1; + } + rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM, + IPPROTO_UDP, dst_host, dst_port, + OSMO_SOCK_F_CONNECT); + if (rc < 0) + return rc; + + g_mfs.wqueue.bfd.when &= ~BSC_FD_READ; + + if (g_mfs.dst_host) + talloc_free(g_mfs.dst_host); + g_mfs.dst_host = talloc_strdup(NULL, dst_host); + g_mfs.dst_port = dst_port; + + return 0; +} + +void meas_feed_cfg_get(char **host, uint16_t *port) +{ + *port = g_mfs.dst_port; + *host = g_mfs.dst_host; +} + +void meas_feed_scenario_set(const char *name) +{ + osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); +} + +const char *meas_feed_scenario_get(void) +{ + return g_mfs.scenario; +} -- To view, visit https://gerrit.osmocom.org/7993 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic070d82e61c122061fe7297a8c5aabbbcef6b301 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:01:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:01:21 +0000 Subject: [MERGED] osmo-bsc[master]: resurrect meas_feed.c: make it compile, add logging In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: resurrect meas_feed.c: make it compile, add logging ...................................................................... resurrect meas_feed.c: make it compile, add logging Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f --- M src/libbsc/Makefile.am M src/libbsc/meas_feed.c 2 files changed, 34 insertions(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 8956363..744278b 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -64,5 +64,6 @@ penalty_timers.c \ handover_decision_2.c \ bsc_subscr_conn_fsm.c \ + meas_feed.c \ $(NULL) diff --git a/src/libbsc/meas_feed.c b/src/libbsc/meas_feed.c index 1e7b4cd..2e80754 100644 --- a/src/libbsc/meas_feed.c +++ b/src/libbsc/meas_feed.c @@ -13,14 +13,12 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include "meas_feed.h" +#include +#include +#include +#include +#include +#include struct meas_feed_state { struct osmo_wqueue wqueue; @@ -29,20 +27,25 @@ uint16_t dst_port; }; - -static struct meas_feed_state g_mfs; +static struct meas_feed_state g_mfs = {}; static int process_meas_rep(struct gsm_meas_rep *mr) { struct msgb *msg; struct meas_feed_meas *mfm; - struct vlr_subscr *vsub; + struct bsc_subscr *bsub; /* ignore measurements as long as we don't know who it is */ - if (!mr->lchan || !mr->lchan->conn || !mr->lchan->conn->vsub) + if (!mr->lchan) { + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending report\n"); return 0; + } + if (!mr->lchan->conn) { + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: lchan without conn, not sending report\n"); + return 0; + } - vsub = mr->lchan->conn->vsub; + bsub = mr->lchan->conn->bsub; msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); if (!msg) @@ -54,8 +57,16 @@ mfm->hdr.version = MEAS_FEED_VERSION; /* fill in MEAS_FEED_MEAS specific header */ - osmo_strlcpy(mfm->imsi, vsub->imsi, sizeof(mfm->imsi)); - osmo_strlcpy(mfm->name, vsub->name, sizeof(mfm->name)); + if (bsub) + osmo_strlcpy(mfm->imsi, bsub->imsi, sizeof(mfm->imsi)); + /* This used to be a human readable meaningful name set in the old osmo-nitb's subscriber + * database. Now we're several layers away from that (and possibly don't even have a name in + * osmo-hlr either), hence this is a legacy item now that we should leave empty ... *but*: + * here in the BSC we often don't know the subscriber's full identity information. For example, + * we might only know the TMSI, and hence would pass an empty IMSI above. So after all, feed + * bsc_subscr_name(), which possibly will feed the IMSI again, but in case only the TMSI is known + * would add that to the information set as "TMSI:0x12345678". */ + osmo_strlcpy(mfm->name, bsc_subscr_name(bsub), sizeof(mfm->name)); osmo_strlcpy(mfm->scenario, g_mfs.scenario, sizeof(mfm->scenario)); /* copy the entire measurement report */ @@ -71,8 +82,13 @@ mfm->ss_nr = mr->lchan->nr; /* and send it to the socket */ - if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) + if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) { + LOGP(DMEAS, LOGL_ERROR, "meas_feed %s: sending measurement report failed\n", + gsm_lchan_name(mr->lchan)); msgb_free(msg); + } else + LOGP(DMEAS, LOGL_DEBUG, "meas_feed %s: sent measurement report\n", + gsm_lchan_name(mr->lchan)); return 0; } @@ -126,6 +142,7 @@ g_mfs.wqueue.write_cb = feed_write_cb; g_mfs.wqueue.read_cb = feed_read_cb; osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); } if (already_initialized) { -- To view, visit https://gerrit.osmocom.org/7994 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34ac25bcc460e87e813090b6d7c5085cffa2d78f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:05:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:05:00 +0000 Subject: [PATCH] libsmpp34[master]: src/Makefile.am: Use LIBVERSION variable to set version-info Message-ID: Review at https://gerrit.osmocom.org/8010 src/Makefile.am: Use LIBVERSION variable to set version-info Same as we do in all other osmocom projects, and osmo-release.mk expects that variable name. Change-Id: I9c6ebb9656d6756e8344fd57a246be58b105c419 --- M src/Makefile.am 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/10/8010/1 diff --git a/src/Makefile.am b/src/Makefile.am index 940fd0a..8954eae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,6 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +LIBVERSION=0:1:0 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la @@ -22,7 +25,5 @@ libsmpp34_la_CFLAGS = @CFLAGS@ -Wall libsmpp34_la_CFLAGS += -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS libsmpp34_la_INCLUDES = -I. -I.. -libsmpp34_la_LDFLAGS = @LDFLAGS@ -version-info 0:1:0 +libsmpp34_la_LDFLAGS = @LDFLAGS@ -version-info $(LIBVERSION) -no-undefined libsmpp34_la_LDFLAGS += -lrt -lpthread - - -- To view, visit https://gerrit.osmocom.org/8010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c6ebb9656d6756e8344fd57a246be58b105c419 Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:05:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:05:00 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E12=2E0=2E20-a637-dirty_=E2=86=92_1=2E13=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8011 Bump version: 1.12.0.20-a637-dirty ? 1.13.0 Change-Id: If8b3a91714b4738ace025fc7ccbcf6a8e1190c4b --- M debian/changelog M debian/control R debian/libsmpp1.install M src/Makefile.am 4 files changed, 36 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libsmpp34 refs/changes/11/8011/1 diff --git a/debian/changelog b/debian/changelog index 5a142af..b8459ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libsmpp34 (1.12.0) UNRELEASED; urgency=medium +libsmpp34 (1.13.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] * Move forward towards a new release. @@ -8,8 +8,38 @@ * SMPP_DELIVERY_RECEIPT_* constants * SMPP ESM class parameter definitions * smpp34_tlv_for_each() helper macro + * Fix 'make distcheck' by adding .version to EXTRA_DISTI + * debian/control: Fix Vcs-{Browser,Git} URLs - -- Harald Welte Mon, 14 Aug 2017 19:08:37 +0200 + [ Max ] + * Use release helper from libosmocore + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * smpp34_dumpBuf.c: remove unused variable + * smpp34_structs.h: Fix trailing whitespace + * smpp34_structs.h: Fix truncated output in str_tlv_id + * smpp34_unpack.c: remove unused variable + * bind_receiver_resp_test.c: Fix compilation warning + * Fix Out of bounds compilation warning in OCTET8 + * contrib: Enable -Werror by default + * src/Makefile.am: Use LIBVERSION variable to set version-info + + [ Alexander Couzens ] + * debian/rules: show testsuite.log when tests are failing + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Martin Hauke ] + * binaries/Makefile.am: Fix parallel build issue + * jenkins: Enable parallel build and distcheck + * jenkins.sh: output all test logs when 'make check' failed + + -- Pau Espin Pedrol Thu, 03 May 2018 18:04:10 +0200 libsmpp34 (1.10z1) stable; urgency=low diff --git a/debian/control b/debian/control index 84fd5a5..be4a63b 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Vcs-Git: git://git.osmocom.org/libsmpp34.git Homepage: https://projects.osmocom.org/projects/libsmpp34 -Package: libsmpp0 +Package: libsmpp1 Section: libs Architecture: any Multi-Arch: same @@ -35,7 +35,7 @@ Architecture: any Multi-Arch: same Section: libdevel -Depends: libsmpp0 (= ${binary:Version}), +Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends} Description: Development files for libsmpp34 This library is an implementation for providing the PDU handling of the @@ -55,5 +55,5 @@ Architecture: any Section: debug Priority: extra -Depends: libsmpp0 (= ${binary:Version}), ${misc:Depends} +Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for libsmpp34 diff --git a/debian/libsmpp0.install b/debian/libsmpp1.install similarity index 100% rename from debian/libsmpp0.install rename to debian/libsmpp1.install diff --git a/src/Makefile.am b/src/Makefile.am index 8954eae..67550f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=0:1:0 +LIBVERSION=1:0:0 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la -- To view, visit https://gerrit.osmocom.org/8011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8b3a91714b4738ace025fc7ccbcf6a8e1190c4b Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:24:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:24:10 +0000 Subject: [PATCH] libasn1c[master]: configure.ac: Use git-version-gen to set VERSION Message-ID: Review at https://gerrit.osmocom.org/8012 configure.ac: Use git-version-gen to set VERSION We updated to 0.9.29 tag, but configure.ac was locked to 0.9.28, which means release 0.9.29 is going to generated an old version and thus is broken. A new release will follow this commit. Change-Id: I8e1665f21d1bc76922423cabad3df72a2502f559 --- M configure.ac A git-version-gen 2 files changed, 153 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/12/8012/1 diff --git a/configure.ac b/configure.ac index ab63045..53720b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,5 @@ -AC_INIT([libasn1c], [0.9.28], +AC_INIT([libasn1c], + m4_esyscmd([./git-version-gen .tarball-version]), [openbsc-devel at lists.openbsc.org]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -75,4 +76,3 @@ include/Makefile include/asn1c/Makefile Makefile) - diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/8012 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e1665f21d1bc76922423cabad3df72a2502f559 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:24:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:24:11 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E29=2E1-42b1_=E2=86=92_0=2E9=2E30?= Message-ID: Review at https://gerrit.osmocom.org/8013 Bump version: 0.9.29.1-42b1 ? 0.9.30 Change-Id: I5e4817c04a980d099c146f977adf6f15f7bd56b0 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/13/8013/1 diff --git a/debian/changelog b/debian/changelog index c2fd343..26b8e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libasn1c (0.9.30) unstable; urgency=medium + + * configure.ac: Use git-version-gen to set VERSION + + -- Pau Espin Pedrol Thu, 03 May 2018 18:23:35 +0200 + libasn1c (0.9.29) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/8013 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e4817c04a980d099c146f977adf6f15f7bd56b0 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:30:06 +0000 Subject: [PATCH] osmo-iuh[master]: debian/changelog: set prev releases to unstable Message-ID: Review at https://gerrit.osmocom.org/8014 debian/changelog: set prev releases to unstable Otherwise it fools osmo-release.mk Change-Id: I6c05bb7f5bb2b3e78283a5eae6ccf95ce86838f8 --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/14/8014/1 diff --git a/debian/changelog b/debian/changelog index e8fb68e..0c11efb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -osmo-iuh (0.2.0) UNRELEASED; urgency=low +osmo-iuh (0.2.0) unstable; urgency=low * Upstream 0.2.0 release -- Harald Welte Fri, 27 Oct 2017 22:19:00 +0000 -osmo-iuh (0.1.0) UNRELEASED; urgency=low +osmo-iuh (0.1.0) unstable; urgency=low * Initial release. -- To view, visit https://gerrit.osmocom.org/8014 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c05bb7f5bb2b3e78283a5eae6ccf95ce86838f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:30:06 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E57-cf5f-dirty_=E2=86=92_0=2E3=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8015 Bump version: 0.2.0.57-cf5f-dirty ? 0.3.0 Change-Id: Id5d2f749bca46e8b81cc2934447707e3db80ea18 --- M configure.ac M debian/changelog M debian/control R debian/libosmo-ranap2.install M src/Makefile.am 5 files changed, 85 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/15/8015/1 diff --git a/configure.ac b/configure.ac index 8a654dc..bb99dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -33,13 +33,13 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.28) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 0c11efb..1ec6437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +osmo-iuh (0.3.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * src/Makefile.am: drop unused COMMON_LDADD + * add --enable-sanitize config option + * osmo-hnbgw: drop erratic log line on remote STP address + * api doc: clarify byte order in ranap_new_msg_rab_assign_* + * tests: sanitize: fix mem leaks, clean after tests + * ranap_msg_factory: sanitize: memcpy instead of unaligned int copy + * test_common: fix compiler warning: include ranap_common.h + * osmo-hnbgw: auto-config local and remote PCs if omitted + * cosmetic: osmo-hnbgw: log remote SCCP addresses on startup + * osmo-hnbgw: don't configure specific local IP address for STP connection + * iu client: store multiple LAC,RAC per RNC = fix paging for multiple RNC + * hnbgw: use proper VTY port number defined in libosmocore (4261) + * fix 3 compiler warnings in ranap_common.c + * hnbgw: use proper talloc ctx for vty telnet init + * hnbgw: hnb info: record MCC, MNC, show on 'show hnb' + * hnbap,rua,ranap decode: fix segfault on decode error + * vty: tweak / improve HNB and cnlink introspection + * osmo-hnbgw: vty: revamp output of context maps on 'show hnb' + * compiler warning: asn1tostruct.py: return 0 at end of *_free_*() + * segfault: context_map gc: use llist_for_each_entry_safe() + * rua: discard context maps on id-Disconnect + * rua_to_scu(): don't create a context map for UNITDATA + * cosmetic: context_map_tmr_cb(): fix comment + * osmo-hnbgw config: add 'rnc-id' config item + * osmo-hnbgw: startup: log the RNC-Id that is going to be used + * comments: hnbgw_rua.c: remove obsolete fixmes for asn1 free + * vty typo: 'show hnb': SCTP stream, not SCCP stream + * hnbgw_rua.c: log: fix integer format for cN_DomainIndicator + * hnbgw_rua: fix dereference of unset pointer + * hnbgw_cn: rx ranap: set rc in all cases + * hnbgw_hnbap: fix missing return in rx [un]successful outcome + * cosmetic: hnbgw: hnbap: log rx of unsuccessful outcome + * hnbap: log errors on decoding/encoding HNB-REGISTER msgs + * hnb-test: log accurate three-digit MNC with leading zeros + * configure: add --enable-werror + * cosmetic: use osmo_plmn_id instead of mcc,mnc + + [ Harald Welte ] + * osmo-hnbgw: Avoid useless linking to libosmogsm and libsctp + * Link libosmo-ranap against libosmovty + * Add "-Wall" to the compile rules of the non-asn1c-generated source code + * hnbgw.c: Remove dead code creating libsctp linker dependency + * sccp_sap_up(): Fix never-hit "default" case in switch + * Fix various compiler warnings in hnb-gw code + * hnbgw_vty.c: cosmetic: Fix non-tab-indented code + * hnbgw_vty.c: Fix "-Werror=format-security" failure in vty_out() + + [ Philipp Maier ] + * iu: iu_helpers: add functions to decode ip/port from rab-ass + * ranap_msg_factory: check IE encoder return codes + * ranap_msg_factory: remove unusued variable + + [ Max ] + * Use proper package version + * Add control interface + * Expand ctrl interface + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * iu_client.c: Remove unusued variable + * configure.ac: Enable -Wall flag + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * debian/changelog: set prev releases to unstable + + [ Stefan Sperling ] + * ensure unique CellIDs in HNB-GW + + -- Pau Espin Pedrol Thu, 03 May 2018 18:29:13 +0200 + osmo-iuh (0.2.0) unstable; urgency=low * Upstream 0.2.0 release diff --git a/debian/control b/debian/control index 3330f55..b453eea 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Depends: osmo-hnbgw (= ${binary:Version}), ${misc:Depends} Description: osmocom Home Node B Gateway -Package: libosmo-ranap1 +Package: libosmo-ranap2 Section: libs Architecture: any Multi-Arch: same @@ -49,12 +49,12 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-ranap-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-ranap1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) diff --git a/debian/libosmo-ranap1.install b/debian/libosmo-ranap2.install similarity index 100% rename from debian/libosmo-ranap1.install rename to debian/libosmo-ranap2.install diff --git a/src/Makefile.am b/src/Makefile.am index 2e57a8e..7802384 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=1:0:0 +RANAP_LIBVERSION=2:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/8015 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5d2f749bca46e8b81cc2934447707e3db80ea18 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:42:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:42:28 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E360-42ab-dirty_=E2=86=92_1=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8016 Bump version: 1.1.2.360-42ab-dirty ? 1.2.0 Change-Id: Ie6ad5c769dd11c79b2bfd0d19f0feda8416e09cd --- M configure.ac M debian/changelog 2 files changed, 397 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/8016/1 diff --git a/configure.ac b/configure.ac index a077fd5..ccfce19 100644 --- a/configure.ac +++ b/configure.ac @@ -39,19 +39,19 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) #NOTE: osmo-bsc does not depend on libosmo-legacy-mgcp anymore, but we still # need the dependancy for osmo-bsc-nat, which still uses the old API. -PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.3.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index 5f345a3..a8e2631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,390 @@ +osmo-bsc (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * bssap: paging: page entire BSS for unimplemented cell id list + * fix build: bssap test broke by undefined references + * osmo-bsc RESET FSM: use distinct struct names + * osmo-bsc: SCCP addrs: default only if unset, reject invalid + * osmo-bsc vty: be fatal for addressbook entry errors + * use osmo_sccp_inst_addr_name() instead of looking up ss7 + * add --enable-sanitize config option + * bsc_init: fix Werror: define rc for 2quater with si2q_count == 0 + * bsc filter: don't ignore imsi-allow on "global" filter level + * compiler warnings: drop some unused variables + * compiler warnings: constify in abis_nm.c + * cleanup: drop unused gsm_bts.role + * compiler warnings: add includes in abis_rsl.h, gsm_data_shared.h + * cosmetic: handover.h: use "#pragma once", declare structs, comments + * examples: add osmo-bsc-minimal.cfg + * HO prep: pass gsm_network to gsm_bts_alloc() already + * fix segfault upon release paging on BSSMAP Reset: init llist + * log typo fix in gsm0808_cipher_mode() + * debug log: log Cipher Mode info upon sending down RSL/A-bis + * fix bssmap_handle_cipher_mode()'s encryption decision + * abisip-find: add getopt option parsing in preparation for a new option + * abisip-find: add -l to list base stations instead of streaming replies + * abisip-find: update copyright + * abisip-find: add timeout option + * abisip-find: add --interval option + * vty: fix 'show lchan ...' arg [lchan_nr] to [<0-7>] + * vty: change handover command's arg LCHAN_NR to <0-7> + * vty: cosmetic: use common BTS, TRX, TS, LCHAN strings + * vty: add various manual handover and assignment trigger commands + * osmo_bsc_mgcp: cosmetic: introduce mgcp_init(), soak up fsm init + * HO: fix recovery from failed handover + * HO prep: introduce per-BTS handover config, with defaults on net node + * HO: add indicators for inter-cell and async ho, use for chan act type + * cosmetic: explicitly init ho_ref start value + * fixup: neigh_meas_avg: detect invalid window size as <=0, log if invalid + * fixup: neigh_meas_avg: fix condition to reduce window size + * HO: enable handover by initializing at startup; rename init function + * HO: add handover algo 2 parameters; skip HO 1 if HO 2 is configured + * HO: rename gsm_bts_neighbor() to bts_by_arfcn_bsic() + * HO: make bts_by_arfcn_bsic() public + * libcommon: eliminate bsc_version.c + * libcommon: eliminate common_vty.c + * libcommon: eliminate debug.c + * libcommon: eliminate socket.c + * libcommon: eliminate talloc_ctx.c + * ipaccess-proxy: don't redefine tall_bsc_ctx + * libcommon: join gsm_data_shared.* into gsm_data.* + * drop libcommon completely, move remaining files to libbsc + * libcommon-cs: move a_reset.c into libbsc + * libcommon-cs: move gsm_network_init() into bsc_network_init() + * gsm_network: drop unused trans_list + * libcommon_cs: move gsm48 bits to libbsc + * libcommon-cs: move vty bits to libbsc/bsc_vty.c + * common_cs.h: mv gsm_encr to gsm_data.h + * drop libcommon-cs completely + * drop unused common.h + * gsm_network: drop unused subscr_epxire_timer + * vty: 'show bts': write '(none)' if none are found. + * vty: 'show bts': fix indenting + * bts chan_load: ignore unusable BTS + * handover_logic.c: always do inter-cell channel activation + * handover_logic.c: on HO command, send new lchan's MS power + * HO: process_meas_rep: guard against modulo zero + * HO: cosmetic: bsc_handover_start(): "fix" memcpy for AMR config + * HO: add new_lchan_type arg to bsc_handover_start() + * HO: cosmetic: bsc_handover_start_lchan_change(): tweak local vars + * HO: always do async handover + * HO: bsc_handover_start_lchan_change(): set MS to max power on handover + * HO: logging: more logs, and more concise logging + * HO: move penalty timers to own file as proper API + * HO: store speech codec list from BSSMAP Assignment in conn + * HO: cfg: tweak vty write + * vty: 'show bts': list the TRXs' ARFCNs + * vty: 'show bts': print neighbor cells + * HO: cfg: separate hodec1 from hodec2 parameters + * HO: lchan: store last seen measurement report nr, tweak log + * HO: clearly mark conn penalty timer member for hodec2 + * HO: cosmetic: handover_decision.c: make process_meas_rep() return void + * HO: introduce ho decision callbacks + * HO: cosmetic: getting a chan activ nack on a non-ho lchan is not an error + * HO: Implement load based handover, as handover_decision_2.c + * HO: vty: rename ho decision 1 vty to 'handover1' with 'handover' alias + * cosmetic: adjust copyrights on handover_cfg.c,_vty.c + * HO: vty: clearly mark 'handover foo' as legacy alias for 'handover1 foo' + * drop unused libbsc/meas_proc.c + * HO: fix minor issues found by coverity + * bsc_api.c: fix log string format + * fix build: gprs_ra_id_by_bts(): ensure to init all values + * compiler warning: chan_compat_with_mode(): clearly handle all enum vals + * add test for gsm48_ra_id_by_bts() + * add test for abis_nm_ipaccess_cgi() + * ctrl_test_runner: add tests for 3-digit MNC + * gsm48_ra_id_by_bts(): struct gsm48_ra_id* instead of buf + * cosmetic: bsc_network_init(): imply default 001-01 PLMN + * implement support for 3-digit MNC with leading zeros + * gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported + * cosmetic: hodec2: log nr of neighbors in meas report + * cosmetic: typo in log: handover_decision2.c: 'measuements' + * handover_test: explicitly wrap abis_rsl_sendmsg() + * pcu_if: implement support for 3-digit MNC + * configure: add --enable-werror + * cosmetic: abis_nm: use osmo_cell_global_id, parse 3-digit MNC + * fixup: apply mnc3 change also in ipaccess/network_listen.c + * vty: drop unused vty definitions (*_NODE, msc_*) + * gsm0408_test: drop LAI encoding test + * range_enc_arfcns: avoid runtime error on zero size + * fix gsm0408_test: properly free bts struct after each test + * move init from gsm_bts_alloc_register() to gsm_bts_alloc(); fix gsm0408_test + * cosmetic: gsm0408_test: drop unused arg from bts_init() + * ctx cleanup: use non-NULL talloc ctx for osmo_init_logging2() + * vty: re-add 'timeout-ping' and 'timeout-pong' as dummy commands + * resurrect meas_feed.c from openbsc.git history + * resurrect meas_feed.c: make it compile, add logging + + [ Max ] + * Check OML state per-BTS + * OML: consider administrative state when reporting + * cosmetic: remove obsolete ROLE_BSC + * cosmetic: tighten function type signatures + * cosmetic: drop unused include + * cosmetic: mark gsm_objclass2mo as static + * OML: expand status reporting checks + * Generate SI2ter Rest Octets + * Generate SI2bis Rest Octets + * Fix tests after rate_ctr change + * Remove unneeded .py scripts + * Enable sanitize for CI tests + * Migrate from OpenSSL to osmo_get_rand_id() + * Add optional profiling support + * Fix .deb builds + * Check and handle SMS encoding failure + * Remove obsolete ./configure option + * cosmetic: remove duplicated code + * RSL: print link state per-TRX + * vty: fix OML link state printing + * cosmetic: log prim operation as text + + [ Philipp Maier ] + * mgcp: use osmo-mgw to switch RTP streams + * cosmetic: remove distracting newline + * cosmetic: reorder case list + * cosmetic: replace term MGCP-GW with MGW + * mgcp: add missing out state + * mgcp: remove unused variable + * reset: remove name variable from reset context + * doc: add example configuration for osmo-mgw + * auth: remove obsolete VTY commands + * bssap: remove libosmo-legacy-mgcp dependancy + * sccp-lite: remove obsolete VTY commands + * auth: remove unused structs + * auth: remove obsolete VTY commands + * mgcp: use hexadecimal digits in endpoint names + * mgcp: use mgw assigned connection identifiers + * mgcp: add missing switch case + * mgcp: do not fail silently on snprintf() + * cosmetic: remove duplicate logging + * cosmetic: do not cast void pointer + * cosmetic: add missing log prefix + * cosmetic: correct sourcecode formatting + * cosmetic: use fsm pointer from parameter list + * mgcp: cosmetic fixups + * paging: paging_flush_bts: be sure pending_requests is initalized + * cosmetic: osmo_bsc_mgcp: improve comments + * mgcp: cancel transactions on timeout + * mgcp: validate rtp connection data in MGW response (ip/port) + * mgcp: log file and line of calls to handle_error() + * cosmetic: mgcp: remove duplicate logging + * abis_rsl: permit first EstablishInd only on SAPI=0 + * abis_rsl: do not allow SACCH in MF mode on SAPI=0 + * SIGTRAN: correct wrong log category + * bsc_api: drop unknown RR messages. + * paging: page all bts when no cell is associated + * paging: fix paging attemt rate counter + * a_reset: Add FSM event names + * gsm_data: use feature list from libosmocore + * bsc_vty: display bts features in show bts + * cosmetic: remove unused enum members + * cosmetic: fix typo + * cosmetic: fix argument order of forward_dtap() + * cosmetic: remove needless fixme note. + * cosmetic: fix incomplete sentence in comment. + * Cosmetic: fix missing semicolon after osmo-assert + * cosmetic: remove dead code and obsolete fixmes + * cosmetic: remove old, already commented-out code + * ipaccess: make ipaccess-config build again + * bs11: make bs11_config build again + * cosmetic: remove dead code: osmo_bsc_reset.c + * gscon: fix illegal state transitions + * cosmetic: remove dead code + * cosmetic: Add fixme note for OS#3112 + * inform A-RESET FSM about MSC CR timeouts + * gscon: fix assignment of signalling channels + * cosmetic: Add note about libosmo-legacy-mgcp to configure.ac + + [ Harald Welte ] + * debian: Add dependency to libosmo-mgcp-client-dev + * debian: Increase required libosmo-legacy-mgcp-dev version + * configure.ac/debian: Require libosmo-mgcp-client-dev >= 1.2.0 + * osmo-bsc: Print NOTICE message on unimplemented BSSMAP UDT + * Move many counters from BSC-global to per-BTS granularity + * rate_ctr: Use ':' as separator, not '.' + * Remove 'msc' counter group from BSC + * Change T3101 default from 10s to 3s. + * paging.c: add more documentation on what the functions actually do + * paging: Remove obsolete paging call-back support + * paging: Stop all paging if MSC sends us BSSMAP RESET + * Fix per-BTS counter group index + * libbsc: paging: more reasonable (and detailed) paging statistics + * Reduce T3113 default from 60s to 10s + * Add per-BTS rate_ctr for total + failed number of RSL CHAN_ACT + * Add new per-BTS "rsl:unknown" counter to count unknown RSL messages + * Add a new counter "rsl:ipa_nack" to count number of IPA related NACKs + * Add new "chan:mode_modify_nack" counter to count RSL MODE MODIFY NACK + * Remove dead code left over from NITB split + * Remove unused RRLP options/codec + * Remove bogus vty config for LU reject cause + * Remove bogus MM INFO configuration + * Remove some more dead code + * remove libosmo-sccp dependency for osmo-bsc + * osmo_bsc_bssap.c: Spelling fixes in comment + * Remove unused struct osmo_bsc_sccp_con member sccp_queue_size + * osmo_bsc.h: document every field in 'struct osmo_bsc_sccp_con' + * osmo-bsc: Move user plane/voice related bits into sub-structure + * gsm_data.h: Document all fields of gsm_subscriber_connection + * remove unused 'lac' member of 'struct gsm_subscriber_connection' + * BSC: Add "show subscriber all" command + * BSC: Fix bsc_subsc leak on paging + * bsc_test.c: Use proper network/bts/lchan structures + * cosmetic: Hide all accesses to conn->bts behind conn_get_bts() + * Reduce T3109 default from 19s to 5s + * Make libcommon, libcommon-cs, libfilter, utils depend on mgcp/sigtran + * cosmetic: Remove data/len variables in bssmap_handle_assignm_req() + * bssmap_handle_assignm_req(): Decode channel type as first step + * remove obsolete gsm_subscriber_connection.bts member + * update.gitignore with 'tags' files and 'deps' directory + * gsm_data_shared.h: Remove unused sacch_deact member field + * vty: print RTP IP of lchan if actually bound; print remote (mgw) IP + * osmo-bsc: Add talloc context introspection via VTY + * Structural reform: Get rid of osmo_bsc_sccp_con + * vty: Permit codec-list containing both full-rate and half-rate codecs + * logging: Remove obsolete log categories + * Permit set of multiple different A5 ciphers + * bssmap_handle_assignm_req(): Use proper cause values + * bssmap_handle_assignm_req(): Use more conscise error/log message texts + * bssmap_handle_assignm_req(): Don't print log statemens in malloc failure case + * chan_compat_with_mode: signalling works over all channel types + * osmo-bts/nanobts: Set RACH_Busy Threshold to -90 dBm + * Align syntax of "handover" + "assignment" command with that of lchan act/deact + * Revert "Generate the S_L_INP_TEI_UP signal earlier." + * bsc_vty: Merge more VTY documentation string #defines + * sysinfo: Fix regression causing missing L2 Pseudo-Length in SI5/SI6 + (Closes: #3059) + * introduce an osmo_fsm for gsm_subscriber_connection + * cosmetic: Fix infinite number of formatting errors in gscon_fsm_states + * abis_nm: Improve and fix OML logging + * paging: Unify formatting of log messages with (bts=%d) prefix + * RR: Send RR STATUS in case of unsupported/unknown message + * BSSAP: Fix test_codec_pref() implementation for AMR + * BSSAP: document match_codec_pref() more thoroughly + * GSCON FSM: Fix argument order when calling gsm0808_assign_req() + * bssmap: State correct speech codec in ASSIGNMENT COMPLETE + * Start Dynamic PDCH Initialization after RSL is up + * "show timeslot": Show dynamic PDCH state also for Osmocom-style dyn PDCH + + [ Alexander Couzens ] + * debian: remove doublicated project name in example files + * use _NUM_CHREQ_T to define the size of ctype_by_chreq + * pcuif_proto.h: fix whitespaces and indention + * pcuif_proto.h: add features of version 7 (txt indication) + + [ Pau Espin Pedrol ] + * tests: Fix selection of python version + * Use type bool for boolean fields in gsm48_si_ro_info + * vty: Add cmd to configure 3g Early Classmark Sending + * cosmetic: bsc_vty: Fix trailing whitespace + * cosmetic: bsc_vty: Document bvci reserved values + * osmo_bsc_bssap.c: Fix discard of const qualifier in assignment + * debian: Move abisip-find from osmo-bsc to its own package + * abisip-find: Add option to bind to a specific source address + * abisip-find: Force stdout buffer flush + * abisip-find: Add --format-json option + * ipaccess-config: Enable logging all categories to print errors + * ipaccess-config: Add missing path with log error + * ipaccess-config: Improve handling of last parameter + * abisip-find: Improve use information output + * ipaccess-config: Check cmdlie arg unit-id format + * bsc_api.c: bsc_handle_lchan_signal: Remove unused variable + * bsc_subscr_conn_fsm.c: Fix wrong param list passed to LOGPFSML + * tests: handover_test.c: Add missing header + * pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference + * contrib: jenkins.sh: Add --enable-werror flag + * contrib: osmo-bsc.service: Update description + * contrib: osmo-bsc.service: Fix osmo-mgw.service dependency + * libbsc: nokia_site: Fix uninitialized return val + * bsc_vty: Fix uninitialized var false positive on gcc 7.3.1 + * paging: paging_request_bts: Fix wrong return value + * bssap: Log non handled paging requests + * libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc + * bsc_nat: ctrl: fix memleak on reply receival + * bsc_nat: forward_to_bsc: remove one level of indentation + * bsc_nat: forward_to_bsc: Fix memleak on send failure + * bsc_nat: Drop redundant ccon ptr in bsc_cmd_list + * bsc_nat: ctrl: Fix crash on receveing bsc reply + * use osmo_init_logging2 + * chan_alloc.c: Fix log var formatting issues + * abis_rsl.c: abis_rsl_rx_cchan: Print msg type name for unimplemented messages received + * abis_rsl.c: Clean ericsson specific imm assign code + * gsm_data_shared.h: Remove unused enum gsm_paging_event + + [ Stefan Sperling ] + * Fix "CTRL GET msc_connection_status" response. + * Support control connection status query for a particular MSC. + * Implement support for paging by LAI. + * Add TAGS files (produced by 'make tags') to .gitignore file. + * Implement support for CELL_IDENT_NO_CELL. + * Implement support for paging based on CI (cell identifier). + * Move BTS selection for paging from osmo_bsc_grace.c into osmo_bsc_bssap.c. + * Implement support for paging based on a Cell Global Identifier. + * Implement support for paging based on LAC and CI. + * Show the BTS number for outgoing paging commands in debug log. + * Split paging cases in bssmap_handle_paging() off into helper functions. + * Remove an unused variable. + * Improve an error message in page_lai_and_lac() + * Make "waiting indicator" of IMMEDIATE ASSIGN REJECT dynamic. + * Add stat items for the BTS's channel load average and T3122. + * Make RSL connection attempts time out. + * fix handover_test link error + * Add support for Access Control Class ramping. + * Generate the S_L_INP_TEI_UP signal earlier. + * use libosmocore to parse cell identifiers in osmo-bsc + * fix an error message in bssmap_handle_paging() + * change return type of page_subscriber() to void + * Generate the S_L_INP_TEI_UP signal earlier. + * fix a format string error in bts_update_t3122_chan_load() + * fix initialization of acc ramping + * only log actual access control class ramping changes + * ensure that acc_ramp_init() is only called once + * trigger acc ramping based on trx rf-locked state + * rename helper functions in the acc ramp code to avoid confusion + * trigger acc ramping on state-changed-event reports + * only trigger acc ramping if trx 0 is usable and unlocked + * fix handling of state changes in acc ramping + * properly skip paging is OML link is down + * extend documentation of paging_flush_bts() + * flush paging when RSL link is dropped + + [ Vadim Yanitskiy ] + * bsc/gsm_04_80.h: use '#pragma once' instead of includes + * bsc/gsm_04_80.h: clean up useless declarations + * libbsc/bsc_vty.c: prevent uninitialized access + * doc/examples: use NECI = 1 by default + + [ Ivan Kluchnikov ] + * handover_decision: Fix condition for power budget handover attempt + * handover_decision: log HO causes more accurately + + [ Andreas Eversberg ] + * HO: Send Channel Mode and Multirate IE along with handover command + * HO: Add function to count currently ongoing handovers to a given BTS + * Fix: If paging for half rate was requested, use hr, if supported by MS + * HO: Assign SDCCH on channel request + * Fix of checking TCH rate at chan_compat_with_mode + * HO: Count the actual meas.rep. get_meas_rep_avg fails if not reached + * HO: Count neighbor measurements and reduce window of neigh_meas_avg + * HO: Changed availablilty of ts_is_usable() from static to extern + * HO: Always update rqd_ta after receiving measurement report + * HO: If handover logic is used to do assignment, signal assignment result + * HO: Add handover decision debugging category + * Do not perform assignment, if the new channel equals the current one + * Allow assignment to TCH channel with signalling only mode + * Correctly set T3105 for ipaccess BTS type + * HO: fix: increase the number of measurement report history to 10 + * HO: Change debug category at handover decision: DHO -> DHODEC + * HO: Count number of free timeslot on a given BTS + * HO: add queue to cache DTAP messages during handover/assignment + * Fix: meas_rep.c will only use valid DL measurement reports + * HO: Add a penalty timer list to the subscriber connection entity + + [ Keith ] + * Cosmetic: Fix typo: Siganlling->Signalling + + -- Pau Espin Pedrol Thu, 03 May 2018 18:40:11 +0200 + osmo-bsc (1.1.2) unstable; urgency=medium * Debian: depend on libosmo-sigtran (bsc) and libosmo-sccp (bsc-nat) -- To view, visit https://gerrit.osmocom.org/8016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6ad5c769dd11c79b2bfd0d19f0feda8416e09cd Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 16:55:57 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E269-86f21-dirty_=E2=86=92_1=2E2=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8017 Bump version: 1.1.2.269-86f21-dirty ? 1.2.0 Change-Id: I79d1f009617b247b6c3322a7926fd565913b1e6c --- M configure.ac M debian/changelog 2 files changed, 309 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/8017/1 diff --git a/configure.ac b/configure.ac index 1dd79e8..deee84b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,16 +39,16 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.1.0) -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) +PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( @@ -84,7 +84,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") @@ -94,8 +94,8 @@ AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.28) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.2.0) + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") diff --git a/debian/changelog b/debian/changelog index 708129d..f14c792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,299 @@ +osmo-msc (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * msc_vlr_tests: fix rebuild: rebuild when src/ libs were rebuilt + * cosmetic: vlr: rename auth_tuple_max_use_count to _reuse_ + * tests: add msc_vlr_test_authen_reuse + * vty: make auth tuple reuse configurable + * vty: drop deprecated 'logging level sms...' + * defaults: assign TMSI by default + * vty: skip installing cmds now always installed by default + * examples: apply mgcp_client vty rename from 'mgcpgw' to 'mgw' + * vlr: auth_fsm_start: check return value of fsm alloc + * add --enable-sanitize config option + * rate_ctr: don't use . as separator + * sub_pres_vlr_fsm_start: fix heap use after free + * vlr_gsupc_read_cb: fix use after free of GSUP msgb + * subscr_conn: don't close after conn timeout + * vlr_subscr_conn_timeout(): don't fire events to discarded fi + * cosmetic: msc_vlr_tests: add comment to show expected tallocs + * sms_queue_test: sanitize: clean up talloc contexts when done + * cosmetic: log: CC state transition: log trans id and subscr + * cosmetic: log: CC trans_alloc: log trans_id and subscr, not memory addrs + * cosmetic: debug log: mncc: detached subscr: show subscriber + * msc_vlr_tests: fix test nr arg: clear errno before strtol() + * msc_vlr_tests: set a valid lac for fake conns + * use only 0.23.1 as point code for both A and Iu + * subscr_conn: introduce usage tokens for ref error tracking + * cosmetic: log error when using a conn that's in release + * add msc_vlr_test_call to reproduce a sanitizer error + * fix use after free: missing conn_get on CC paging response + * sms db: don't attempt to query pending SMS for unset MSISDN + * sms db: properly quote MSISDN in various SQL queries + * sms.db: silence libdbi warnings on out-of-range index + * fix vty write: add missing 'authentication optional/required' output + * compiler warning: drop double 'const' in a_iface_tx_cipher_mode() + * debug log: a_iface_tx_cipher_mode(): log cipher and key + * cosmetic: msc_vlr_tests: log SMS details when invoked with -v + * vlr: debug log: log Ciphering Mode details + * fix BSSMAP Cipher Mode Cmd: properly set permitted algorithms + * cosmetic: move translation of vlr_ciph into msc_vlr_set_ciph_mode() + * cosmetic prep: publish vlr_use_umts_aka() decision + * cosmetic prep: tell vlr_ops.set_ciph_mode() whether UMTS AKA is used + * drop unused T* timers (BSC land, not MSC) + * cosmetic: msc_paging_request: drop obsolete comment + * fix GSM-Milenage in presence of 2G keys + * compiler warning: extend #if 0 to include unused array + * a_iface_bssap: compiler warning: cast const away from TLV val for l2h + * smpp_smsc: fix truncated string copy into bind_r.system_id + * log: a_iface.c: revisit logging, use LOGPCONN + * cosmetic: rename sccp_rx_udt and sccp_rx_dt to a_* + * fix paging: add timeout to discard unsuccessful paging + * fix: properly cancel all Paging on IMSI Detach + * a_iface_tx_assignment: fix log lvl for "Sending Assignment..." + * fix build: missing LIBOSMORANAP flags in libmsc + * drop unused libmsc/meas_feed.h + * cosmetic: gsm_network_init(): imply default 001-01 PLMN + * implement support for 3-digit MNC with leading zeros + * vlr: fix post-auth LU failure handling + * vlr_lu_fsm: guard against using the wrong fi + * msc_vlr_tests: revert IMSI parameter and test nr output + * msc_vlr_test_gsm_ciph: drop unused function + * msc_vlr_tests: make all test functions static + * msc_vlr_tests: improve cipher mode coverage + * fix: clear vlr_subscr->msc_conn_ref when the conn is discarded + * vty: drop unused commands + * vty: add 'msisdn' as alias for 'extension' + * vty: add 'subscriber ... paging' cmd + * msc_main: do not say 'osmo-nitb' in the usage + * silent call: clarify rc and error messages logged on vty + * msc_vlr_tests: clearly separate Ciph Mode from Security Mode checking + * msc_vlr_test_gsm_ciph: add test for GSM AKA in UMTS environment + * vlr: fix GSM AKA in a UMTS AKA capable environment + * vlr auth: gracefully reject malformed auth response + * gsm48_rx_mm_auth_resp(): pass is_r99 from classmark, not response size + * cosmetic: gsm48_rx_mm_auth_resp(): log 'UMTS AUTH', not 'R99 AUTH' + * msc_vlr_test_umts_authen: test response with too short RES + * msc_vlr_test_umts_authen: test response with too long RES + * msc_vlr_test_umts_authen: test response with only SRES half of RES + * cosmetic: vlr_auth_fsm: clarify decision on UMTS AKA or GSM AKA + * cosmetic: vlr_auth_fsm: log RAN and size along with SRES/RES + * msc_vlr_tests: add test_a5_3_not_supported + * configure: add --enable-werror + * vlr_ciph_result: fix use after free of imeisv + * trans_free: safeguard against a still running CC timer on free + * cosmetic: vlr_auth: log decision to send UMTS or GSM AKA challenge + * cosmetic: msc_vlr_tests: enable CC logging in debug + * cosmetic: rename conn_fsm "bump" event to "release_when_unused" + * msc_vlr_tests: add CC Release test and test to catch OS#2779 + * cosmetic: gsm_04_08.c: drop unused struct gsm_lai + * trans_free: tear down conn when last transaction is done + * dissolve libcommon,libcommon-cs: clean up vty definitions + * cosmetic: msc_vty.c: use static gsmnet instead of gsmnet_from_vty() + * dissolve libcommon: drop unused bsc_version.c + * dissolve libcommon: drop debug.c + * dissolve libcommon: move talloc ctx into msc_main.c, drop talloc_ctx.c + * dissolve libcommon: drop gsm_subscriber_base.c, move vlr_subscr_* to vlr.c + * dissolve libcommon: drop gsm_data.c, move code to libmsc + * rename libcommon to libgsupclient + * dissolve libcommon-cs: mv a_reset.c to libmsc + * dissolve libcommon-cs: move gsm_network_init() to libmsc + * dissolve libcommon-cs: move gsm48_* code to libmsc, drop sms_next_rp_msg_ref() + * remove empty libcommon-cs + * gsup_test_client: gsupc_read_cb: fix uninitialized value 'io' + * use osmo_init_logging2() with proper talloc ctx + * drop some dead definitions (gsm_data.h, gsup_client.c) + * test_reject_concurrency: missing assert + * cosmetic: rx_bssmap: read message type once into local var + * cosmetic: rename gsm_subscriber_connection->conn_fsm to ->fi + * cosmetic: rename subscr_conn_from to complete_layer3_type + * subscr_conn: store complete_layer3_type in conn, not FSM event arg + * unify allocation of gsm_subscriber_connection + * trans_free: drop bad assertion + * msc_vlr_test_call: reproduce OS#3062 + * CC: intentionally release T308 on BSSMAP Clear Request from BSC + * refactor subscr_conn and subscr_conn_fsm de-/alloc + * properly receive BSSMAP Clear Complete and Iu Release Complete + * fix BSC Clear Request + * cosmetic: embed compl_l3_type in FSM id + * refactor VLR FSM result handling + * msc conn ref counts: log human readable list of conn owners + * cosmetic: use enum ranap_nsap_addr_enc instead of int + + [ Harald Welte ] + * sms_route_mt_sms: Don't return uninitialized variable + * MNCC: Add input validation + * Log difference between SETUP and EMERGENCY_SETUP + * Emergency Call: Set MNCC_F_EMERGENCY flag + * Refuse Emergency Calls by IMEI with proper CM SERVICE REJECT Cause + (Closes: #2866) + * Reject any CM SERVICE we don't support + * Remove traces of meas_feed + * Fix msc_vlr test results (.err) for new libosmocore GSM48_PDISC names + * Properly reject CM Re-Establishment Request + * msc_cipher_mode_compl: Handle CIPH MOD COMPL without L3 message + * remove unused paging.h and osmo_bsc_grace.h + * debug: Remove code for filters that don't exist in OsmoMSC + * remove traces of bsc_subscriber + * jenkins.sh: Don't depend on osmo-ggsn + * Massive removal of unused code/structs/headers + * remove unused ipaccess.h + * remove dead code in auth.h / auth.c + * remove dead header files bsc_msc.h, bsc_msc_data.h and bsc_rll.h + * signal.h: Remove unused/dead signal definitions + * remove dead ctrl.h header file + * debug: Remove dead log categories + * Shift ciphering algorithm selection from VLR to MSC + * Permit a set of multiple different A5 ciphers + * MSC: Intersect configured A5 algorithms with MS-supported ones + * Change GSUP re-connect interval to 1s + * Implement checks for duplicate uplink UL L3 message (Closes: #2908) + * VTY: Add 'show connections' and 'show transactions' commands + * a_reset: Add additional "a_reset_alloc" argument + * Don't answer to BSC-originated RESET with another RESET + * cosmetic: Use msgb_hexdump*() rather than manual osmo_hexdump() on msg + * a_iface: Reduce log levels + * a_iface_bssap.c: Use LOGPCONN() whenever possible + * a_sccp_rx_dt(): Don't print hexdump of message multiple times + * cosmetic: a_iface: Harmonize log statements + * cosmetic: No need for 'break' after 'return' + * a_iface: centralize lookup of subscriber_conn + * cosmetic: a_iface: More logging harmonization + * a_iface: Add copyright statement (after recent contributions) + * Introduce new BSSAP logging category/subsystem + * a_iface: Fix heap-use-after-free by cleaning up msgb ownership + * Add VTY command to configure destination MSISDN for emergency calls + * a_iface: Fix heap-use-after-free in a_clear_all() + * MGCP: Response code 250 is *not* an error for DLCX + * a_iface: s/Abis/L3/ for speech version/preference fields + * a_iface: Consistent and understandable function names + * MT Calls: Copy bearer capabilities from NNCC primitive to trans + * MNCC: Copy bearer_cap from MNCC to gsm_trans + * gsm_data: remove unused gsm_subscriber_connection members + * remove bsc_api.h and all users - they're all dead code + * dead code removal + * remove unused dyn_ts_allow_tch_f VTY option + * osmo-msc: Add talloc context introspection via VTY + * remove unused VTY command "location updating reject cause" + * remove unused "authorized-regexp" VTY command + * remove unused "auth policy" VTY command + * remove dead code (gsm_parse_reg) + * BSSAP: Return error code if COMPL L3 with no or too short L3 payload + * a_iface_bssap: Treat inbound RESET as implicit RESET ACK + * a_iface: If L3/DTAP returns error in COMPL L3, close SCCP connection + * DTAP: Ensure proper DLCI is used in MSC-originated DTAP + * Permit any Sender MSISDN when sending SMS from VTY + * smpp: Unset esme->acl on socket close + * sms_queue: fix use-after-free on 'pending' + + [ Alexander Couzens ] + * debian/rules: remove doublicated project name in example files + * libmsc/vty: don't access old bsc rate counters + + [ Philipp Maier ] + * reset: remove name variable from reset context + * cosmetic: move log message to else branch + * cosmetic: add missing spaces + * cosmetic: remove duplicate logging + * mncc: re-add lchan members to structs + * mncc: remove deprecated commandline option. + * a_iface: correct data type for a.conn_id in gsm_subscriber_connection + * mgcp: use osmo-mgw to switch rtp streams + * increase RAN timeout in MGCP FSM + * a_reset: Add FSM event names + * msc_mgcp: Add FSM event names + * a_iface: fix BSSMAP reset handling + * msc_mgcp: fix mgw timeout handling + * mgcp: be sure that pending mgcp transactions are canceled before free + * msc_mgcp: use more conceise error msg on truncation + * mcgp: let the MGW allocate the MGCP endpoint + * cosmetic: remove disabled (debug) code gsm_04_08.c + * msc_mgcp: to not access higher layers after release + * cosmetic: remove unused variable + * msc_mgcp.c: log endpoint name instead of pointer + * msc_mgcp: do not send wildcarded DLCX messages + + [ Max ] + * Use osmo-ggsn instead of openggsn in jenkins tests + * Add basic CTRL test + * Remove obsolete ./configure option + * Remove unneeded .py scripts + * Enable sanitize for CI tests + * Migrate from OpenSSL to osmo_get_rand_id() + * VLR: remove unused parameter + * VLR: log subscriber update + * Add control command to expire subscriber + * VLR: constify GSUP-related function parameters + * cosmetic: log prim operation as text + * Remove unused code + * Wrap osmo_strlcpy() calls + * Fix whitespace issues + * Constify msc_subscr_conn_is_accepted() parameter + * Move IMSI into test parameters + * VLR tests: mark static test functions as such + * Expand VLR tests + * VLR tests: don't fail via assert + * VLR tests: remove weird code + * VLR tests: always print test parameters + * VLR tests: move network init into function + * GSUP: check osmo_gsup_encode() result + * VLR: fix potential NULL dereference + + [ Alexander Huemer ] + * Add missing CFLAGS + * Remove utils imported from openbsc, fix building remaining util smpp_mirror + + [ Pau Espin Pedrol ] + * libmsc: db.c: Replace dbi APIs marked as deprecated + * libmsc: msc_vty: Fix compilation warning + * libmsc: bssap: Fix typo in log message + * libmsc: bssap: Refactor rx paths to to avoid parse_tlv code duplication + * libmsc: bssap: Catch TLV parse failures + * libmsc: bssap: Remove fixme and properly update msgb tail + * msc_mgcp.c: Fix several wrong ptr printf fmt + * contrib: osmo-msc.service: Depend on osmo-mgw.service + * smpp_smsc_conf: Fix heap-use-after-free + * Remove unused GSM_PAGING_OOM + * setup_trig_pag_evt: Remove uneeded default case in switch statement + * setup_trig_pag_evt: Always log correct paging failure case + * setup_trig_pag_evt: Fix heap-use-after-free + + [ the 34c3 gsm team ] + * smpp_smsc.c: don't talloc_strdup NULL pointers + + [ Vadim Yanitskiy ] + * msc/gsm_04_80.h: clean up useless declarations + * msc/gsm_04_80.h: cosmetic: whitespace fix + * msc/gsm_04_80.h: use '#pragma once' instead of includes + * src/libmsc/ussd.c: drop useless forward declaration + * ussd.h: cosmetic: remove useless comment + * ussd.h: cosmetic: use '#pragma once' include guard + * libmsc/gsm_04_80.c: drop unused 'in_msg' argument + * libmsc/ussd.c: cosmetic: correct log level and message + * libmsc/ussd: don't overwrite rc if decoding failed + * tests/msc_vlr: fix expected SS message names + + [ Stefan Sperling ] + * Improve an error message in db_init(). + * Delete SMS from the database once they were sent successfully + * Store/retrieve SMS validity time in the SMS datebase + * Fix value of stored SMS validity time. + * Add a VTY command which deletes all expired SMS. + * Accept SMS for any receiver + * Delete expired SMS automatically. + * Make sending an SMS to an unknown subscriber B work over SMPP. + * enable osmo_fsm vty commands in osmo-msc vty + * Track libosmocore API change in osmo-msc. + * restore sending of optional MM info messages + * use libosmocom to parse cell identifier in bssmap_rx_l3_compl() + + [ Daniel Willmann ] + * iucs: Add a function to return the connection ID for the IU SCCP conn + * libmsc: Add a function to return a unique ID of the subscriber conn + * libmsc: Pretend MNCC requested release in handle_error() + + -- Pau Espin Pedrol Thu, 03 May 2018 18:52:03 +0200 + osmo-msc (1.1.2) unstable; urgency=medium * Depend on both libosmo-sigtran-dev and libosmo-sccp-dev -- To view, visit https://gerrit.osmocom.org/8017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79d1f009617b247b6c3322a7926fd565913b1e6c Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 16:59:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:59:35 +0000 Subject: libsmpp34[master]: src/Makefile.am: Use LIBVERSION variable to set version-info In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9c6ebb9656d6756e8344fd57a246be58b105c419 Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:59:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:59:43 +0000 Subject: =?UTF-8?Q?libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E12=2E0=2E20-a637-dirty_=E2=86=92_1=2E13=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8b3a91714b4738ace025fc7ccbcf6a8e1190c4b Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 16:59:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:59:46 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libsmpp34=5Bmaster=5D=3A_Bump_version=3A_1=2E12=2E0=2E20-a637-dirty_=E2=86=92_1=2E13=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 1.12.0.20-a637-dirty ? 1.13.0 ...................................................................... Bump version: 1.12.0.20-a637-dirty ? 1.13.0 Change-Id: If8b3a91714b4738ace025fc7ccbcf6a8e1190c4b --- M debian/changelog M debian/control R debian/libsmpp1.install M src/Makefile.am 4 files changed, 36 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 5a142af..b8459ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libsmpp34 (1.12.0) UNRELEASED; urgency=medium +libsmpp34 (1.13.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] * Move forward towards a new release. @@ -8,8 +8,38 @@ * SMPP_DELIVERY_RECEIPT_* constants * SMPP ESM class parameter definitions * smpp34_tlv_for_each() helper macro + * Fix 'make distcheck' by adding .version to EXTRA_DISTI + * debian/control: Fix Vcs-{Browser,Git} URLs - -- Harald Welte Mon, 14 Aug 2017 19:08:37 +0200 + [ Max ] + * Use release helper from libosmocore + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * smpp34_dumpBuf.c: remove unused variable + * smpp34_structs.h: Fix trailing whitespace + * smpp34_structs.h: Fix truncated output in str_tlv_id + * smpp34_unpack.c: remove unused variable + * bind_receiver_resp_test.c: Fix compilation warning + * Fix Out of bounds compilation warning in OCTET8 + * contrib: Enable -Werror by default + * src/Makefile.am: Use LIBVERSION variable to set version-info + + [ Alexander Couzens ] + * debian/rules: show testsuite.log when tests are failing + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * add --enable-sanitize config option + * configure: add --enable-werror + * jenkins.sh: use --enable-werror configure flag, not CFLAGS + + [ Martin Hauke ] + * binaries/Makefile.am: Fix parallel build issue + * jenkins: Enable parallel build and distcheck + * jenkins.sh: output all test logs when 'make check' failed + + -- Pau Espin Pedrol Thu, 03 May 2018 18:04:10 +0200 libsmpp34 (1.10z1) stable; urgency=low diff --git a/debian/control b/debian/control index 84fd5a5..be4a63b 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Vcs-Git: git://git.osmocom.org/libsmpp34.git Homepage: https://projects.osmocom.org/projects/libsmpp34 -Package: libsmpp0 +Package: libsmpp1 Section: libs Architecture: any Multi-Arch: same @@ -35,7 +35,7 @@ Architecture: any Multi-Arch: same Section: libdevel -Depends: libsmpp0 (= ${binary:Version}), +Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends} Description: Development files for libsmpp34 This library is an implementation for providing the PDU handling of the @@ -55,5 +55,5 @@ Architecture: any Section: debug Priority: extra -Depends: libsmpp0 (= ${binary:Version}), ${misc:Depends} +Depends: libsmpp1 (= ${binary:Version}), ${misc:Depends} Description: Debug symbols for libsmpp34 diff --git a/debian/libsmpp0.install b/debian/libsmpp1.install similarity index 100% rename from debian/libsmpp0.install rename to debian/libsmpp1.install diff --git a/src/Makefile.am b/src/Makefile.am index 8954eae..67550f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -LIBVERSION=0:1:0 +LIBVERSION=1:0:0 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la -- To view, visit https://gerrit.osmocom.org/8011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8b3a91714b4738ace025fc7ccbcf6a8e1190c4b Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 16:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 16:59:47 +0000 Subject: [MERGED] libsmpp34[master]: src/Makefile.am: Use LIBVERSION variable to set version-info In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: src/Makefile.am: Use LIBVERSION variable to set version-info ...................................................................... src/Makefile.am: Use LIBVERSION variable to set version-info Same as we do in all other osmocom projects, and osmo-release.mk expects that variable name. Change-Id: I9c6ebb9656d6756e8344fd57a246be58b105c419 --- M src/Makefile.am 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index 940fd0a..8954eae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,6 @@ +# This is _NOT_ the library release version, it's an API version. +# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification +LIBVERSION=0:1:0 # src/Makefile.am # lib_LTLIBRARIES = libsmpp34.la @@ -22,7 +25,5 @@ libsmpp34_la_CFLAGS = @CFLAGS@ -Wall libsmpp34_la_CFLAGS += -D_REENTRANT -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS libsmpp34_la_INCLUDES = -I. -I.. -libsmpp34_la_LDFLAGS = @LDFLAGS@ -version-info 0:1:0 +libsmpp34_la_LDFLAGS = @LDFLAGS@ -version-info $(LIBVERSION) -no-undefined libsmpp34_la_LDFLAGS += -lrt -lpthread - - -- To view, visit https://gerrit.osmocom.org/8010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c6ebb9656d6756e8344fd57a246be58b105c419 Gerrit-PatchSet: 1 Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 3 17:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:00:30 +0000 Subject: libasn1c[master]: configure.ac: Use git-version-gen to set VERSION In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8012 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8e1665f21d1bc76922423cabad3df72a2502f559 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:00:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:00:36 +0000 Subject: osmo-iuh[master]: debian/changelog: set prev releases to unstable In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8014 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c05bb7f5bb2b3e78283a5eae6ccf95ce86838f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:01:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:01:00 +0000 Subject: =?UTF-8?Q?osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E57-cf5f-dirty_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8015 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5d2f749bca46e8b81cc2934447707e3db80ea18 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:01:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:01:19 +0000 Subject: =?UTF-8?Q?osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E269-86f21-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I79d1f009617b247b6c3322a7926fd565913b1e6c Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:01:34 +0000 Subject: =?UTF-8?Q?osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E360-42ab-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie6ad5c769dd11c79b2bfd0d19f0feda8416e09cd Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:01:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:01:43 +0000 Subject: =?UTF-8?Q?libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E29=2E1-42b1_=E2=86=92_0=2E9=2E30?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8013 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5e4817c04a980d099c146f977adf6f15f7bd56b0 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:02:38 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E58-85ca87-dirty_=E2=86=92_1=2E3=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8018 Bump version: 1.2.0.58-85ca87-dirty ? 1.3.0 Change-Id: I466089b40fed02153e2850cb4a748ee6568b130b --- M configure.ac M debian/changelog 2 files changed, 83 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/18/8018/1 diff --git a/configure.ac b/configure.ac index 1b23d27..2b5bb1a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,28 +39,28 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? - PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version? - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version? + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.2.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index 0b56541..b39abb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +osmo-sgsn (1.3.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * drop osmo_sgsn.cfg from src/gprs dir + * change default config filename to osmo-sgsn.cfg, not osmo_sgsn.cfg + * vty: skip installing cmds now always installed by default + * add --enable-sanitize config option + * use default point-code as listed on Point_Codes wiki page + * gprs_gmm: segfault: gracefully handle failure to alloc context + * gsm48_rx_gmm_att_req: fix error handling: don't clean up NULL llme + * gprs_llc: tx dl ud: make mismatching LLE not crash osmo-sgsn + * fix build: missing LIBGTP_CFLAGS in sgsn_test + * sgsn_test: guard against struct gprs_ra_id changing + * vty: absorb command explanations from osmo-gsm-manuals + * configure: add --enable-werror + * implement support for 3-digit MNC with leading zeros + * osmo-gbproxy: use 'osmo-gbproxy.cfg' as default config name + * compiler warnings: use enum ranap_nsap_addr_enc, constify local var + * use osmo_init_logging2(), fix regression test memleaks + * auth+ciph: log is_r99 and auth types + * log two RA Update Request failure causes + * GERAN: allow GSM SRES on UMTS AKA challenge + + [ Alexander Couzens ] + * .gitignore: remove unneeded ignores of bsc/msc/nitb files + * tests/ctrl_test_runner.py: remove BSC/NAT TestRunner + * debian: remove doublicated project name in example files + * .gitignore: remove non-existent /src/utils exludes + * configure.ac: remove pcap check + * configure.ac: remove unused libcdk check + * .service: remove OpenBSC from service desription + * mandatory depend on libc-ares and libgtp + * GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is unknown + + [ Harald Welte ] + * Replace '.' in counter names with ':' + * Add talloc context introspection via VTY + + [ Pau Espin Pedrol ] + * Replace '.' in counter names with ':' + * tests: Fix selection of python version + * sgsn_cdr: Split log formatting into a snprintf function + * Add vty cmd 'cdr trap' to send CDR through CTRL iface + * tests: sgsn_test: Define wrap APIs with correct parameters + * cosmetic: tests: sgsn_test: Use proper formatting and remove uneeded semicolons + * gprs_gmm: Remove unused variable + * cosmetic: gprs_gmm: Remove trailing whitespace + * gprs_gmm: Convert warning message to pragma message + * configure.ac: Enable Wall in CFLAGS + * .gitignore: Add m4 files + * sgsn_libgtp.c: Fix typos and whitespace + + [ Max ] + * Fix display of GTP addresses + * Show GTP version for PDP context in vty + * Remove unneeded .py scripts + * Replace '.' in counter names with ':' + * Remove dead code + * Enable sanitize for CI tests + * cosmetic: use macro for gtphub plane iteration + * Use connection id when allocating rate counters + * Migrate from OpenSSL to osmo_get_rand_id() + * Remove obsolete ./configure option + * Fix RAI construction + * gtphub: make rate_ctr unique + * Remove unused bsc_version.c + * Use gsm48_encode_ra() for RAI encoding + * gtphub: check for gsn_addr_from_sockaddr() errors + * gtphub: check for gsn_addr_from_sockaddr() error + + -- Pau Espin Pedrol Thu, 03 May 2018 19:01:44 +0200 + osmo-sgsn (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8018 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I466089b40fed02153e2850cb4a748ee6568b130b Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:02:58 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E29=2E1-42b1_=E2=86=92_0=2E9=2E30?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.9.29.1-42b1 ? 0.9.30 ...................................................................... Bump version: 0.9.29.1-42b1 ? 0.9.30 Change-Id: I5e4817c04a980d099c146f977adf6f15f7bd56b0 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index c2fd343..26b8e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libasn1c (0.9.30) unstable; urgency=medium + + * configure.ac: Use git-version-gen to set VERSION + + -- Pau Espin Pedrol Thu, 03 May 2018 18:23:35 +0200 + libasn1c (0.9.29) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/8013 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e4817c04a980d099c146f977adf6f15f7bd56b0 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:02:58 +0000 Subject: [MERGED] libasn1c[master]: configure.ac: Use git-version-gen to set VERSION In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: configure.ac: Use git-version-gen to set VERSION ...................................................................... configure.ac: Use git-version-gen to set VERSION We updated to 0.9.29 tag, but configure.ac was locked to 0.9.28, which means release 0.9.29 is going to generated an old version and thus is broken. A new release will follow this commit. Change-Id: I8e1665f21d1bc76922423cabad3df72a2502f559 --- M configure.ac A git-version-gen 2 files changed, 153 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index ab63045..53720b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,5 @@ -AC_INIT([libasn1c], [0.9.28], +AC_INIT([libasn1c], + m4_esyscmd([./git-version-gen .tarball-version]), [openbsc-devel at lists.openbsc.org]) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -75,4 +76,3 @@ include/Makefile include/asn1c/Makefile Makefile) - diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -- To view, visit https://gerrit.osmocom.org/8012 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e1665f21d1bc76922423cabad3df72a2502f559 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:03:58 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E360-42ab-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 1.1.2.360-42ab-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.2.360-42ab-dirty ? 1.2.0 Change-Id: Ie6ad5c769dd11c79b2bfd0d19f0feda8416e09cd --- M configure.ac M debian/changelog 2 files changed, 397 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index a077fd5..ccfce19 100644 --- a/configure.ac +++ b/configure.ac @@ -39,19 +39,19 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.3.2) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) #NOTE: osmo-bsc does not depend on libosmo-legacy-mgcp anymore, but we still # need the dependancy for osmo-bsc-nat, which still uses the old API. -PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOLEGACYMGCP, libosmo-legacy-mgcp >= 1.3.0) dnl checks for header files AC_HEADER_STDC diff --git a/debian/changelog b/debian/changelog index 5f345a3..a8e2631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,390 @@ +osmo-bsc (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + * bssap: paging: page entire BSS for unimplemented cell id list + * fix build: bssap test broke by undefined references + * osmo-bsc RESET FSM: use distinct struct names + * osmo-bsc: SCCP addrs: default only if unset, reject invalid + * osmo-bsc vty: be fatal for addressbook entry errors + * use osmo_sccp_inst_addr_name() instead of looking up ss7 + * add --enable-sanitize config option + * bsc_init: fix Werror: define rc for 2quater with si2q_count == 0 + * bsc filter: don't ignore imsi-allow on "global" filter level + * compiler warnings: drop some unused variables + * compiler warnings: constify in abis_nm.c + * cleanup: drop unused gsm_bts.role + * compiler warnings: add includes in abis_rsl.h, gsm_data_shared.h + * cosmetic: handover.h: use "#pragma once", declare structs, comments + * examples: add osmo-bsc-minimal.cfg + * HO prep: pass gsm_network to gsm_bts_alloc() already + * fix segfault upon release paging on BSSMAP Reset: init llist + * log typo fix in gsm0808_cipher_mode() + * debug log: log Cipher Mode info upon sending down RSL/A-bis + * fix bssmap_handle_cipher_mode()'s encryption decision + * abisip-find: add getopt option parsing in preparation for a new option + * abisip-find: add -l to list base stations instead of streaming replies + * abisip-find: update copyright + * abisip-find: add timeout option + * abisip-find: add --interval option + * vty: fix 'show lchan ...' arg [lchan_nr] to [<0-7>] + * vty: change handover command's arg LCHAN_NR to <0-7> + * vty: cosmetic: use common BTS, TRX, TS, LCHAN strings + * vty: add various manual handover and assignment trigger commands + * osmo_bsc_mgcp: cosmetic: introduce mgcp_init(), soak up fsm init + * HO: fix recovery from failed handover + * HO prep: introduce per-BTS handover config, with defaults on net node + * HO: add indicators for inter-cell and async ho, use for chan act type + * cosmetic: explicitly init ho_ref start value + * fixup: neigh_meas_avg: detect invalid window size as <=0, log if invalid + * fixup: neigh_meas_avg: fix condition to reduce window size + * HO: enable handover by initializing at startup; rename init function + * HO: add handover algo 2 parameters; skip HO 1 if HO 2 is configured + * HO: rename gsm_bts_neighbor() to bts_by_arfcn_bsic() + * HO: make bts_by_arfcn_bsic() public + * libcommon: eliminate bsc_version.c + * libcommon: eliminate common_vty.c + * libcommon: eliminate debug.c + * libcommon: eliminate socket.c + * libcommon: eliminate talloc_ctx.c + * ipaccess-proxy: don't redefine tall_bsc_ctx + * libcommon: join gsm_data_shared.* into gsm_data.* + * drop libcommon completely, move remaining files to libbsc + * libcommon-cs: move a_reset.c into libbsc + * libcommon-cs: move gsm_network_init() into bsc_network_init() + * gsm_network: drop unused trans_list + * libcommon_cs: move gsm48 bits to libbsc + * libcommon-cs: move vty bits to libbsc/bsc_vty.c + * common_cs.h: mv gsm_encr to gsm_data.h + * drop libcommon-cs completely + * drop unused common.h + * gsm_network: drop unused subscr_epxire_timer + * vty: 'show bts': write '(none)' if none are found. + * vty: 'show bts': fix indenting + * bts chan_load: ignore unusable BTS + * handover_logic.c: always do inter-cell channel activation + * handover_logic.c: on HO command, send new lchan's MS power + * HO: process_meas_rep: guard against modulo zero + * HO: cosmetic: bsc_handover_start(): "fix" memcpy for AMR config + * HO: add new_lchan_type arg to bsc_handover_start() + * HO: cosmetic: bsc_handover_start_lchan_change(): tweak local vars + * HO: always do async handover + * HO: bsc_handover_start_lchan_change(): set MS to max power on handover + * HO: logging: more logs, and more concise logging + * HO: move penalty timers to own file as proper API + * HO: store speech codec list from BSSMAP Assignment in conn + * HO: cfg: tweak vty write + * vty: 'show bts': list the TRXs' ARFCNs + * vty: 'show bts': print neighbor cells + * HO: cfg: separate hodec1 from hodec2 parameters + * HO: lchan: store last seen measurement report nr, tweak log + * HO: clearly mark conn penalty timer member for hodec2 + * HO: cosmetic: handover_decision.c: make process_meas_rep() return void + * HO: introduce ho decision callbacks + * HO: cosmetic: getting a chan activ nack on a non-ho lchan is not an error + * HO: Implement load based handover, as handover_decision_2.c + * HO: vty: rename ho decision 1 vty to 'handover1' with 'handover' alias + * cosmetic: adjust copyrights on handover_cfg.c,_vty.c + * HO: vty: clearly mark 'handover foo' as legacy alias for 'handover1 foo' + * drop unused libbsc/meas_proc.c + * HO: fix minor issues found by coverity + * bsc_api.c: fix log string format + * fix build: gprs_ra_id_by_bts(): ensure to init all values + * compiler warning: chan_compat_with_mode(): clearly handle all enum vals + * add test for gsm48_ra_id_by_bts() + * add test for abis_nm_ipaccess_cgi() + * ctrl_test_runner: add tests for 3-digit MNC + * gsm48_ra_id_by_bts(): struct gsm48_ra_id* instead of buf + * cosmetic: bsc_network_init(): imply default 001-01 PLMN + * implement support for 3-digit MNC with leading zeros + * gsm48_parse_meas_rep(): set num_cell=0 if no neighbor cells are reported + * cosmetic: hodec2: log nr of neighbors in meas report + * cosmetic: typo in log: handover_decision2.c: 'measuements' + * handover_test: explicitly wrap abis_rsl_sendmsg() + * pcu_if: implement support for 3-digit MNC + * configure: add --enable-werror + * cosmetic: abis_nm: use osmo_cell_global_id, parse 3-digit MNC + * fixup: apply mnc3 change also in ipaccess/network_listen.c + * vty: drop unused vty definitions (*_NODE, msc_*) + * gsm0408_test: drop LAI encoding test + * range_enc_arfcns: avoid runtime error on zero size + * fix gsm0408_test: properly free bts struct after each test + * move init from gsm_bts_alloc_register() to gsm_bts_alloc(); fix gsm0408_test + * cosmetic: gsm0408_test: drop unused arg from bts_init() + * ctx cleanup: use non-NULL talloc ctx for osmo_init_logging2() + * vty: re-add 'timeout-ping' and 'timeout-pong' as dummy commands + * resurrect meas_feed.c from openbsc.git history + * resurrect meas_feed.c: make it compile, add logging + + [ Max ] + * Check OML state per-BTS + * OML: consider administrative state when reporting + * cosmetic: remove obsolete ROLE_BSC + * cosmetic: tighten function type signatures + * cosmetic: drop unused include + * cosmetic: mark gsm_objclass2mo as static + * OML: expand status reporting checks + * Generate SI2ter Rest Octets + * Generate SI2bis Rest Octets + * Fix tests after rate_ctr change + * Remove unneeded .py scripts + * Enable sanitize for CI tests + * Migrate from OpenSSL to osmo_get_rand_id() + * Add optional profiling support + * Fix .deb builds + * Check and handle SMS encoding failure + * Remove obsolete ./configure option + * cosmetic: remove duplicated code + * RSL: print link state per-TRX + * vty: fix OML link state printing + * cosmetic: log prim operation as text + + [ Philipp Maier ] + * mgcp: use osmo-mgw to switch RTP streams + * cosmetic: remove distracting newline + * cosmetic: reorder case list + * cosmetic: replace term MGCP-GW with MGW + * mgcp: add missing out state + * mgcp: remove unused variable + * reset: remove name variable from reset context + * doc: add example configuration for osmo-mgw + * auth: remove obsolete VTY commands + * bssap: remove libosmo-legacy-mgcp dependancy + * sccp-lite: remove obsolete VTY commands + * auth: remove unused structs + * auth: remove obsolete VTY commands + * mgcp: use hexadecimal digits in endpoint names + * mgcp: use mgw assigned connection identifiers + * mgcp: add missing switch case + * mgcp: do not fail silently on snprintf() + * cosmetic: remove duplicate logging + * cosmetic: do not cast void pointer + * cosmetic: add missing log prefix + * cosmetic: correct sourcecode formatting + * cosmetic: use fsm pointer from parameter list + * mgcp: cosmetic fixups + * paging: paging_flush_bts: be sure pending_requests is initalized + * cosmetic: osmo_bsc_mgcp: improve comments + * mgcp: cancel transactions on timeout + * mgcp: validate rtp connection data in MGW response (ip/port) + * mgcp: log file and line of calls to handle_error() + * cosmetic: mgcp: remove duplicate logging + * abis_rsl: permit first EstablishInd only on SAPI=0 + * abis_rsl: do not allow SACCH in MF mode on SAPI=0 + * SIGTRAN: correct wrong log category + * bsc_api: drop unknown RR messages. + * paging: page all bts when no cell is associated + * paging: fix paging attemt rate counter + * a_reset: Add FSM event names + * gsm_data: use feature list from libosmocore + * bsc_vty: display bts features in show bts + * cosmetic: remove unused enum members + * cosmetic: fix typo + * cosmetic: fix argument order of forward_dtap() + * cosmetic: remove needless fixme note. + * cosmetic: fix incomplete sentence in comment. + * Cosmetic: fix missing semicolon after osmo-assert + * cosmetic: remove dead code and obsolete fixmes + * cosmetic: remove old, already commented-out code + * ipaccess: make ipaccess-config build again + * bs11: make bs11_config build again + * cosmetic: remove dead code: osmo_bsc_reset.c + * gscon: fix illegal state transitions + * cosmetic: remove dead code + * cosmetic: Add fixme note for OS#3112 + * inform A-RESET FSM about MSC CR timeouts + * gscon: fix assignment of signalling channels + * cosmetic: Add note about libosmo-legacy-mgcp to configure.ac + + [ Harald Welte ] + * debian: Add dependency to libosmo-mgcp-client-dev + * debian: Increase required libosmo-legacy-mgcp-dev version + * configure.ac/debian: Require libosmo-mgcp-client-dev >= 1.2.0 + * osmo-bsc: Print NOTICE message on unimplemented BSSMAP UDT + * Move many counters from BSC-global to per-BTS granularity + * rate_ctr: Use ':' as separator, not '.' + * Remove 'msc' counter group from BSC + * Change T3101 default from 10s to 3s. + * paging.c: add more documentation on what the functions actually do + * paging: Remove obsolete paging call-back support + * paging: Stop all paging if MSC sends us BSSMAP RESET + * Fix per-BTS counter group index + * libbsc: paging: more reasonable (and detailed) paging statistics + * Reduce T3113 default from 60s to 10s + * Add per-BTS rate_ctr for total + failed number of RSL CHAN_ACT + * Add new per-BTS "rsl:unknown" counter to count unknown RSL messages + * Add a new counter "rsl:ipa_nack" to count number of IPA related NACKs + * Add new "chan:mode_modify_nack" counter to count RSL MODE MODIFY NACK + * Remove dead code left over from NITB split + * Remove unused RRLP options/codec + * Remove bogus vty config for LU reject cause + * Remove bogus MM INFO configuration + * Remove some more dead code + * remove libosmo-sccp dependency for osmo-bsc + * osmo_bsc_bssap.c: Spelling fixes in comment + * Remove unused struct osmo_bsc_sccp_con member sccp_queue_size + * osmo_bsc.h: document every field in 'struct osmo_bsc_sccp_con' + * osmo-bsc: Move user plane/voice related bits into sub-structure + * gsm_data.h: Document all fields of gsm_subscriber_connection + * remove unused 'lac' member of 'struct gsm_subscriber_connection' + * BSC: Add "show subscriber all" command + * BSC: Fix bsc_subsc leak on paging + * bsc_test.c: Use proper network/bts/lchan structures + * cosmetic: Hide all accesses to conn->bts behind conn_get_bts() + * Reduce T3109 default from 19s to 5s + * Make libcommon, libcommon-cs, libfilter, utils depend on mgcp/sigtran + * cosmetic: Remove data/len variables in bssmap_handle_assignm_req() + * bssmap_handle_assignm_req(): Decode channel type as first step + * remove obsolete gsm_subscriber_connection.bts member + * update.gitignore with 'tags' files and 'deps' directory + * gsm_data_shared.h: Remove unused sacch_deact member field + * vty: print RTP IP of lchan if actually bound; print remote (mgw) IP + * osmo-bsc: Add talloc context introspection via VTY + * Structural reform: Get rid of osmo_bsc_sccp_con + * vty: Permit codec-list containing both full-rate and half-rate codecs + * logging: Remove obsolete log categories + * Permit set of multiple different A5 ciphers + * bssmap_handle_assignm_req(): Use proper cause values + * bssmap_handle_assignm_req(): Use more conscise error/log message texts + * bssmap_handle_assignm_req(): Don't print log statemens in malloc failure case + * chan_compat_with_mode: signalling works over all channel types + * osmo-bts/nanobts: Set RACH_Busy Threshold to -90 dBm + * Align syntax of "handover" + "assignment" command with that of lchan act/deact + * Revert "Generate the S_L_INP_TEI_UP signal earlier." + * bsc_vty: Merge more VTY documentation string #defines + * sysinfo: Fix regression causing missing L2 Pseudo-Length in SI5/SI6 + (Closes: #3059) + * introduce an osmo_fsm for gsm_subscriber_connection + * cosmetic: Fix infinite number of formatting errors in gscon_fsm_states + * abis_nm: Improve and fix OML logging + * paging: Unify formatting of log messages with (bts=%d) prefix + * RR: Send RR STATUS in case of unsupported/unknown message + * BSSAP: Fix test_codec_pref() implementation for AMR + * BSSAP: document match_codec_pref() more thoroughly + * GSCON FSM: Fix argument order when calling gsm0808_assign_req() + * bssmap: State correct speech codec in ASSIGNMENT COMPLETE + * Start Dynamic PDCH Initialization after RSL is up + * "show timeslot": Show dynamic PDCH state also for Osmocom-style dyn PDCH + + [ Alexander Couzens ] + * debian: remove doublicated project name in example files + * use _NUM_CHREQ_T to define the size of ctype_by_chreq + * pcuif_proto.h: fix whitespaces and indention + * pcuif_proto.h: add features of version 7 (txt indication) + + [ Pau Espin Pedrol ] + * tests: Fix selection of python version + * Use type bool for boolean fields in gsm48_si_ro_info + * vty: Add cmd to configure 3g Early Classmark Sending + * cosmetic: bsc_vty: Fix trailing whitespace + * cosmetic: bsc_vty: Document bvci reserved values + * osmo_bsc_bssap.c: Fix discard of const qualifier in assignment + * debian: Move abisip-find from osmo-bsc to its own package + * abisip-find: Add option to bind to a specific source address + * abisip-find: Force stdout buffer flush + * abisip-find: Add --format-json option + * ipaccess-config: Enable logging all categories to print errors + * ipaccess-config: Add missing path with log error + * ipaccess-config: Improve handling of last parameter + * abisip-find: Improve use information output + * ipaccess-config: Check cmdlie arg unit-id format + * bsc_api.c: bsc_handle_lchan_signal: Remove unused variable + * bsc_subscr_conn_fsm.c: Fix wrong param list passed to LOGPFSML + * tests: handover_test.c: Add missing header + * pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference + * contrib: jenkins.sh: Add --enable-werror flag + * contrib: osmo-bsc.service: Update description + * contrib: osmo-bsc.service: Fix osmo-mgw.service dependency + * libbsc: nokia_site: Fix uninitialized return val + * bsc_vty: Fix uninitialized var false positive on gcc 7.3.1 + * paging: paging_request_bts: Fix wrong return value + * bssap: Log non handled paging requests + * libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc + * bsc_nat: ctrl: fix memleak on reply receival + * bsc_nat: forward_to_bsc: remove one level of indentation + * bsc_nat: forward_to_bsc: Fix memleak on send failure + * bsc_nat: Drop redundant ccon ptr in bsc_cmd_list + * bsc_nat: ctrl: Fix crash on receveing bsc reply + * use osmo_init_logging2 + * chan_alloc.c: Fix log var formatting issues + * abis_rsl.c: abis_rsl_rx_cchan: Print msg type name for unimplemented messages received + * abis_rsl.c: Clean ericsson specific imm assign code + * gsm_data_shared.h: Remove unused enum gsm_paging_event + + [ Stefan Sperling ] + * Fix "CTRL GET msc_connection_status" response. + * Support control connection status query for a particular MSC. + * Implement support for paging by LAI. + * Add TAGS files (produced by 'make tags') to .gitignore file. + * Implement support for CELL_IDENT_NO_CELL. + * Implement support for paging based on CI (cell identifier). + * Move BTS selection for paging from osmo_bsc_grace.c into osmo_bsc_bssap.c. + * Implement support for paging based on a Cell Global Identifier. + * Implement support for paging based on LAC and CI. + * Show the BTS number for outgoing paging commands in debug log. + * Split paging cases in bssmap_handle_paging() off into helper functions. + * Remove an unused variable. + * Improve an error message in page_lai_and_lac() + * Make "waiting indicator" of IMMEDIATE ASSIGN REJECT dynamic. + * Add stat items for the BTS's channel load average and T3122. + * Make RSL connection attempts time out. + * fix handover_test link error + * Add support for Access Control Class ramping. + * Generate the S_L_INP_TEI_UP signal earlier. + * use libosmocore to parse cell identifiers in osmo-bsc + * fix an error message in bssmap_handle_paging() + * change return type of page_subscriber() to void + * Generate the S_L_INP_TEI_UP signal earlier. + * fix a format string error in bts_update_t3122_chan_load() + * fix initialization of acc ramping + * only log actual access control class ramping changes + * ensure that acc_ramp_init() is only called once + * trigger acc ramping based on trx rf-locked state + * rename helper functions in the acc ramp code to avoid confusion + * trigger acc ramping on state-changed-event reports + * only trigger acc ramping if trx 0 is usable and unlocked + * fix handling of state changes in acc ramping + * properly skip paging is OML link is down + * extend documentation of paging_flush_bts() + * flush paging when RSL link is dropped + + [ Vadim Yanitskiy ] + * bsc/gsm_04_80.h: use '#pragma once' instead of includes + * bsc/gsm_04_80.h: clean up useless declarations + * libbsc/bsc_vty.c: prevent uninitialized access + * doc/examples: use NECI = 1 by default + + [ Ivan Kluchnikov ] + * handover_decision: Fix condition for power budget handover attempt + * handover_decision: log HO causes more accurately + + [ Andreas Eversberg ] + * HO: Send Channel Mode and Multirate IE along with handover command + * HO: Add function to count currently ongoing handovers to a given BTS + * Fix: If paging for half rate was requested, use hr, if supported by MS + * HO: Assign SDCCH on channel request + * Fix of checking TCH rate at chan_compat_with_mode + * HO: Count the actual meas.rep. get_meas_rep_avg fails if not reached + * HO: Count neighbor measurements and reduce window of neigh_meas_avg + * HO: Changed availablilty of ts_is_usable() from static to extern + * HO: Always update rqd_ta after receiving measurement report + * HO: If handover logic is used to do assignment, signal assignment result + * HO: Add handover decision debugging category + * Do not perform assignment, if the new channel equals the current one + * Allow assignment to TCH channel with signalling only mode + * Correctly set T3105 for ipaccess BTS type + * HO: fix: increase the number of measurement report history to 10 + * HO: Change debug category at handover decision: DHO -> DHODEC + * HO: Count number of free timeslot on a given BTS + * HO: add queue to cache DTAP messages during handover/assignment + * Fix: meas_rep.c will only use valid DL measurement reports + * HO: Add a penalty timer list to the subscriber connection entity + + [ Keith ] + * Cosmetic: Fix typo: Siganlling->Signalling + + -- Pau Espin Pedrol Thu, 03 May 2018 18:40:11 +0200 + osmo-bsc (1.1.2) unstable; urgency=medium * Debian: depend on libosmo-sigtran (bsc) and libosmo-sccp (bsc-nat) -- To view, visit https://gerrit.osmocom.org/8016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6ad5c769dd11c79b2bfd0d19f0feda8416e09cd Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:12:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:12:42 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-iuh=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E57-cf5f-dirty_=E2=86=92_0=2E3=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.2.0.57-cf5f-dirty ? 0.3.0 ...................................................................... Bump version: 0.2.0.57-cf5f-dirty ? 0.3.0 Change-Id: Id5d2f749bca46e8b81cc2934447707e3db80ea18 --- M configure.ac M debian/changelog M debian/control R debian/libosmo-ranap2.install M src/Makefile.am 5 files changed, 85 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 8a654dc..bb99dfb 100644 --- a/configure.ac +++ b/configure.ac @@ -33,13 +33,13 @@ fi PKG_PROG_PKG_CONFIG([0.20]) -PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.28) +PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(OSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(OSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(OSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(OSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(ASN1C, libasn1c >= 0.9.30) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index 0c11efb..1ec6437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,77 @@ +osmo-iuh (0.3.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * jenkins: use osmo-clean-workspace.sh before and after build + * vty: skip installing cmds now always installed by default + * src/Makefile.am: drop unused COMMON_LDADD + * add --enable-sanitize config option + * osmo-hnbgw: drop erratic log line on remote STP address + * api doc: clarify byte order in ranap_new_msg_rab_assign_* + * tests: sanitize: fix mem leaks, clean after tests + * ranap_msg_factory: sanitize: memcpy instead of unaligned int copy + * test_common: fix compiler warning: include ranap_common.h + * osmo-hnbgw: auto-config local and remote PCs if omitted + * cosmetic: osmo-hnbgw: log remote SCCP addresses on startup + * osmo-hnbgw: don't configure specific local IP address for STP connection + * iu client: store multiple LAC,RAC per RNC = fix paging for multiple RNC + * hnbgw: use proper VTY port number defined in libosmocore (4261) + * fix 3 compiler warnings in ranap_common.c + * hnbgw: use proper talloc ctx for vty telnet init + * hnbgw: hnb info: record MCC, MNC, show on 'show hnb' + * hnbap,rua,ranap decode: fix segfault on decode error + * vty: tweak / improve HNB and cnlink introspection + * osmo-hnbgw: vty: revamp output of context maps on 'show hnb' + * compiler warning: asn1tostruct.py: return 0 at end of *_free_*() + * segfault: context_map gc: use llist_for_each_entry_safe() + * rua: discard context maps on id-Disconnect + * rua_to_scu(): don't create a context map for UNITDATA + * cosmetic: context_map_tmr_cb(): fix comment + * osmo-hnbgw config: add 'rnc-id' config item + * osmo-hnbgw: startup: log the RNC-Id that is going to be used + * comments: hnbgw_rua.c: remove obsolete fixmes for asn1 free + * vty typo: 'show hnb': SCTP stream, not SCCP stream + * hnbgw_rua.c: log: fix integer format for cN_DomainIndicator + * hnbgw_rua: fix dereference of unset pointer + * hnbgw_cn: rx ranap: set rc in all cases + * hnbgw_hnbap: fix missing return in rx [un]successful outcome + * cosmetic: hnbgw: hnbap: log rx of unsuccessful outcome + * hnbap: log errors on decoding/encoding HNB-REGISTER msgs + * hnb-test: log accurate three-digit MNC with leading zeros + * configure: add --enable-werror + * cosmetic: use osmo_plmn_id instead of mcc,mnc + + [ Harald Welte ] + * osmo-hnbgw: Avoid useless linking to libosmogsm and libsctp + * Link libosmo-ranap against libosmovty + * Add "-Wall" to the compile rules of the non-asn1c-generated source code + * hnbgw.c: Remove dead code creating libsctp linker dependency + * sccp_sap_up(): Fix never-hit "default" case in switch + * Fix various compiler warnings in hnb-gw code + * hnbgw_vty.c: cosmetic: Fix non-tab-indented code + * hnbgw_vty.c: Fix "-Werror=format-security" failure in vty_out() + + [ Philipp Maier ] + * iu: iu_helpers: add functions to decode ip/port from rab-ass + * ranap_msg_factory: check IE encoder return codes + * ranap_msg_factory: remove unusued variable + + [ Max ] + * Use proper package version + * Add control interface + * Expand ctrl interface + * Enable sanitize for CI tests + + [ Pau Espin Pedrol ] + * iu_client.c: Remove unusued variable + * configure.ac: Enable -Wall flag + * contrib: jenkins.sh: Disable doxygen in libosmocore build + * debian/changelog: set prev releases to unstable + + [ Stefan Sperling ] + * ensure unique CellIDs in HNB-GW + + -- Pau Espin Pedrol Thu, 03 May 2018 18:29:13 +0200 + osmo-iuh (0.2.0) unstable; urgency=low * Upstream 0.2.0 release diff --git a/debian/control b/debian/control index 3330f55..b453eea 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Depends: osmo-hnbgw (= ${binary:Version}), ${misc:Depends} Description: osmocom Home Node B Gateway -Package: libosmo-ranap1 +Package: libosmo-ranap2 Section: libs Architecture: any Multi-Arch: same @@ -49,12 +49,12 @@ Section: debug Architecture: any Multi-Arch: same -Depends: libosmo-ranap1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) Package: libosmo-ranap-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libosmo-ranap1 (= ${binary:Version}), ${misc:Depends} +Depends: libosmo-ranap2 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) diff --git a/debian/libosmo-ranap1.install b/debian/libosmo-ranap2.install similarity index 100% rename from debian/libosmo-ranap1.install rename to debian/libosmo-ranap2.install diff --git a/src/Makefile.am b/src/Makefile.am index 2e57a8e..7802384 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,7 @@ # build the shared RANAP library # -RANAP_LIBVERSION=1:0:0 +RANAP_LIBVERSION=2:0:0 lib_LTLIBRARIES = libosmo-ranap.la libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ -- To view, visit https://gerrit.osmocom.org/8015 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5d2f749bca46e8b81cc2934447707e3db80ea18 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:12:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:12:42 +0000 Subject: [MERGED] osmo-iuh[master]: debian/changelog: set prev releases to unstable In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: debian/changelog: set prev releases to unstable ...................................................................... debian/changelog: set prev releases to unstable Otherwise it fools osmo-release.mk Change-Id: I6c05bb7f5bb2b3e78283a5eae6ccf95ce86838f8 --- M debian/changelog 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index e8fb68e..0c11efb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -osmo-iuh (0.2.0) UNRELEASED; urgency=low +osmo-iuh (0.2.0) unstable; urgency=low * Upstream 0.2.0 release -- Harald Welte Fri, 27 Oct 2017 22:19:00 +0000 -osmo-iuh (0.1.0) UNRELEASED; urgency=low +osmo-iuh (0.1.0) unstable; urgency=low * Initial release. -- To view, visit https://gerrit.osmocom.org/8014 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c05bb7f5bb2b3e78283a5eae6ccf95ce86838f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 3 May 2018 17:13:14 +0000 Subject: [PATCH] osmo-bsc[master]: bsc_api/GSCON: prevent unnecessary channel mode modifys Message-ID: Review at https://gerrit.osmocom.org/8019 bsc_api/GSCON: prevent unnecessary channel mode modifys gsm0808_assign_req() checks if the new channel mode is compatible with the new mode. If it is, it does a gsm48_lchan_modify(), but it does not actually check if the new mode is equal to the current mode. - skip when the channel is compatible and the new mode is equal to the old mode. - send the ASSIGNMENT COMPLETE directly from ST_ACTIVE when no mode modify was necessary. Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Related: OS#2936 --- M src/libbsc/bsc_api.c M src/libbsc/bsc_subscr_conn_fsm.c 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/8019/1 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 142efef..1c4dc6b 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -313,6 +313,11 @@ if (handle_new_assignment(conn, chan_mode, full_rate) != 0) goto error; } else { + /* Check if the channel is already in the requested mode, if + * yes, we skip unnecessary channel mode modify operations. */ + if (conn->lchan->tch_mode == chan_mode) + return 1; + if (chan_mode == GSM48_CMODE_SPEECH_AMR) handle_mr_config(conn, conn->lchan, full_rate); diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index b5e7e7d..7f53f1b 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -438,7 +438,11 @@ * change back to ST_ACTIVE (here) immediately. */ rc = gsm0808_assign_req(conn, conn->user_plane.chan_mode, conn->user_plane.full_rate); - if (rc != 0) { + + if (rc == 1) { + send_ass_compl(conn->lchan, fi, false); + return; + } else if (rc != 0) { resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); sigtran_send(conn, resp, fi); return; -- To view, visit https://gerrit.osmocom.org/8019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Thu May 3 17:19:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:19:50 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-msc=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E2=2E269-86f21-dirty_=E2=86=92_1=2E2=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 1.1.2.269-86f21-dirty ? 1.2.0 ...................................................................... Bump version: 1.1.2.269-86f21-dirty ? 1.2.0 Change-Id: I79d1f009617b247b6c3322a7926fd565913b1e6c --- M configure.ac M debian/changelog 2 files changed, 309 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 1dd79e8..deee84b 100644 --- a/configure.ac +++ b/configure.ac @@ -39,16 +39,16 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.1.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.8.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.1.0) -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) +PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( @@ -84,7 +84,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") @@ -94,8 +94,8 @@ AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.28) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.2.0) + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") diff --git a/debian/changelog b/debian/changelog index 708129d..f14c792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,299 @@ +osmo-msc (1.2.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * msc_vlr_tests: fix rebuild: rebuild when src/ libs were rebuilt + * cosmetic: vlr: rename auth_tuple_max_use_count to _reuse_ + * tests: add msc_vlr_test_authen_reuse + * vty: make auth tuple reuse configurable + * vty: drop deprecated 'logging level sms...' + * defaults: assign TMSI by default + * vty: skip installing cmds now always installed by default + * examples: apply mgcp_client vty rename from 'mgcpgw' to 'mgw' + * vlr: auth_fsm_start: check return value of fsm alloc + * add --enable-sanitize config option + * rate_ctr: don't use . as separator + * sub_pres_vlr_fsm_start: fix heap use after free + * vlr_gsupc_read_cb: fix use after free of GSUP msgb + * subscr_conn: don't close after conn timeout + * vlr_subscr_conn_timeout(): don't fire events to discarded fi + * cosmetic: msc_vlr_tests: add comment to show expected tallocs + * sms_queue_test: sanitize: clean up talloc contexts when done + * cosmetic: log: CC state transition: log trans id and subscr + * cosmetic: log: CC trans_alloc: log trans_id and subscr, not memory addrs + * cosmetic: debug log: mncc: detached subscr: show subscriber + * msc_vlr_tests: fix test nr arg: clear errno before strtol() + * msc_vlr_tests: set a valid lac for fake conns + * use only 0.23.1 as point code for both A and Iu + * subscr_conn: introduce usage tokens for ref error tracking + * cosmetic: log error when using a conn that's in release + * add msc_vlr_test_call to reproduce a sanitizer error + * fix use after free: missing conn_get on CC paging response + * sms db: don't attempt to query pending SMS for unset MSISDN + * sms db: properly quote MSISDN in various SQL queries + * sms.db: silence libdbi warnings on out-of-range index + * fix vty write: add missing 'authentication optional/required' output + * compiler warning: drop double 'const' in a_iface_tx_cipher_mode() + * debug log: a_iface_tx_cipher_mode(): log cipher and key + * cosmetic: msc_vlr_tests: log SMS details when invoked with -v + * vlr: debug log: log Ciphering Mode details + * fix BSSMAP Cipher Mode Cmd: properly set permitted algorithms + * cosmetic: move translation of vlr_ciph into msc_vlr_set_ciph_mode() + * cosmetic prep: publish vlr_use_umts_aka() decision + * cosmetic prep: tell vlr_ops.set_ciph_mode() whether UMTS AKA is used + * drop unused T* timers (BSC land, not MSC) + * cosmetic: msc_paging_request: drop obsolete comment + * fix GSM-Milenage in presence of 2G keys + * compiler warning: extend #if 0 to include unused array + * a_iface_bssap: compiler warning: cast const away from TLV val for l2h + * smpp_smsc: fix truncated string copy into bind_r.system_id + * log: a_iface.c: revisit logging, use LOGPCONN + * cosmetic: rename sccp_rx_udt and sccp_rx_dt to a_* + * fix paging: add timeout to discard unsuccessful paging + * fix: properly cancel all Paging on IMSI Detach + * a_iface_tx_assignment: fix log lvl for "Sending Assignment..." + * fix build: missing LIBOSMORANAP flags in libmsc + * drop unused libmsc/meas_feed.h + * cosmetic: gsm_network_init(): imply default 001-01 PLMN + * implement support for 3-digit MNC with leading zeros + * vlr: fix post-auth LU failure handling + * vlr_lu_fsm: guard against using the wrong fi + * msc_vlr_tests: revert IMSI parameter and test nr output + * msc_vlr_test_gsm_ciph: drop unused function + * msc_vlr_tests: make all test functions static + * msc_vlr_tests: improve cipher mode coverage + * fix: clear vlr_subscr->msc_conn_ref when the conn is discarded + * vty: drop unused commands + * vty: add 'msisdn' as alias for 'extension' + * vty: add 'subscriber ... paging' cmd + * msc_main: do not say 'osmo-nitb' in the usage + * silent call: clarify rc and error messages logged on vty + * msc_vlr_tests: clearly separate Ciph Mode from Security Mode checking + * msc_vlr_test_gsm_ciph: add test for GSM AKA in UMTS environment + * vlr: fix GSM AKA in a UMTS AKA capable environment + * vlr auth: gracefully reject malformed auth response + * gsm48_rx_mm_auth_resp(): pass is_r99 from classmark, not response size + * cosmetic: gsm48_rx_mm_auth_resp(): log 'UMTS AUTH', not 'R99 AUTH' + * msc_vlr_test_umts_authen: test response with too short RES + * msc_vlr_test_umts_authen: test response with too long RES + * msc_vlr_test_umts_authen: test response with only SRES half of RES + * cosmetic: vlr_auth_fsm: clarify decision on UMTS AKA or GSM AKA + * cosmetic: vlr_auth_fsm: log RAN and size along with SRES/RES + * msc_vlr_tests: add test_a5_3_not_supported + * configure: add --enable-werror + * vlr_ciph_result: fix use after free of imeisv + * trans_free: safeguard against a still running CC timer on free + * cosmetic: vlr_auth: log decision to send UMTS or GSM AKA challenge + * cosmetic: msc_vlr_tests: enable CC logging in debug + * cosmetic: rename conn_fsm "bump" event to "release_when_unused" + * msc_vlr_tests: add CC Release test and test to catch OS#2779 + * cosmetic: gsm_04_08.c: drop unused struct gsm_lai + * trans_free: tear down conn when last transaction is done + * dissolve libcommon,libcommon-cs: clean up vty definitions + * cosmetic: msc_vty.c: use static gsmnet instead of gsmnet_from_vty() + * dissolve libcommon: drop unused bsc_version.c + * dissolve libcommon: drop debug.c + * dissolve libcommon: move talloc ctx into msc_main.c, drop talloc_ctx.c + * dissolve libcommon: drop gsm_subscriber_base.c, move vlr_subscr_* to vlr.c + * dissolve libcommon: drop gsm_data.c, move code to libmsc + * rename libcommon to libgsupclient + * dissolve libcommon-cs: mv a_reset.c to libmsc + * dissolve libcommon-cs: move gsm_network_init() to libmsc + * dissolve libcommon-cs: move gsm48_* code to libmsc, drop sms_next_rp_msg_ref() + * remove empty libcommon-cs + * gsup_test_client: gsupc_read_cb: fix uninitialized value 'io' + * use osmo_init_logging2() with proper talloc ctx + * drop some dead definitions (gsm_data.h, gsup_client.c) + * test_reject_concurrency: missing assert + * cosmetic: rx_bssmap: read message type once into local var + * cosmetic: rename gsm_subscriber_connection->conn_fsm to ->fi + * cosmetic: rename subscr_conn_from to complete_layer3_type + * subscr_conn: store complete_layer3_type in conn, not FSM event arg + * unify allocation of gsm_subscriber_connection + * trans_free: drop bad assertion + * msc_vlr_test_call: reproduce OS#3062 + * CC: intentionally release T308 on BSSMAP Clear Request from BSC + * refactor subscr_conn and subscr_conn_fsm de-/alloc + * properly receive BSSMAP Clear Complete and Iu Release Complete + * fix BSC Clear Request + * cosmetic: embed compl_l3_type in FSM id + * refactor VLR FSM result handling + * msc conn ref counts: log human readable list of conn owners + * cosmetic: use enum ranap_nsap_addr_enc instead of int + + [ Harald Welte ] + * sms_route_mt_sms: Don't return uninitialized variable + * MNCC: Add input validation + * Log difference between SETUP and EMERGENCY_SETUP + * Emergency Call: Set MNCC_F_EMERGENCY flag + * Refuse Emergency Calls by IMEI with proper CM SERVICE REJECT Cause + (Closes: #2866) + * Reject any CM SERVICE we don't support + * Remove traces of meas_feed + * Fix msc_vlr test results (.err) for new libosmocore GSM48_PDISC names + * Properly reject CM Re-Establishment Request + * msc_cipher_mode_compl: Handle CIPH MOD COMPL without L3 message + * remove unused paging.h and osmo_bsc_grace.h + * debug: Remove code for filters that don't exist in OsmoMSC + * remove traces of bsc_subscriber + * jenkins.sh: Don't depend on osmo-ggsn + * Massive removal of unused code/structs/headers + * remove unused ipaccess.h + * remove dead code in auth.h / auth.c + * remove dead header files bsc_msc.h, bsc_msc_data.h and bsc_rll.h + * signal.h: Remove unused/dead signal definitions + * remove dead ctrl.h header file + * debug: Remove dead log categories + * Shift ciphering algorithm selection from VLR to MSC + * Permit a set of multiple different A5 ciphers + * MSC: Intersect configured A5 algorithms with MS-supported ones + * Change GSUP re-connect interval to 1s + * Implement checks for duplicate uplink UL L3 message (Closes: #2908) + * VTY: Add 'show connections' and 'show transactions' commands + * a_reset: Add additional "a_reset_alloc" argument + * Don't answer to BSC-originated RESET with another RESET + * cosmetic: Use msgb_hexdump*() rather than manual osmo_hexdump() on msg + * a_iface: Reduce log levels + * a_iface_bssap.c: Use LOGPCONN() whenever possible + * a_sccp_rx_dt(): Don't print hexdump of message multiple times + * cosmetic: a_iface: Harmonize log statements + * cosmetic: No need for 'break' after 'return' + * a_iface: centralize lookup of subscriber_conn + * cosmetic: a_iface: More logging harmonization + * a_iface: Add copyright statement (after recent contributions) + * Introduce new BSSAP logging category/subsystem + * a_iface: Fix heap-use-after-free by cleaning up msgb ownership + * Add VTY command to configure destination MSISDN for emergency calls + * a_iface: Fix heap-use-after-free in a_clear_all() + * MGCP: Response code 250 is *not* an error for DLCX + * a_iface: s/Abis/L3/ for speech version/preference fields + * a_iface: Consistent and understandable function names + * MT Calls: Copy bearer capabilities from NNCC primitive to trans + * MNCC: Copy bearer_cap from MNCC to gsm_trans + * gsm_data: remove unused gsm_subscriber_connection members + * remove bsc_api.h and all users - they're all dead code + * dead code removal + * remove unused dyn_ts_allow_tch_f VTY option + * osmo-msc: Add talloc context introspection via VTY + * remove unused VTY command "location updating reject cause" + * remove unused "authorized-regexp" VTY command + * remove unused "auth policy" VTY command + * remove dead code (gsm_parse_reg) + * BSSAP: Return error code if COMPL L3 with no or too short L3 payload + * a_iface_bssap: Treat inbound RESET as implicit RESET ACK + * a_iface: If L3/DTAP returns error in COMPL L3, close SCCP connection + * DTAP: Ensure proper DLCI is used in MSC-originated DTAP + * Permit any Sender MSISDN when sending SMS from VTY + * smpp: Unset esme->acl on socket close + * sms_queue: fix use-after-free on 'pending' + + [ Alexander Couzens ] + * debian/rules: remove doublicated project name in example files + * libmsc/vty: don't access old bsc rate counters + + [ Philipp Maier ] + * reset: remove name variable from reset context + * cosmetic: move log message to else branch + * cosmetic: add missing spaces + * cosmetic: remove duplicate logging + * mncc: re-add lchan members to structs + * mncc: remove deprecated commandline option. + * a_iface: correct data type for a.conn_id in gsm_subscriber_connection + * mgcp: use osmo-mgw to switch rtp streams + * increase RAN timeout in MGCP FSM + * a_reset: Add FSM event names + * msc_mgcp: Add FSM event names + * a_iface: fix BSSMAP reset handling + * msc_mgcp: fix mgw timeout handling + * mgcp: be sure that pending mgcp transactions are canceled before free + * msc_mgcp: use more conceise error msg on truncation + * mcgp: let the MGW allocate the MGCP endpoint + * cosmetic: remove disabled (debug) code gsm_04_08.c + * msc_mgcp: to not access higher layers after release + * cosmetic: remove unused variable + * msc_mgcp.c: log endpoint name instead of pointer + * msc_mgcp: do not send wildcarded DLCX messages + + [ Max ] + * Use osmo-ggsn instead of openggsn in jenkins tests + * Add basic CTRL test + * Remove obsolete ./configure option + * Remove unneeded .py scripts + * Enable sanitize for CI tests + * Migrate from OpenSSL to osmo_get_rand_id() + * VLR: remove unused parameter + * VLR: log subscriber update + * Add control command to expire subscriber + * VLR: constify GSUP-related function parameters + * cosmetic: log prim operation as text + * Remove unused code + * Wrap osmo_strlcpy() calls + * Fix whitespace issues + * Constify msc_subscr_conn_is_accepted() parameter + * Move IMSI into test parameters + * VLR tests: mark static test functions as such + * Expand VLR tests + * VLR tests: don't fail via assert + * VLR tests: remove weird code + * VLR tests: always print test parameters + * VLR tests: move network init into function + * GSUP: check osmo_gsup_encode() result + * VLR: fix potential NULL dereference + + [ Alexander Huemer ] + * Add missing CFLAGS + * Remove utils imported from openbsc, fix building remaining util smpp_mirror + + [ Pau Espin Pedrol ] + * libmsc: db.c: Replace dbi APIs marked as deprecated + * libmsc: msc_vty: Fix compilation warning + * libmsc: bssap: Fix typo in log message + * libmsc: bssap: Refactor rx paths to to avoid parse_tlv code duplication + * libmsc: bssap: Catch TLV parse failures + * libmsc: bssap: Remove fixme and properly update msgb tail + * msc_mgcp.c: Fix several wrong ptr printf fmt + * contrib: osmo-msc.service: Depend on osmo-mgw.service + * smpp_smsc_conf: Fix heap-use-after-free + * Remove unused GSM_PAGING_OOM + * setup_trig_pag_evt: Remove uneeded default case in switch statement + * setup_trig_pag_evt: Always log correct paging failure case + * setup_trig_pag_evt: Fix heap-use-after-free + + [ the 34c3 gsm team ] + * smpp_smsc.c: don't talloc_strdup NULL pointers + + [ Vadim Yanitskiy ] + * msc/gsm_04_80.h: clean up useless declarations + * msc/gsm_04_80.h: cosmetic: whitespace fix + * msc/gsm_04_80.h: use '#pragma once' instead of includes + * src/libmsc/ussd.c: drop useless forward declaration + * ussd.h: cosmetic: remove useless comment + * ussd.h: cosmetic: use '#pragma once' include guard + * libmsc/gsm_04_80.c: drop unused 'in_msg' argument + * libmsc/ussd.c: cosmetic: correct log level and message + * libmsc/ussd: don't overwrite rc if decoding failed + * tests/msc_vlr: fix expected SS message names + + [ Stefan Sperling ] + * Improve an error message in db_init(). + * Delete SMS from the database once they were sent successfully + * Store/retrieve SMS validity time in the SMS datebase + * Fix value of stored SMS validity time. + * Add a VTY command which deletes all expired SMS. + * Accept SMS for any receiver + * Delete expired SMS automatically. + * Make sending an SMS to an unknown subscriber B work over SMPP. + * enable osmo_fsm vty commands in osmo-msc vty + * Track libosmocore API change in osmo-msc. + * restore sending of optional MM info messages + * use libosmocom to parse cell identifier in bssmap_rx_l3_compl() + + [ Daniel Willmann ] + * iucs: Add a function to return the connection ID for the IU SCCP conn + * libmsc: Add a function to return a unique ID of the subscriber conn + * libmsc: Pretend MNCC requested release in handle_error() + + -- Pau Espin Pedrol Thu, 03 May 2018 18:52:03 +0200 + osmo-msc (1.1.2) unstable; urgency=medium * Depend on both libosmo-sigtran-dev and libosmo-sccp-dev -- To view, visit https://gerrit.osmocom.org/8017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79d1f009617b247b6c3322a7926fd565913b1e6c Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:21:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 3 May 2018 17:21:04 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero Message-ID: Review at https://gerrit.osmocom.org/8020 make PCU tests send PS paging requests on BVCI zero osmo-pcu discards PAGING-PS messages unless received on the signalling BVCI 0. The BVCI value must be set to zero both in the NS header and the BSSGP header. Create new ports between the PCU_Test components which the TC_paging test case can use to ensure that both layers send frames with BVCI value of zero. This does not make PCU_Tests.tc_paging work yet, however the PS paging request is now processed by osmo-pcu rather than discarded. Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Related: OS#2404 --- M library/BSSGP_Emulation.ttcn M library/NS_Emulation.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/8020/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c7766dc..fcebf04 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -99,8 +99,9 @@ } type component BSSGP_CT { - /* UDP port towards the bottom (IUT) */ + /* UDP ports towards the bottom (IUT) */ port NS_PT BSCP; + port NS_PT BSCP_SIG; /* NS-User SAP towards the user */ port BSSGP_SP_PT BSSGP_SP; port BSSGP_PROC_PT BSSGP_PROC; @@ -534,6 +535,10 @@ } } + [] BSSGP_SP.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { + BSCP_SIG.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); + } + /* pass virtually any PDU from user to NS-UNITDATA PDU on network */ [] BSSGP_SP.receive(PDU_BSSGP:?) -> value bs_pdu sender vc_conn { BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 27acae2..47dc526 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -92,6 +92,7 @@ port NS_CODEC_PT NSCP; /* NS-User SAP towards the user */ port NS_SP_PT NS_SP; + port NS_SP_PT NS_SP_SIG; var NseState g_state := NSE_S_DEAD_BLOCKED; var ConnectionId g_conn_id := -1; @@ -264,6 +265,9 @@ var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp); NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc))); } + [] NS_SP_SIG.receive(t_NsUdReq(mp_nsei, ?, ?, omit)) -> value ud_req { + NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, 0, ud_req.sdu))); + } } } diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 12b63d6..54cb9da 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -63,6 +63,7 @@ connect(self:BSSGP_PROC, bssgp_component:BSSGP_PROC); /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); + connect(bssgp_component:BSCP_SIG, ns_component:NS_SP_SIG); /* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */ map(ns_component:NSCP, system:NS_CODEC_PORT); ns_component.start(NSStart()); @@ -200,8 +201,9 @@ g_mmctx.tlli := f_random_tlli(); f_init(); - BSSGP.send(ts_BSSGP_PS_PAGING_IMSI(mp_gb_cfg.bvci, g_mmctx.imsi)); - BSSGP.send(ts_BSSGP_PS_PAGING_PTMSI(mp_gb_cfg.bvci, g_mmctx.imsi, tmsi)); + /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ + BSSGP.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + BSSGP.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); while (true) { var BssgpDecoded bd; -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Thu May 3 17:21:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:21:39 +0000 Subject: =?UTF-8?Q?osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E58-85ca87-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8018 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I466089b40fed02153e2850cb4a748ee6568b130b Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 3 17:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 3 May 2018 17:21:56 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-sgsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E58-85ca87-dirty_=E2=86=92_1=2E3=2E0?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 1.2.0.58-85ca87-dirty ? 1.3.0 ...................................................................... Bump version: 1.2.0.58-85ca87-dirty ? 1.3.0 Change-Id: I466089b40fed02153e2850cb4a748ee6568b130b --- M configure.ac M debian/changelog 2 files changed, 83 insertions(+), 11 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 1b23d27..2b5bb1a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,28 +39,28 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? - PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version? - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version? + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") AC_SUBST(osmo_ac_iu) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.2.0) PKG_CHECK_MODULES(LIBCARES, libcares) dnl checks for header files diff --git a/debian/changelog b/debian/changelog index 0b56541..b39abb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +osmo-sgsn (1.3.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * drop osmo_sgsn.cfg from src/gprs dir + * change default config filename to osmo-sgsn.cfg, not osmo_sgsn.cfg + * vty: skip installing cmds now always installed by default + * add --enable-sanitize config option + * use default point-code as listed on Point_Codes wiki page + * gprs_gmm: segfault: gracefully handle failure to alloc context + * gsm48_rx_gmm_att_req: fix error handling: don't clean up NULL llme + * gprs_llc: tx dl ud: make mismatching LLE not crash osmo-sgsn + * fix build: missing LIBGTP_CFLAGS in sgsn_test + * sgsn_test: guard against struct gprs_ra_id changing + * vty: absorb command explanations from osmo-gsm-manuals + * configure: add --enable-werror + * implement support for 3-digit MNC with leading zeros + * osmo-gbproxy: use 'osmo-gbproxy.cfg' as default config name + * compiler warnings: use enum ranap_nsap_addr_enc, constify local var + * use osmo_init_logging2(), fix regression test memleaks + * auth+ciph: log is_r99 and auth types + * log two RA Update Request failure causes + * GERAN: allow GSM SRES on UMTS AKA challenge + + [ Alexander Couzens ] + * .gitignore: remove unneeded ignores of bsc/msc/nitb files + * tests/ctrl_test_runner.py: remove BSC/NAT TestRunner + * debian: remove doublicated project name in example files + * .gitignore: remove non-existent /src/utils exludes + * configure.ac: remove pcap check + * configure.ac: remove unused libcdk check + * .service: remove OpenBSC from service desription + * mandatory depend on libc-ares and libgtp + * GMM: dont reply to GMM_DETACH_REQ with POWER OFF when MS is unknown + + [ Harald Welte ] + * Replace '.' in counter names with ':' + * Add talloc context introspection via VTY + + [ Pau Espin Pedrol ] + * Replace '.' in counter names with ':' + * tests: Fix selection of python version + * sgsn_cdr: Split log formatting into a snprintf function + * Add vty cmd 'cdr trap' to send CDR through CTRL iface + * tests: sgsn_test: Define wrap APIs with correct parameters + * cosmetic: tests: sgsn_test: Use proper formatting and remove uneeded semicolons + * gprs_gmm: Remove unused variable + * cosmetic: gprs_gmm: Remove trailing whitespace + * gprs_gmm: Convert warning message to pragma message + * configure.ac: Enable Wall in CFLAGS + * .gitignore: Add m4 files + * sgsn_libgtp.c: Fix typos and whitespace + + [ Max ] + * Fix display of GTP addresses + * Show GTP version for PDP context in vty + * Remove unneeded .py scripts + * Replace '.' in counter names with ':' + * Remove dead code + * Enable sanitize for CI tests + * cosmetic: use macro for gtphub plane iteration + * Use connection id when allocating rate counters + * Migrate from OpenSSL to osmo_get_rand_id() + * Remove obsolete ./configure option + * Fix RAI construction + * gtphub: make rate_ctr unique + * Remove unused bsc_version.c + * Use gsm48_encode_ra() for RAI encoding + * gtphub: check for gsn_addr_from_sockaddr() errors + * gtphub: check for gsn_addr_from_sockaddr() error + + -- Pau Espin Pedrol Thu, 03 May 2018 19:01:44 +0200 + osmo-sgsn (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8018 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I466089b40fed02153e2850cb4a748ee6568b130b Gerrit-PatchSet: 1 Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Thu May 3 17:25:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:25:16 +0000 Subject: osmo-bsc[master]: bsc_api/GSCON: prevent unnecessary channel mode modifys In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/8019/1/src/libbsc/bsc_api.c File src/libbsc/bsc_api.c: Line 305: * TODO: Add multirate configuration, make it work for more than audio. might make sense to document the return values here, as we're using a slightly unusual notation of both 0 and 1 being succes with different meaning. -- To view, visit https://gerrit.osmocom.org/8019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Thu May 3 17:26:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 3 May 2018 17:26:43 +0000 Subject: osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/7992/1/src/gsup_server.c File src/gsup_server.c: Line 372: msisdn_enc = talloc_size(gsup, OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN); simply OSMO_ASSERT on the talloc result, in all calls (both the one for gsup above, as well as the others here... https://gerrit.osmocom.org/#/c/7992/1/src/luop.c File src/luop.c: Line 53: if (msg_out == NULL) { same here. OSMO_ASSERT(msg_out) is sufficient. -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From admin at opensuse.org Thu May 3 20:18:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:18:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5aeb6eb9b069d_5df111a6688119052@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 94s] #define STDC_HEADERS 1 [ 94s] #define HAVE_SYS_TYPES_H 1 [ 94s] #define HAVE_SYS_STAT_H 1 [ 94s] #define HAVE_STDLIB_H 1 [ 94s] #define HAVE_STRING_H 1 [ 94s] #define HAVE_MEMORY_H 1 [ 94s] #define HAVE_STRINGS_H 1 [ 94s] #define HAVE_INTTYPES_H 1 [ 94s] #define HAVE_STDINT_H 1 [ 94s] #define HAVE_UNISTD_H 1 [ 94s] #define HAVE_DLFCN_H 1 [ 94s] #define LT_OBJDIR ".libs/" [ 94s] #define PACKAGE "osmo-iuh" [ 94s] #define VERSION "0.3.0.20180503" [ 94s] [ 94s] configure: exit 1 [ 94s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 94s] debian/rules:9: recipe for target 'build' failed [ 94s] make: *** [build] Error 2 [ 94s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 94s] [ 94s] lamb01 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:18:47 UTC 2018. [ 94s] [ 94s] ### VM INTERACTION START ### [ 97s] [ 88.807092] reboot: Power down [ 97s] ### VM INTERACTION END ### [ 97s] [ 97s] lamb01 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:18:50 UTC 2018. [ 97s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:19:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:19:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5aeb6ed4d8f35_5df111a66881191c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.10/i586 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 109s] #define STDC_HEADERS 1 [ 109s] #define HAVE_SYS_TYPES_H 1 [ 109s] #define HAVE_SYS_STAT_H 1 [ 109s] #define HAVE_STDLIB_H 1 [ 109s] #define HAVE_STRING_H 1 [ 109s] #define HAVE_MEMORY_H 1 [ 109s] #define HAVE_STRINGS_H 1 [ 109s] #define HAVE_INTTYPES_H 1 [ 109s] #define HAVE_STDINT_H 1 [ 109s] #define HAVE_UNISTD_H 1 [ 109s] #define HAVE_DLFCN_H 1 [ 109s] #define LT_OBJDIR ".libs/" [ 109s] #define PACKAGE "osmo-iuh" [ 109s] #define VERSION "0.3.0.20180503" [ 109s] [ 109s] configure: exit 1 [ 109s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 109s] debian/rules:9: recipe for target 'build' failed [ 109s] make: *** [build] Error 2 [ 109s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 109s] [ 109s] lamb13 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:19:03 UTC 2018. [ 109s] [ 109s] ### VM INTERACTION START ### [ 112s] [ 104.553498] reboot: Power down [ 112s] ### VM INTERACTION END ### [ 112s] [ 112s] lamb13 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:19:06 UTC 2018. [ 112s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:20:04 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:20:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5aeb6f118f2c8_5df111a66881194c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_17.04/i586 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 149s] #define STDC_HEADERS 1 [ 149s] #define HAVE_SYS_TYPES_H 1 [ 149s] #define HAVE_SYS_STAT_H 1 [ 149s] #define HAVE_STDLIB_H 1 [ 149s] #define HAVE_STRING_H 1 [ 149s] #define HAVE_MEMORY_H 1 [ 149s] #define HAVE_STRINGS_H 1 [ 149s] #define HAVE_INTTYPES_H 1 [ 149s] #define HAVE_STDINT_H 1 [ 149s] #define HAVE_UNISTD_H 1 [ 149s] #define HAVE_DLFCN_H 1 [ 149s] #define LT_OBJDIR ".libs/" [ 149s] #define PACKAGE "osmo-iuh" [ 149s] #define VERSION "0.3.0.20180503" [ 149s] [ 149s] configure: exit 1 [ 149s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 149s] debian/rules:9: recipe for target 'build' failed [ 149s] make: *** [build] Error 2 [ 149s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 149s] [ 149s] lamb58 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:19:48 UTC 2018. [ 149s] [ 149s] ### VM INTERACTION START ### [ 151s] [ 142.151210] reboot: Power down [ 151s] ### VM INTERACTION END ### [ 151s] [ 151s] lamb58 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:19:51 UTC 2018. [ 151s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:20:38 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:20:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5aeb6f2d99088_5df111a6688119571@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 170s] #define STDC_HEADERS 1 [ 170s] #define HAVE_SYS_TYPES_H 1 [ 170s] #define HAVE_SYS_STAT_H 1 [ 170s] #define HAVE_STDLIB_H 1 [ 170s] #define HAVE_STRING_H 1 [ 170s] #define HAVE_MEMORY_H 1 [ 170s] #define HAVE_STRINGS_H 1 [ 170s] #define HAVE_INTTYPES_H 1 [ 170s] #define HAVE_STDINT_H 1 [ 170s] #define HAVE_UNISTD_H 1 [ 170s] #define HAVE_DLFCN_H 1 [ 170s] #define LT_OBJDIR ".libs/" [ 170s] #define PACKAGE "osmo-iuh" [ 170s] #define VERSION "0.3.0.20180503" [ 170s] [ 170s] configure: exit 1 [ 170s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 170s] debian/rules:9: recipe for target 'build' failed [ 170s] make: *** [build] Error 255 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] lamb69 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:20:20 UTC 2018. [ 170s] [ 170s] ### VM INTERACTION START ### [ 174s] [ 163.311365] reboot: Power down [ 174s] ### VM INTERACTION END ### [ 174s] [ 174s] lamb69 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:20:24 UTC 2018. [ 174s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:25:30 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:25:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5aeb70408a762_5df111a6688120767@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/i586 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 207s] #define HAVE_SYS_TYPES_H 1 [ 207s] #define HAVE_SYS_STAT_H 1 [ 207s] #define HAVE_STDLIB_H 1 [ 207s] #define HAVE_STRING_H 1 [ 207s] #define HAVE_MEMORY_H 1 [ 207s] #define HAVE_STRINGS_H 1 [ 207s] #define HAVE_INTTYPES_H 1 [ 207s] #define HAVE_STDINT_H 1 [ 207s] #define HAVE_UNISTD_H 1 [ 207s] #define HAVE_DLFCN_H 1 [ 207s] #define LT_OBJDIR ".libs/" [ 207s] #define PACKAGE "osmo-iuh" [ 207s] #define VERSION "0.3.0.20180503" [ 207s] [ 207s] configure: exit 1 [ 207s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 207s] debian/rules:9: recipe for target 'build' failed [ 207s] make: *** [build] Error 255 [ 207s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 207s] [ 207s] lamb52 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:25:25 UTC 2018. [ 207s] [ 207s] ### VM INTERACTION START ### [ 208s] Powering off. [ 208s] [ 194.187684] reboot: Power down [ 208s] ### VM INTERACTION END ### [ 208s] [ 208s] lamb52 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:25:26 UTC 2018. [ 208s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:28:21 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:28:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5aeb70f0d116c_5df111a66881212bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 136s] #define STDC_HEADERS 1 [ 136s] #define HAVE_SYS_TYPES_H 1 [ 136s] #define HAVE_SYS_STAT_H 1 [ 136s] #define HAVE_STDLIB_H 1 [ 136s] #define HAVE_STRING_H 1 [ 136s] #define HAVE_MEMORY_H 1 [ 136s] #define HAVE_STRINGS_H 1 [ 136s] #define HAVE_INTTYPES_H 1 [ 136s] #define HAVE_STDINT_H 1 [ 136s] #define HAVE_UNISTD_H 1 [ 136s] #define HAVE_DLFCN_H 1 [ 136s] #define LT_OBJDIR ".libs/" [ 136s] #define PACKAGE "osmo-iuh" [ 136s] #define VERSION "0.3.0.20180503" [ 136s] [ 136s] configure: exit 1 [ 136s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 136s] debian/rules:9: recipe for target 'build' failed [ 136s] make: *** [build] Error 255 [ 136s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 136s] [ 136s] wildcard3 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:28:07 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 136s] [ 113.613814] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] wildcard3 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:28:14 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:28:38 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:28:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5aeb7110ccb2e_5df111a6688121379@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_16.10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 184s] #define STDC_HEADERS 1 [ 184s] #define HAVE_SYS_TYPES_H 1 [ 184s] #define HAVE_SYS_STAT_H 1 [ 184s] #define HAVE_STDLIB_H 1 [ 184s] #define HAVE_STRING_H 1 [ 184s] #define HAVE_MEMORY_H 1 [ 184s] #define HAVE_STRINGS_H 1 [ 184s] #define HAVE_INTTYPES_H 1 [ 184s] #define HAVE_STDINT_H 1 [ 184s] #define HAVE_UNISTD_H 1 [ 184s] #define HAVE_DLFCN_H 1 [ 184s] #define LT_OBJDIR ".libs/" [ 184s] #define PACKAGE "osmo-iuh" [ 184s] #define VERSION "0.3.0.20180503" [ 184s] [ 184s] configure: exit 1 [ 184s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 184s] debian/rules:9: recipe for target 'build' failed [ 184s] make: *** [build] Error 2 [ 184s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 184s] [ 184s] lamb51 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:28:33 UTC 2018. [ 184s] [ 184s] ### VM INTERACTION START ### [ 187s] [ 178.888963] reboot: Power down [ 187s] ### VM INTERACTION END ### [ 187s] [ 187s] lamb51 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:28:37 UTC 2018. [ 187s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:30:21 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:30:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5aeb716a25b92_5df111a66881217ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 428s] configure:11149: checking whether to build shared libraries [ 428s] configure:11174: result: yes [ 428s] configure:11177: checking whether to build static libraries [ 428s] configure:11181: result: yes [ 428s] configure:11235: checking for a BSD-compatible install [ 428s] configure:11303: result: /usr/bin/install -c [ 428s] configure:11314: checking whether build environment is sane [ 428s] configure:11369: result: yes [ 428s] configure:11517: checking for a thread-safe mkdir -p [ 428s] configure:11556: result: /bin/mkdir -p [ 428s] configure:11559: checking whether make sets $(MAKE) [ 428s] configure:11581: result: yes [ 428s] configure:11611: checking for style of include used by make [ 428s] configure:11639: result: GNU [ 428s] configure:11673: checking whether make supports nested variables [ 428s] configure:11690: result: yes [ 428s] configure:11779: checking whether UID '399' is supported by ustar format [ 428s] configure:11782: result: yes [ 428s] configure:11789: checking whether GID '399' is supported by ustar format [ 428s] configure:11792: result: yes [ 428s] configure:11800: checking how to create a ustar tar archive [ 428s] configure:11811: tar --version [ 428s] tar (GNU tar) 1.29 [ 430s] Copyri[ 371.101536] sysrq: SysRq : Power Off [ 430s] [ 371.105701] reboot: Power down [ 431s] ### VM INTERACTION END ### [ 431s] [ 431s] obs-arm-1 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:30:17 UTC 2018. [ 431s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:32:55 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:32:55 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5aeb720412f90_5df111a6688122154@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 168s] #define HAVE_STRING_H 1 [ 168s] #define HAVE_MEMORY_H 1 [ 168s] #define HAVE_STRINGS_H 1 [ 168s] #define HAVE_INTTYPES_H 1 [ 168s] #define HAVE_STDINT_H 1 [ 168s] #define HAVE_UNISTD_H 1 [ 168s] #define HAVE_DLFCN_H 1 [ 168s] #define LT_OBJDIR ".libs/" [ 168s] #define PACKAGE "osmo-iuh" [ 168s] #define VERSION "0.3.0.20180503" [ 168s] [ 168s] configure: exit 1 [ 168s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 168s] debian/rules:9: recipe for target 'build' failed [ 168s] make: *** [build] Error 2 [ 168s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 168s] [ 142.200054] serial8250: too much work for irq4 [ 168s] [ 142.324031] serial8250: too much work for irq4 [ 168s] [ 142.440071] serial8250: too much work for irq4 [ 168s] [ 142.556062] serial8250: too much work for irq4 [ 168s] [ 168s] cloud119 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:32:43 UTC 2018. [ 168s] [ 168s] ### VM INTERACTION START ### [ 172s] [ 145.842995] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] cloud119 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:32:49 UTC 2018. [ 173s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:33:48 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:33:48 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5aeb723ba4195_5df111a6688122483@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 132s] dh_installman [ 132s] dh_installinit [ 132s] dh_perl [ 132s] dh_link [ 133s] dh_strip_nondeterminism [ 133s] dh_compress [ 133s] dh_fixperms [ 133s] dh_missing [ 133s] debian/rules override_dh_strip [ 133s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 133s] dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg [ 134s] dh_strip -plibgtp2 --dbg-package=libgtp-dbg [ 134s] dh_strip: Requested unknown package libgtp2 via -p/--package, expected one of: osmo-ggsn libgtp3 libgtp-dev osmo-ggsn-dbg libgtp-dbg [ 134s] dh_strip: unknown option or error during option parsing; aborting [ 134s] debian/rules:18: recipe for target 'override_dh_strip' failed [ 134s] make[1]: *** [override_dh_strip] Error 25 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:15: recipe for target 'binary' failed [ 134s] make: *** [binary] Error 2 [ 134s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 134s] [ 134s] lamb57 failed "build osmo-ggsn_1.2.0.20180503.dsc" at Thu May 3 20:33:41 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 137s] [ 128.048951] reboot: Power down [ 137s] ### VM INTERACTION END ### [ 137s] [ 137s] lamb57 failed "build osmo-ggsn_1.2.0.20180503.dsc" at Thu May 3 20:33:45 UTC 2018. [ 137s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:34:22 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:34:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5aeb725c2927f_5df111a6688122538@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 149s] #define HAVE_SYS_STAT_H 1 [ 149s] #define HAVE_STDLIB_H 1 [ 149s] #define HAVE_STRING_H 1 [ 149s] #define HAVE_MEMORY_H 1 [ 149s] #define HAVE_STRINGS_H 1 [ 149s] #define HAVE_INTTYPES_H 1 [ 149s] #define HAVE_STDINT_H 1 [ 149s] #define HAVE_UNISTD_H 1 [ 149s] #define HAVE_DLFCN_H 1 [ 149s] #define LT_OBJDIR ".libs/" [ 149s] #define PACKAGE "osmo-iuh" [ 149s] #define VERSION "0.3.0.20180503" [ 149s] [ 149s] configure: exit 1 [ 149s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/et[ 129.120048] serial8250: too much work for irq4 [ 149s] c --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 149s] debian/rules:9: recipe for target 'build' failed [ 149s] make: *** [build] Error 255 [ 149s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 149s] [ 149s] cloud125 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:34:01 UTC 2018. [ 149s] [ 149s] ### VM INTERACTION START ### [ 151s] Powering off. [ 151s] [ 130.277204] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] cloud125 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:34:05 UTC 2018. [ 153s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:35:13 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:35:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5aeb7293255e4_5df111a66881226c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_17.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 205s] #define STDC_HEADERS 1 [ 205s] #define HAVE_SYS_TYPES_H 1 [ 205s] #define HAVE_SYS_STAT_H 1 [ 205s] #define HAVE_STDLIB_H 1 [ 205s] #define HAVE_STRING_H 1 [ 205s] #define HAVE_MEMORY_H 1 [ 205s] #define HAVE_STRINGS_H 1 [ 205s] #define HAVE_INTTYPES_H 1 [ 205s] #define HAVE_STDINT_H 1 [ 205s] #define HAVE_UNISTD_H 1 [ 205s] #define HAVE_DLFCN_H 1 [ 205s] #define LT_OBJDIR ".libs/" [ 205s] #define PACKAGE "osmo-iuh" [ 205s] #define VERSION "0.3.0.20180503" [ 205s] [ 205s] configure: exit 1 [ 205s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 205s] debian/rules:9: recipe for target 'build' failed [ 205s] make: *** [build] Error 2 [ 205s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 205s] [ 205s] lamb52 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:34:55 UTC 2018. [ 205s] [ 205s] ### VM INTERACTION START ### [ 208s] [ 190.094742] reboot: Power down [ 208s] ### VM INTERACTION END ### [ 208s] [ 208s] lamb52 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:34:59 UTC 2018. [ 208s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:37:30 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:37:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5aeb730d8d966_5df111a6688122931@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 116s] #define STDC_HEADERS 1 [ 116s] #define HAVE_SYS_TYPES_H 1 [ 116s] #define HAVE_SYS_STAT_H 1 [ 116s] #define HAVE_STDLIB_H 1 [ 116s] #define HAVE_STRING_H 1 [ 116s] #define HAVE_MEMORY_H 1 [ 116s] #define HAVE_STRINGS_H 1 [ 116s] #define HAVE_INTTYPES_H 1 [ 116s] #define HAVE_STDINT_H 1 [ 116s] #define HAVE_UNISTD_H 1 [ 116s] #define HAVE_DLFCN_H 1 [ 116s] #define LT_OBJDIR ".libs/" [ 116s] #define PACKAGE "osmo-iuh" [ 116s] #define VERSION "0.3.0.20180503" [ 116s] [ 116s] configure: exit 1 [ 116s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 116s] debian/rules:9: recipe for target 'build' failed [ 116s] make: *** [build] Error 2 [ 116s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 116s] [ 116s] lamb24 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:37:16 UTC 2018. [ 116s] [ 116s] ### VM INTERACTION START ### [ 119s] [ 111.680517] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] lamb24 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:37:20 UTC 2018. [ 119s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:40:21 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:40:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5aeb73c340c36_5df111a668812358e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 126s] #define STDC_HEADERS 1 [ 126s] #define HAVE_SYS_TYPES_H 1 [ 126s] #define HAVE_SYS_STAT_H 1 [ 126s] #define HAVE_STDLIB_H 1 [ 126s] #define HAVE_STRING_H 1 [ 126s] #define HAVE_MEMORY_H 1 [ 126s] #define HAVE_STRINGS_H 1 [ 126s] #define HAVE_INTTYPES_H 1 [ 126s] #define HAVE_STDINT_H 1 [ 126s] #define HAVE_UNISTD_H 1 [ 126s] #define HAVE_DLFCN_H 1 [ 126s] #define LT_OBJDIR ".libs/" [ 126s] #define PACKAGE "osmo-iuh" [ 126s] #define VERSION "0.3.0.20180503" [ 126s] [ 126s] configure: exit 1 [ 126s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 126s] debian/rules:9: recipe for target 'build' failed [ 126s] make: *** [build] Error 2 [ 126s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 126s] [ 126s] lamb57 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:40:04 UTC 2018. [ 126s] [ 126s] ### VM INTERACTION START ### [ 129s] [ 120.387579] reboot: Power down [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] lamb57 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:40:08 UTC 2018. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 3 20:48:24 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 03 May 2018 20:48:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5aeb75a18c742_5df111a66881246d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 305s] #define HAVE_SYS_TYPES_H 1 [ 305s] #define HAVE_SYS_STAT_H 1 [ 305s] #define HAVE_STDLIB_H 1 [ 305s] #define HAVE_STRING_H 1 [ 305s] #define HAVE_MEMORY_H 1 [ 305s] #define HAVE_STRINGS_H 1 [ 305s] #define HAVE_INTTYPES_H 1 [ 305s] #define HAVE_STDINT_H 1 [ 305s] #define HAVE_UNISTD_H 1 [ 305s] #define HAVE_DLFCN_H 1 [ 305s] #define LT_OBJDIR ".libs/" [ 305s] #define PACKAGE "osmo-iuh" [ 305s] #define VERSION "0.3.0.20180503" [ 305s] [ 305s] configure: exit 1 [ 305s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 305s] debian/rules:9: recipe for target 'build' failed [ 305s] make: *** [build] Error 2 [ 305s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 305s] [ 305s] armbuild22 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:48:07 UTC 2018. [ 305s] [ 305s] ### VM INTERACTION START ### [ 308s] [ 293.744575] SysRq : Power Off [ 308s] [ 293.771276] reboot: Power down [ 309s] ### VM INTERACTION END ### [ 309s] [ 309s] armbuild22 failed "build osmo-iuh_0.3.0.20180503.dsc" at Thu May 3 20:48:11 UTC 2018. [ 309s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu May 3 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 3 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#23?= In-Reply-To: <1220530372.319.1525300880577.JavaMail.jenkins@jenkins.osmocom.org> References: <1220530372.319.1525300880577.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1898314473.345.1525387280627.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-3335/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-3335/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-3335/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-3335/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-3335/ libtool: install: (cd /tmp/am-dc-3335/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-3335/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-3335/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-3335/ libtool: install: chmod 644 /tmp/am-dc-3335/ libtool: install: ranlib /tmp/am-dc-3335/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-3335/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-3335/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-3335/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-3335/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-3335/ /bin/mkdir -p '/tmp/am-dc-3335/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-3335/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-3335/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-3335/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-3335/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-3335/ libtool: uninstall: rm -f /tmp/am-dc-3335/ /tmp/am-dc-3335/ /tmp/am-dc-3335/ /tmp/am-dc-3335/ /tmp/am-dc-3335/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-3335/ && rm -f html.tar ) ( cd '/tmp/am-dc-3335/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-3335/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Fri May 4 00:25:50 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:25:50 +0000 Subject: [PATCH] libasn1c[master]: debian: set VERSION to fix version in .pc files Message-ID: Review at https://gerrit.osmocom.org/8021 debian: set VERSION to fix version in .pc files The pkgconf file contains an unknown version which result in failure of other packages which depend on a minimum version (osmo-iuh) Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea --- M debian/rules 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/21/8021/1 diff --git a/debian/rules b/debian/rules index 267bea9..a1039b0 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,10 @@ # Vendor-related variables such as DEB_VENDOR: #include /usr/share/dpkg/vendor.mk # Package-related variables such as DEB_DISTRIBUTION -#include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/pkg-info.mk + +VERSION := $(shell echo '$(DEB_VERSION)' | sed -e 's/[+-].*//' -e 's/~//g') + # # You may alternatively set them susing a simple script such as: # DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) @@ -44,6 +47,10 @@ %: dh $@ --with autoreconf +override_dh_autoreconf: + echo $(VERSION) > .tarball-version + dh_autoreconf + # debmake generated override targets # Set options for ./configure #CONFIGURE_FLAGS = -- To view, visit https://gerrit.osmocom.org/8021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:29:40 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:29:40 +0000 Subject: osmo-ci[master]: jobs: Osmocom_latest_packages: change node to obs In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7971 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:29:42 +0000 Subject: osmo-ci[master]: jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7972 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:29:44 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:29:44 +0000 Subject: osmo-ci[master]: jobs: osmocom-obs: introduce template var type In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7973 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I315215eb1d5ade257262d0717711c11f3787319f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:29:45 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:29:45 +0000 Subject: osmo-ci[master]: jobs: osmocom-obs: add support for the nightly build In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7974 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:29:48 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:29:48 +0000 Subject: osmo-ci[master]: jobs: remove old job Osmocom_nightly_nitb_split In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7975 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:32 +0000 Subject: [MERGED] osmo-ci[master]: jobs: remove old job Osmocom_nightly_nitb_split In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: jobs: remove old job Osmocom_nightly_nitb_split ...................................................................... jobs: remove old job Osmocom_nightly_nitb_split It's not any more used, neither does the job even work, because the split file got already removed. Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec --- D jobs/osmocom-nightly-nitb-split.yml 1 file changed, 0 insertions(+), 24 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/jobs/osmocom-nightly-nitb-split.yml b/jobs/osmocom-nightly-nitb-split.yml deleted file mode 100644 index 4c64de4..0000000 --- a/jobs/osmocom-nightly-nitb-split.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- project: - name: Osmocom_nightly_nitb_split - jobs: - - Osmocom_nightly_nitb_split - -- job: - name: 'Osmocom_nightly_nitb_split' - project-type: freestyle - defaults: global - description: 'Generated by job-builder' - node: linux_amd64_debian8 - builders: - - shell: - ./scripts/osmocom-nightly-nitb-split.sh - scm: - - git: - url: git://git.osmocom.org/osmo-ci - git-config-name: 'Jenkins Builder' - git-config-email: 'jenkins at osmocom.org' - triggers: - - timed: "@midnight" - -# vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/7975 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e85d6384f2a377f1ebe0e06c9ca92a594050eec Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:32 +0000 Subject: [MERGED] osmo-ci[master]: jobs: osmocom-obs: add support for the nightly build In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: jobs: osmocom-obs: add support for the nightly build ...................................................................... jobs: osmocom-obs: add support for the nightly build Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 --- M jobs/osmocom-obs.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index 6bbf8da..9b9f989 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -4,6 +4,7 @@ jobs: - Osmocom_OBS_{type} type: + - nightly - latest - job-template: -- To view, visit https://gerrit.osmocom.org/7974 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59929b4025210e1143e4d09bcfc59f91c81f0d20 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:33 +0000 Subject: [MERGED] osmo-ci[master]: jobs: osmocom-obs: introduce template var type In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: jobs: osmocom-obs: introduce template var type ...................................................................... jobs: osmocom-obs: introduce template var type In preparation for the nightly jobs Change-Id: I315215eb1d5ade257262d0717711c11f3787319f --- M jobs/osmocom-obs.yml 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index e6e63f9..6bbf8da 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -1,18 +1,20 @@ --- - project: - name: Osmocom_OBS_latest + name: Osmocom_OBS jobs: - - Osmocom_OBS_latest + - Osmocom_OBS_{type} + type: + - latest -- job: - name: 'Osmocom_OBS_latest' +- job-template: + name: 'Osmocom_OBS_{type}' project-type: freestyle defaults: global description: 'Generated by job-builder' node: obs builders: - shell: - ./scripts/osmocom-latest-packages.sh + ./scripts/osmocom-{type}-packages.sh scm: - git: url: git://git.osmocom.org/osmo-ci -- To view, visit https://gerrit.osmocom.org/7973 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I315215eb1d5ade257262d0717711c11f3787319f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:33 +0000 Subject: [MERGED] osmo-ci[master]: jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml ...................................................................... jobs: rename osmocom-obs-latest.yml -> osmocom-obs.yml Prepare to template nightly and latest in one file Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 --- R jobs/osmocom-obs.yml 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/jobs/osmocom-obs-latest.yml b/jobs/osmocom-obs.yml similarity index 100% rename from jobs/osmocom-obs-latest.yml rename to jobs/osmocom-obs.yml -- To view, visit https://gerrit.osmocom.org/7972 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If080cca2ab51a7aab9c85da9f07c51179134f8c6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:33 +0000 Subject: [MERGED] osmo-ci[master]: jobs: Osmocom_latest_packages: change node to obs In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: jobs: Osmocom_latest_packages: change node to obs ...................................................................... jobs: Osmocom_latest_packages: change node to obs obs node label have the credentials to access OBS Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 --- M jobs/osmocom-obs-latest.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/jobs/osmocom-obs-latest.yml b/jobs/osmocom-obs-latest.yml index def633f..e6e63f9 100644 --- a/jobs/osmocom-obs-latest.yml +++ b/jobs/osmocom-obs-latest.yml @@ -9,7 +9,7 @@ project-type: freestyle defaults: global description: 'Generated by job-builder' - node: linux_amd64_debian8 + node: obs builders: - shell: ./scripts/osmocom-latest-packages.sh -- To view, visit https://gerrit.osmocom.org/7971 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifaaa8a9cb2ddddf399e108b2516017a8d60d1d88 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Fri May 4 00:30:56 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:30:56 +0000 Subject: osmo-ci[master]: osmocom-nightly-packages: replace version string with by git... In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/7976 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 00:31:08 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 4 May 2018 00:31:08 +0000 Subject: [MERGED] osmo-ci[master]: osmocom-nightly-packages: replace version string with by git... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change and it was merged. Change subject: osmocom-nightly-packages: replace version string with by git-version-gen ...................................................................... osmocom-nightly-packages: replace version string with by git-version-gen E.g. old version 0.10.2.20180501 (0.10.2 last deb version, 20180501 was the date) The new version will look like 0.10.2.279.178b - 0.10.2 is the last tag - .279 is 279 commits since the tag - 178b is the actual short git rev The direct output of ./git-version-gen couldn't be used because debian forbids using a minus (-) in upstream versions. Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 --- M scripts/osmocom-nightly-packages.sh 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: lynxis lazus: Verified Harald Welte: Looks good to me, approved diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index c9eb2e0..a200f36 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -37,6 +37,25 @@ osc co "$PROJ" } +get_commit_version() { + # return a version based on the commit + local version + local date + + # git version + version=$(test -x ./git-version-gen && ./git-version-gen . 2>/dev/null) + # debian doesn't allow '-' in version. + version=$(echo "$version" | sed 's/-/./g' ) + + # deb version + if [ -z "$version" ] ; then + version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') + version="$version.$DT" + fi + + echo -n "$version" +} + build() { local name=$1 local changelog=$2 @@ -62,9 +81,9 @@ cd "$repodir" if [ "$changelog" = "commit" ] ; then - VER=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,') - dch -v "$VER.$DT" -m "Snapshot build" - git commit -m "$DT snapshot" debian/ + VER=$(get_commit_version) + dch -b -v "$VER" -m "Snapshot build" + git commit -m "$VER snapshot" debian/ fi mkdir -p "$DATA/$name" -- To view, visit https://gerrit.osmocom.org/7976 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2da90ada90adf8ef8f8cfee3d26f86fbd3cec181 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From admin at opensuse.org Fri May 4 01:08:42 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:08:42 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5aebb2afad607_5df111a6688168823@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_9.0/armv7l Package network:osmocom:latest/libosmo-abis failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 99s] #define VERSION "0.5.0" [ 99s] #define STDC_HEADERS 1 [ 99s] #define HAVE_SYS_TYPES_H 1 [ 99s] #define HAVE_SYS_STAT_H 1 [ 99s] #define HAVE_STDLIB_H 1 [ 99s] #define HAVE_STRING_H 1 [ 99s] #define HAVE_MEMORY_H 1 [ 99s] #define HAVE_STRINGS_H 1 [ 99s] #define HAVE_INTTYPES_H 1 [ 99s] #define HAVE_STDINT_H 1 [ 99s] #define HAVE_UNISTD_H 1 [ 99s] #define HAVE_DLFCN_H 1 [ 99s] #define LT_OBJDIR ".libs/" [ 99s] [ 99s] configure: exit 1 [ 99s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 99s] debian/rules:12: recipe for target 'build' failed [ 99s] make: *** [build] Error 2 [ 99s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 99s] [ 99s] armbuild21 failed "build libosmo-abis_0.5.0.dsc" at Fri May 4 01:08:38 UTC 2018. [ 99s] [ 99s] ### VM INTERACTION START ### [ 102s] [ 90.234584] SysRq : Power Off [ 102s] [ 90.235753] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] armbuild21 failed "build libosmo-abis_0.5.0.dsc" at Fri May 4 01:08:41 UTC 2018. [ 102s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:10:08 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:10:08 +0000 Subject: Build failure of network:osmocom:latest/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5aebb30bc2e0b_5df111a6688168973@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:latest/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-abis Last lines of build log: [ 234s] configure:12325: $? = 1 [ 234s] configure:12339: result: no [ 234s] Requested 'libosmocore >= 0.11.0' but version of Osmocom Core Library is 0.10.2 [ 234s] configure:12355: error: Package requirements (libosmocore >= 0.11.0) were not met: [ 234s] [ 234s] Requested 'libosmocore >= 0.11.0' but version of Osmocom Core Library is 0.10.2 [ 234s] [ 234s] Consider adjusting the PKG_CONFIG_PATH environment variable if you [ 234s] installed software in a non-standard prefix. [ 234s] [ 234s] Alternatively, you may set the environment variables LIBOSMOCORE_CFLAGS [ 234s] and LIBOSMOCORE_LIBS to avoid the need to call pkg-config. [ 234s] See the pkg-config man page for more details. [ 234s] [ 234s] ## ---------------- ## [ 234s] ## Cache variables. ## [ 234s] ## ---------------- ## [ 234s] [ 234s] ac_cv_build=aarch64-unknown-linux-gnu [ 234s] ac_cv_c_compiler_gnu=yes [ 234s] ac_cv_env_CC_set= [ 234s] ac_cv_env_CC_value= [ 234s] ac_cv_env_CFLAGS_set=set [ 236s] ac_cv_env_CFLAGS_value='-g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -W[ 197.164066] sysrq: SysRq : Power Off [ 236s] [ 197.180556] reboot: Power down [ 236s] ### VM INTERACTION END ### [ 236s] [ 237s] obs-arm-4 failed "build libosmo-abis_0.5.0.dsc" at Fri May 4 01:09:57 UTC 2018. [ 237s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:11:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:11:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5aebb3464c0f5_5df111a6688169178@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 223s] dh_installman [ 223s] dh_installinit [ 223s] dh_perl [ 223s] dh_link [ 223s] dh_strip_nondeterminism [ 224s] dh_compress [ 224s] dh_fixperms [ 224s] dh_missing [ 224s] debian/rules override_dh_strip [ 224s] make[1]: Entering directory '/usr/src/packages/BUILD' [ 224s] dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg [ 224s] dh_strip -plibgtp2 --dbg-package=libgtp-dbg [ 224s] dh_strip: Requested unknown package libgtp2 via -p/--package, expected one of: osmo-ggsn libgtp3 libgtp-dev osmo-ggsn-dbg libgtp-dbg [ 224s] dh_strip: unknown option or error during option parsing; aborting [ 224s] debian/rules:18: recipe for target 'override_dh_strip' failed [ 224s] make[1]: *** [override_dh_strip] Error 25 [ 224s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 224s] debian/rules:15: recipe for target 'binary' failed [ 224s] make: *** [binary] Error 2 [ 224s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 224s] [ 224s] cloud130 failed "build osmo-ggsn_1.2.0.dsc" at Fri May 4 01:11:10 UTC 2018. [ 224s] [ 224s] ### VM INTERACTION START ### [ 227s] [ 186.080905] reboot: Power down [ 228s] ### VM INTERACTION END ### [ 228s] [ 228s] cloud130 failed "build osmo-ggsn_1.2.0.dsc" at Fri May 4 01:11:14 UTC 2018. [ 228s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:18:42 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:18:42 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5aebb5088a29f_5df111a668816992b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_9.0/i586 Package network:osmocom:latest/osmo-iuh failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 140s] #define STDC_HEADERS 1 [ 140s] #define HAVE_SYS_TYPES_H 1 [ 140s] #define HAVE_SYS_STAT_H 1 [ 140s] #define HAVE_STDLIB_H 1 [ 140s] #define HAVE_STRING_H 1 [ 140s] #define HAVE_MEMORY_H 1 [ 140s] #define HAVE_STRINGS_H 1 [ 140s] #define HAVE_INTTYPES_H 1 [ 140s] #define HAVE_STDINT_H 1 [ 140s] #define HAVE_UNISTD_H 1 [ 140s] #define HAVE_DLFCN_H 1 [ 140s] #define LT_OBJDIR ".libs/" [ 140s] #define PACKAGE "osmo-iuh" [ 140s] #define VERSION "0.3.0" [ 140s] [ 140s] configure: exit 1 [ 140s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 140s] debian/rules:9: recipe for target 'build' failed [ 140s] make: *** [build] Error 2 [ 140s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 140s] [ 140s] wildcard2 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:18:22 UTC 2018. [ 140s] [ 140s] ### VM INTERACTION START ### [ 140s] [ 122.684317] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 148s] [ 148s] wildcard2 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:18:36 UTC 2018. [ 148s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:21:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:21:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5aebb59eeb727_5df111a6688170475@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_16.10/i586 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 104s] #define STDC_HEADERS 1 [ 104s] #define HAVE_SYS_TYPES_H 1 [ 104s] #define HAVE_SYS_STAT_H 1 [ 104s] #define HAVE_STDLIB_H 1 [ 104s] #define HAVE_STRING_H 1 [ 104s] #define HAVE_MEMORY_H 1 [ 104s] #define HAVE_STRINGS_H 1 [ 104s] #define HAVE_INTTYPES_H 1 [ 104s] #define HAVE_STDINT_H 1 [ 104s] #define HAVE_UNISTD_H 1 [ 104s] #define HAVE_DLFCN_H 1 [ 104s] #define LT_OBJDIR ".libs/" [ 104s] #define PACKAGE "osmo-iuh" [ 104s] #define VERSION "0.3.0" [ 104s] [ 104s] configure: exit 1 [ 104s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 104s] debian/rules:9: recipe for target 'build' failed [ 104s] make: *** [build] Error 2 [ 104s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 104s] [ 104s] lamb13 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:06 UTC 2018. [ 104s] [ 104s] ### VM INTERACTION START ### [ 107s] [ 100.657953] reboot: Power down [ 107s] ### VM INTERACTION END ### [ 107s] [ 107s] lamb13 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:11 UTC 2018. [ 107s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:21:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:21:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5aebb59f9fdf1_5df111a668817058c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_17.04/i586 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 105s] #define STDC_HEADERS 1 [ 105s] #define HAVE_SYS_TYPES_H 1 [ 105s] #define HAVE_SYS_STAT_H 1 [ 105s] #define HAVE_STDLIB_H 1 [ 105s] #define HAVE_STRING_H 1 [ 105s] #define HAVE_MEMORY_H 1 [ 105s] #define HAVE_STRINGS_H 1 [ 105s] #define HAVE_INTTYPES_H 1 [ 105s] #define HAVE_STDINT_H 1 [ 105s] #define HAVE_UNISTD_H 1 [ 105s] #define HAVE_DLFCN_H 1 [ 105s] #define LT_OBJDIR ".libs/" [ 105s] #define PACKAGE "osmo-iuh" [ 105s] #define VERSION "0.3.0" [ 105s] [ 105s] configure: exit 1 [ 105s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 105s] debian/rules:9: recipe for target 'build' failed [ 105s] make: *** [build] Error 2 [ 105s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 105s] [ 105s] lamb09 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:12 UTC 2018. [ 105s] [ 105s] ### VM INTERACTION START ### [ 108s] [ 99.674917] reboot: Power down [ 108s] ### VM INTERACTION END ### [ 108s] [ 108s] lamb09 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:15 UTC 2018. [ 108s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:21:34 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:21:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5aebb5bca9cd7_5df111a66881707ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_8.0/i586 Package network:osmocom:latest/osmo-iuh failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 176s] #define HAVE_SYS_STAT_H 1 [ 176s] #define HAVE_STDLIB_H 1 [ 176s] #define HAVE_STRING_H 1 [ 176s] #define HAVE_MEMORY_H 1 [ 176s] #define HAVE_STRINGS_H 1 [ 176s] #define HAVE_INTTYPES_H 1 [ 176s] #define HAVE_STDINT_H 1 [ 176s] #define HAVE_UNISTD_H 1 [ 176s] #define HAVE_DLFCN_H 1 [ 176s] #define LT_OBJDIR ".libs/" [ 176s] #define PACKAGE "osmo-iuh" [ 176s] #define VERSION "0.3.0" [ 176s] [ 176s] configure: exit 1 [ 176s] dh_auto_configure: ./configure --build=i586-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 176s] debian/rules:9: recipe for target 'build' failed [ 176s] make: *** [build] Error 255 [ 176s] dpkg-buildpackage: error: debi[ 163.108151] serial8250: too much work for irq4 [ 176s] an/rules build gave error exit status 2 [ 176s] [ 176s] wildcard3 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:27 UTC 2018. [ 176s] [ 176s] ### VM INTERACTION START ### [ 177s] Powering off. [ 177s] [ 164.239730] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] wildcard3 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:21:28 UTC 2018. [ 177s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:23:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:23:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5aebb619328cd_5df111a66881710e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_16.04/i586 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 193s] #define STDC_HEADERS 1 [ 193s] #define HAVE_SYS_TYPES_H 1 [ 193s] #define HAVE_SYS_STAT_H 1 [ 193s] #define HAVE_STDLIB_H 1 [ 193s] #define HAVE_STRING_H 1 [ 193s] #define HAVE_MEMORY_H 1 [ 193s] #define HAVE_STRINGS_H 1 [ 193s] #define HAVE_INTTYPES_H 1 [ 193s] #define HAVE_STDINT_H 1 [ 193s] #define HAVE_UNISTD_H 1 [ 193s] #define HAVE_DLFCN_H 1 [ 193s] #define LT_OBJDIR ".libs/" [ 193s] #define PACKAGE "osmo-iuh" [ 193s] #define VERSION "0.3.0" [ 193s] [ 193s] configure: exit 1 [ 193s] dh_auto_configure: ./configure --build=i686-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/i386-linux-gnu --libexecdir=${prefix}/lib/i386-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 193s] debian/rules:9: recipe for target 'build' failed [ 193s] make: *** [build] Error 255 [ 193s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 193s] [ 193s] cloud130 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:23:10 UTC 2018. [ 193s] [ 193s] ### VM INTERACTION START ### [ 196s] [ 151.698585] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 198s] [ 198s] cloud130 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:23:15 UTC 2018. [ 198s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:23:34 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:23:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5aebb63642658_5df111a66881711fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_9.0/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 127s] #define STDC_HEADERS 1 [ 127s] #define HAVE_SYS_TYPES_H 1 [ 127s] #define HAVE_SYS_STAT_H 1 [ 127s] #define HAVE_STDLIB_H 1 [ 127s] #define HAVE_STRING_H 1 [ 127s] #define HAVE_MEMORY_H 1 [ 127s] #define HAVE_STRINGS_H 1 [ 127s] #define HAVE_INTTYPES_H 1 [ 127s] #define HAVE_STDINT_H 1 [ 127s] #define HAVE_UNISTD_H 1 [ 127s] #define HAVE_DLFCN_H 1 [ 127s] #define LT_OBJDIR ".libs/" [ 127s] #define PACKAGE "osmo-iuh" [ 127s] #define VERSION "0.3.0" [ 127s] [ 127s] configure: exit 1 [ 127s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 127s] debian/rules:9: recipe for target 'build' failed [ 127s] make: *** [build] Error 2 [ 127s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 127s] [ 127s] lamb14 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:23:15 UTC 2018. [ 127s] [ 127s] ### VM INTERACTION START ### [ 130s] [ 122.248793] reboot: Power down [ 130s] ### VM INTERACTION END ### [ 130s] [ 130s] lamb14 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:23:19 UTC 2018. [ 130s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:25:00 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:25:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5aebb670e8c24_5df111a66881712a8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_17.04/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 70s] #define STDC_HEADERS 1 [ 70s] #define HAVE_SYS_TYPES_H 1 [ 70s] #define HAVE_SYS_STAT_H 1 [ 70s] #define HAVE_STDLIB_H 1 [ 70s] #define HAVE_STRING_H 1 [ 70s] #define HAVE_MEMORY_H 1 [ 70s] #define HAVE_STRINGS_H 1 [ 70s] #define HAVE_INTTYPES_H 1 [ 70s] #define HAVE_STDINT_H 1 [ 70s] #define HAVE_UNISTD_H 1 [ 70s] #define HAVE_DLFCN_H 1 [ 70s] #define LT_OBJDIR ".libs/" [ 70s] #define PACKAGE "osmo-iuh" [ 70s] #define VERSION "0.3.0" [ 70s] [ 70s] configure: exit 1 [ 70s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 70s] debian/rules:9: recipe for target 'build' failed [ 70s] make: *** [build] Error 2 [ 70s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 70s] [ 70s] build76 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:24:42 UTC 2018. [ 70s] [ 70s] ### VM INTERACTION START ### [ 73s] [ 67.404640] reboot: Power down [ 73s] ### VM INTERACTION END ### [ 73s] [ 73s] build76 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:24:46 UTC 2018. [ 73s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:25:51 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:25:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5aebb6af3a6db_5df111a668817134f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_8.0/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 175s] #define HAVE_SYS_TYPES_H 1 [ 175s] #define HAVE_SYS_STAT_H 1 [ 175s] #define HAVE_STDLIB_H 1 [ 175s] #define HAVE_STRING_H 1 [ 175s] #define HAVE_MEMORY_H 1 [ 175s] #define HAVE_STRINGS_H 1 [ 175s] #define HAVE_INTTYPES_H 1 [ 175s] #define HAVE_STDINT_H 1 [ 175s] #define HAVE_UNISTD_H 1 [ 175s] #define HAVE_DLFCN_H 1 [ 175s] #define LT_OBJDIR ".libs/" [ 175s] #define PACKAGE "osmo-iuh" [ 175s] #define VERSION "0.3.0" [ 175s] [ 175s] configure: exit 1 [ 175s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 175s] debian/rules:9: recipe for target 'build' failed [ 175s] make: *** [build] Error 255 [ 175s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 175s] [ 175s] lamb26 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:25:40 UTC 2018. [ 175s] [ 175s] ### VM INTERACTION START ### [ 176s] Powering off. [ 176s] [ 159.078268] reboot: Power down [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] lamb26 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:25:41 UTC 2018. [ 176s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:27:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:27:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5aebb705af3da_5df111a6688171593@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_17.10/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 128s] #define STDC_HEADERS 1 [ 128s] #define HAVE_SYS_TYPES_H 1 [ 128s] #define HAVE_SYS_STAT_H 1 [ 128s] #define HAVE_STDLIB_H 1 [ 128s] #define HAVE_STRING_H 1 [ 128s] #define HAVE_MEMORY_H 1 [ 128s] #define HAVE_STRINGS_H 1 [ 128s] #define HAVE_INTTYPES_H 1 [ 128s] #define HAVE_STDINT_H 1 [ 128s] #define HAVE_UNISTD_H 1 [ 128s] #define HAVE_DLFCN_H 1 [ 128s] #define LT_OBJDIR ".libs/" [ 128s] #define PACKAGE "osmo-iuh" [ 128s] #define VERSION "0.3.0" [ 128s] [ 128s] configure: exit 1 [ 128s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 128s] debian/rules:9: recipe for target 'build' failed [ 128s] make: *** [build] Error 2 [ 128s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 128s] [ 128s] lamb21 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:26:56 UTC 2018. [ 128s] [ 128s] ### VM INTERACTION START ### [ 131s] [ 119.603684] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] lamb21 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:27:00 UTC 2018. [ 131s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:27:17 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:27:17 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5aebb7061c592_5df111a668817161a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_18.04/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 133s] #define STDC_HEADERS 1 [ 133s] #define HAVE_SYS_TYPES_H 1 [ 133s] #define HAVE_SYS_STAT_H 1 [ 133s] #define HAVE_STDLIB_H 1 [ 133s] #define HAVE_STRING_H 1 [ 133s] #define HAVE_MEMORY_H 1 [ 133s] #define HAVE_STRINGS_H 1 [ 133s] #define HAVE_INTTYPES_H 1 [ 133s] #define HAVE_STDINT_H 1 [ 133s] #define HAVE_UNISTD_H 1 [ 133s] #define HAVE_DLFCN_H 1 [ 133s] #define LT_OBJDIR ".libs/" [ 133s] #define PACKAGE "osmo-iuh" [ 133s] #define VERSION "0.3.0" [ 133s] [ 133s] configure: exit 1 [ 133s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 133s] debian/rules:9: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 133s] [ 133s] lamb26 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:27:02 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 126.170310] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] lamb26 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:27:06 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:27:51 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:27:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5aebb72335b6_5df111a66881717de@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_16.10/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 195s] #define STDC_HEADERS 1 [ 195s] #define HAVE_SYS_TYPES_H 1 [ 195s] #define HAVE_SYS_STAT_H 1 [ 195s] #define HAVE_STDLIB_H 1 [ 195s] #define HAVE_STRING_H 1 [ 195s] #define HAVE_MEMORY_H 1 [ 195s] #define HAVE_STRINGS_H 1 [ 195s] #define HAVE_INTTYPES_H 1 [ 195s] #define HAVE_STDINT_H 1 [ 195s] #define HAVE_UNISTD_H 1 [ 195s] #define HAVE_DLFCN_H 1 [ 195s] #define LT_OBJDIR ".libs/" [ 195s] #define PACKAGE "osmo-iuh" [ 195s] #define VERSION "0.3.0" [ 195s] [ 195s] configure: exit 1 [ 195s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 195s] debian/rules:9: recipe for target 'build' failed [ 195s] make: *** [build] Error 2 [ 195s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 195s] [ 195s] lamb27 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:27:35 UTC 2018. [ 195s] [ 195s] ### VM INTERACTION START ### [ 197s] [ 189.108683] reboot: Power down [ 197s] ### VM INTERACTION END ### [ 197s] [ 197s] lamb27 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:27:39 UTC 2018. [ 197s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:31:51 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:31:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5aebb814c819e_5df111a66881724ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/xUbuntu_16.04/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 209s] #define STDC_HEADERS 1 [ 209s] #define HAVE_SYS_TYPES_H 1 [ 209s] #define HAVE_SYS_STAT_H 1 [ 209s] #define HAVE_STDLIB_H 1 [ 209s] #define HAVE_STRING_H 1 [ 209s] #define HAVE_MEMORY_H 1 [ 209s] #define HAVE_STRINGS_H 1 [ 209s] #define HAVE_INTTYPES_H 1 [ 209s] #define HAVE_STDINT_H 1 [ 209s] #define HAVE_UNISTD_H 1 [ 209s] #define HAVE_DLFCN_H 1 [ 209s] #define LT_OBJDIR ".libs/" [ 209s] #define PACKAGE "osmo-iuh" [ 209s] #define VERSION "0.3.0" [ 209s] [ 209s] configure: exit 1 [ 209s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 209s] debian/rules:9: recipe for target 'build' failed [ 209s] make: *** [build] Error 255 [ 209s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 209s] [ 209s] lamb55 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:31:42 UTC 2018. [ 209s] [ 209s] ### VM INTERACTION START ### [ 211s] [ 201.562478] reboot: Power down [ 211s] ### VM INTERACTION END ### [ 211s] [ 211s] lamb55 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:31:46 UTC 2018. [ 211s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:38:43 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:38:43 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5aebb9b7460e5_5df111a668817296e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/i586 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 254s] [ 254s] Makefile:736: recipe for target 'check-local' failed [ 254s] make[5]: *** [check-local] Error 1 [ 254s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 254s] Makefile:586: recipe for target 'check-am' failed [ 254s] make[4]: *** [check-am] Error 2 [ 254s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 254s] Makefile:438: recipe for target 'check-recursive' failed [ 254s] make[3]: *** [check-recursive] Error 1 [ 254s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 254s] Makefile:520: recipe for target 'check-recursive' failed [ 254s] make[2]: *** [check-recursive] Error 1 [ 254s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 254s] Makefile:811: recipe for target 'check' failed [ 254s] make[1]: *** [check] Error 2 [ 254s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 254s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 254s] debian/rules:13: recipe for target 'build' failed [ 254s] make: *** [build] Error 2 [ 254s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 254s] [ 254s] lamb59 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:38:37 UTC 2018. [ 254s] [ 254s] ### VM INTERACTION START ### [ 257s] [ 235.094199] reboot: Power down [ 257s] ### VM INTERACTION END ### [ 257s] [ 257s] lamb59 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:38:40 UTC 2018. [ 257s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:43:51 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:43:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5aebbae6dcf25_5df111a66881735b9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 243s] configure:12504: checking whether gcc accepts -g [ 243s] configure:12565: result: yes [ 243s] configure:12582: checking for gcc option to accept ISO C89 [ 243s] configure:12658: result: none needed [ 243s] configure:12683: checking whether gcc understands -c and -o together [ 243s] configure:12720: result: yes [ 243s] configure:12741: checking for pkg-config [ 243s] configure:12759: found /usr/bin/pkg-config [ 243s] configure:12772: result: /usr/bin/pkg-config [ 243s] configure:12838: checking for pkg-config [ 243s] configure:12856: found /usr/bin/pkg-config [ 243s] configure:12868: result: /usr/bin/pkg-config [ 243s] configure:12893: checking pkg-config is at least version 0.20 [ 243s] configure:12896: result: yes [ 243s] configure:12907: checking for OSMOCORE [ 243s] configure:12914: $PKG_CONFIG --exists --print-errors "libosmocore >= 0.11.0" [ 243s] configure:12917: $? = 0 [ 243s] configure:12931: $PKG_CONFIG --exists --print-errors "libosmocore >= 0.11.0" [ 243s] configure:12934: $? = 0 [ 243s] configure:12992: result: yes [ 243s] configure:12998: checking for OSMOGSM [ 243s] configure:13005: $PKG_CONFIG --exists --print-errors "libosmogsm >= 0.11.0" [ 243s] configure:13008: $? = 0 [ 245s] config[ 210.179340] sysrq: SysRq : Power Off [ 245s] [ 210.184194] reboot: Power down [ 245s] ### VM INTERACTION END ### [ 245s] [ 245s] obs-arm-4 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:43:41 UTC 2018. [ 245s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:47:34 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:47:34 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5aebbbd2ac289_5df111a6688173915@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/aarch64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 421s] Makefile:736: recipe for target 'check-local' failed [ 421s] make[5]: *** [check-local] Error 1 [ 421s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 421s] Makefile:586: recipe for target 'check-am' failed [ 421s] make[4]: *** [check-am] Error 2 [ 421s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 421s] Makefile:438: recipe for target 'check-recursive' failed [ 421s] make[3]: *** [check-recursive] Error 1 [ 421s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 421s] Makefile:520: recipe for target 'check-recursive' failed [ 421s] make[2]: *** [check-recursive] Error 1 [ 421s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 421s] Makefile:811: recipe for target 'check' failed [ 421s] make[1]: *** [check] Error 2 [ 421s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 422s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 422s] debian/rules:13: recipe for target 'build' failed [ 422s] make: *** [build] Error 2 [ 422s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 422s] [ 422s] obs-arm-1 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:47:14 UTC 2018. [ 422s] [ 422s] ### VM INTERACTION START ### [ 425s] [ 392.252455] sysrq: SysRq : Power Off [ 425s] [ 392.268235] reboot: Power down [ 425s] ### VM INTERACTION END ### [ 425s] [ 425s] obs-arm-1 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:47:17 UTC 2018. [ 425s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:52:08 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:52:08 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5aebbce3ee56b_5df111a66881746cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.04/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 142s] [ 142s] Makefile:736: recipe for target 'check-local' failed [ 142s] make[5]: *** [check-local] Error 1 [ 142s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 142s] Makefile:586: recipe for target 'check-am' failed [ 142s] make[4]: *** [check-am] Error 2 [ 142s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 142s] Makefile:438: recipe for target 'check-recursive' failed [ 142s] make[3]: *** [check-recursive] Error 1 [ 142s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 142s] Makefile:520: recipe for target 'check-recursive' failed [ 142s] make[2]: *** [check-recursive] Error 1 [ 142s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 142s] Makefile:811: recipe for target 'check' failed [ 142s] make[1]: *** [check] Error 2 [ 142s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 142s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 142s] debian/rules:13: recipe for target 'build' failed [ 142s] make: *** [build] Error 2 [ 142s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 142s] [ 142s] lamb13 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:52:03 UTC 2018. [ 142s] [ 142s] ### VM INTERACTION START ### [ 145s] [ 137.767391] reboot: Power down [ 145s] ### VM INTERACTION END ### [ 145s] [ 145s] lamb13 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:52:06 UTC 2018. [ 145s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:54:25 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:54:25 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5aebbd5882fe_5df111a6688175124@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 132s] [ 132s] Makefile:736: recipe for target 'check-local' failed [ 133s] make[5]: *** [check-local] Error 1 [ 133s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 133s] Makefile:586: recipe for target 'check-am' failed [ 133s] make[4]: *** [check-am] Error 2 [ 133s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 133s] Makefile:438: recipe for target 'check-recursive' failed [ 133s] make[3]: *** [check-recursive] Error 1 [ 133s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 133s] Makefile:520: recipe for target 'check-recursive' failed [ 133s] make[2]: *** [check-recursive] Error 1 [ 133s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 133s] Makefile:811: recipe for target 'check' failed [ 133s] make[1]: *** [check] Error 2 [ 133s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 133s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 133s] debian/rules:13: recipe for target 'build' failed [ 133s] make: *** [build] Error 2 [ 133s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 133s] [ 133s] lamb14 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:54:18 UTC 2018. [ 133s] [ 133s] ### VM INTERACTION START ### [ 136s] [ 127.827195] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] lamb14 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:54:22 UTC 2018. [ 136s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:54:42 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:54:42 +0000 Subject: Build failure of network:osmocom:latest/openbsc in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5aebbd77234b2_5df111a66881752bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/xUbuntu_17.10/x86_64 Package network:osmocom:latest/openbsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 372s] [ 372s] Makefile:736: recipe for target 'check-local' failed [ 372s] make[5]: *** [check-local] Error 1 [ 372s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 372s] Makefile:586: recipe for target 'check-am' failed [ 372s] make[4]: *** [check-am] Error 2 [ 372s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 372s] Makefile:438: recipe for target 'check-recursive' failed [ 372s] make[3]: *** [check-recursive] Error 1 [ 372s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 372s] Makefile:520: recipe for target 'check-recursive' failed [ 372s] make[2]: *** [check-recursive] Error 1 [ 372s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 372s] Makefile:811: recipe for target 'check' failed [ 372s] make[1]: *** [check] Error 2 [ 372s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 372s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 372s] debian/rules:13: recipe for target 'build' failed [ 372s] make: *** [build] Error 2 [ 372s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 372s] [ 372s] wildcard3 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:54:34 UTC 2018. [ 372s] [ 372s] ### VM INTERACTION START ### [ 375s] [ 338.386479] reboot: Power down [ 376s] ### VM INTERACTION END ### [ 376s] [ 376s] wildcard3 failed "build openbsc_1.0.0.dsc" at Fri May 4 01:54:39 UTC 2018. [ 376s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 01:57:34 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 01:57:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5aebbe2ad4746_5df111a6688175417@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_9.0/armv7l Package network:osmocom:latest/osmo-iuh failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 163s] #define HAVE_SYS_TYPES_H 1 [ 163s] #define HAVE_SYS_STAT_H 1 [ 163s] #define HAVE_STDLIB_H 1 [ 163s] #define HAVE_STRING_H 1 [ 163s] #define HAVE_MEMORY_H 1 [ 163s] #define HAVE_STRINGS_H 1 [ 163s] #define HAVE_INTTYPES_H 1 [ 163s] #define HAVE_STDINT_H 1 [ 163s] #define HAVE_UNISTD_H 1 [ 163s] #define HAVE_DLFCN_H 1 [ 163s] #define LT_OBJDIR ".libs/" [ 163s] #define PACKAGE "osmo-iuh" [ 163s] #define VERSION "0.3.0" [ 163s] [ 163s] configure: exit 1 [ 163s] dh_auto_configure: ./configure --build=arm-linux-gnueabihf --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-silent-rules --libdir=${prefix}/lib/arm-linux-gnueabihf --libexecdir=${prefix}/lib/arm-linux-gnueabihf --disable-maintainer-mode --disable-dependency-tracking returned exit code 1 [ 163s] debian/rules:9: recipe for target 'build' failed [ 163s] make: *** [build] Error 2 [ 163s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 163s] [ 163s] armbuild01 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:57:21 UTC 2018. [ 163s] [ 163s] ### VM INTERACTION START ### [ 165s] [ 132.272532] SysRq : Power Off [ 165s] [ 132.294545] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] armbuild01 failed "build osmo-iuh_0.3.0.dsc" at Fri May 4 01:57:24 UTC 2018. [ 165s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 4 06:02:26 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 04 May 2018 06:02:26 +0000 Subject: Build failure of network:osmocom:latest/openbsc in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5aebf77c3deb6_5df111a6688227264@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_9.0/armv7l Package network:osmocom:latest/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 1290s] Makefile:736: recipe for target 'check-local' failed [ 1290s] make[5]: *** [check-local] Error 1 [ 1290s] make[5]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 1290s] Makefile:586: recipe for target 'check-am' failed [ 1290s] make[4]: *** [check-am] Error 2 [ 1290s] make[4]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 1290s] Makefile:438: recipe for target 'check-recursive' failed [ 1290s] make[3]: *** [check-recursive] Error 1 [ 1290s] make[3]: Leaving directory '/usr/src/packages/BUILD/openbsc/tests' [ 1290s] Makefile:520: recipe for target 'check-recursive' failed [ 1290s] make[2]: *** [check-recursive] Error 1 [ 1290s] make[2]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 1290s] Makefile:811: recipe for target 'check' failed [ 1290s] make[1]: *** [check] Error 2 [ 1290s] make[1]: Leaving directory '/usr/src/packages/BUILD/openbsc' [ 1290s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 1290s] debian/rules:13: recipe for target 'build' failed [ 1290s] make: *** [build] Error 2 [ 1290s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 1290s] [ 1290s] armbuild23 failed "build openbsc_1.0.0.dsc" at Fri May 4 06:02:20 UTC 2018. [ 1290s] [ 1290s] ### VM INTERACTION START ### [ 1293s] [ 1232.688787] SysRq : Power Off [ 1293s] [ 1232.714313] reboot: Power down [ 1294s] ### VM INTERACTION END ### [ 1294s] [ 1294s] armbuild23 failed "build openbsc_1.0.0.dsc" at Fri May 4 06:02:24 UTC 2018. [ 1294s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri May 4 08:33:17 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 4 May 2018 08:33:17 +0000 Subject: [PATCH] osmo-bsc[master]: bsc_api/GSCON: prevent unnecessary channel mode modifications In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8019 to look at the new patch set (#2). bsc_api/GSCON: prevent unnecessary channel mode modifications gsm0808_assign_req() checks if the new channel mode is compatible with the new mode. If it is, it does a gsm48_lchan_modify(), but it does not actually check if the new mode is equal to the current mode. - skip when the channel is compatible and the new mode is equal to the old mode. - send the ASSIGNMENT COMPLETE directly from ST_ACTIVE when no mode modify was necessary. Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Related: OS#2936 --- M src/libbsc/bsc_api.c M src/libbsc/bsc_subscr_conn_fsm.c 2 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/8019/2 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 142efef..19859cf 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -296,16 +296,17 @@ } } -/** - * Send a GSM08.08 Assignment Request. Right now this does not contain the - * audio codec type or the allowed rates for the config. It is assumed that - * this is for audio handling only. In case the current channel does not allow - * the selected mode a new one will be allocated. - * - * TODO: Add multirate configuration, make it work for more than audio. - */ +/*! Send a GSM08.08 Assignment Request. Right now this does not contain the + * audio codec type or the allowed rates for the config. In case the current + * channel does not allow the selected mode a new one will be allocated. + * \param[out] conn related subscriber connection + * \param[in] chan_mode mode of the channel (see enum gsm48_chan_mode) + * \param[in] full_rate select full rate or half rate channel + * \returns 0 on success, 1 when no operation is neccessary, -1 on failure */ int gsm0808_assign_req(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate) { + /* TODO: Add multirate configuration, make it work for more than audio. */ + struct bsc_api *api; api = conn->network->bsc_api; @@ -313,6 +314,11 @@ if (handle_new_assignment(conn, chan_mode, full_rate) != 0) goto error; } else { + /* Check if the channel is already in the requested mode, if + * yes, we skip unnecessary channel mode modify operations. */ + if (conn->lchan->tch_mode == chan_mode) + return 1; + if (chan_mode == GSM48_CMODE_SPEECH_AMR) handle_mr_config(conn, conn->lchan, full_rate); diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index b5e7e7d..7f53f1b 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -438,7 +438,11 @@ * change back to ST_ACTIVE (here) immediately. */ rc = gsm0808_assign_req(conn, conn->user_plane.chan_mode, conn->user_plane.full_rate); - if (rc != 0) { + + if (rc == 1) { + send_ass_compl(conn->lchan, fi, false); + return; + } else if (rc != 0) { resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); sigtran_send(conn, resp, fi); return; -- To view, visit https://gerrit.osmocom.org/8019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 09:15:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 09:15:40 +0000 Subject: libasn1c[master]: debian: set VERSION to fix version in .pc files In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 09:24:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:24:49 +0000 Subject: libasn1c[master]: debian: set VERSION to fix version in .pc files In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 09:24:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:24:53 +0000 Subject: [MERGED] libasn1c[master]: debian: set VERSION to fix version in .pc files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian: set VERSION to fix version in .pc files ...................................................................... debian: set VERSION to fix version in .pc files The pkgconf file contains an unknown version which result in failure of other packages which depend on a minimum version (osmo-iuh) Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea --- M debian/rules 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 267bea9..a1039b0 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,10 @@ # Vendor-related variables such as DEB_VENDOR: #include /usr/share/dpkg/vendor.mk # Package-related variables such as DEB_DISTRIBUTION -#include /usr/share/dpkg/pkg-info.mk +include /usr/share/dpkg/pkg-info.mk + +VERSION := $(shell echo '$(DEB_VERSION)' | sed -e 's/[+-].*//' -e 's/~//g') + # # You may alternatively set them susing a simple script such as: # DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) @@ -44,6 +47,10 @@ %: dh $@ --with autoreconf +override_dh_autoreconf: + echo $(VERSION) > .tarball-version + dh_autoreconf + # debmake generated override targets # Set options for ./configure #CONFIGURE_FLAGS = -- To view, visit https://gerrit.osmocom.org/8021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65401786cf9eb63d3445f548dc13c1d3f9f4c1ea Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 09:25:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:25:35 +0000 Subject: osmo-bsc[master]: bsc_api/GSCON: prevent unnecessary channel mode modifications In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 09:25:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:25:42 +0000 Subject: [MERGED] osmo-bsc[master]: bsc_api/GSCON: prevent unnecessary channel mode modifications In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc_api/GSCON: prevent unnecessary channel mode modifications ...................................................................... bsc_api/GSCON: prevent unnecessary channel mode modifications gsm0808_assign_req() checks if the new channel mode is compatible with the new mode. If it is, it does a gsm48_lchan_modify(), but it does not actually check if the new mode is equal to the current mode. - skip when the channel is compatible and the new mode is equal to the old mode. - send the ASSIGNMENT COMPLETE directly from ST_ACTIVE when no mode modify was necessary. Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Related: OS#2936 --- M src/libbsc/bsc_api.c M src/libbsc/bsc_subscr_conn_fsm.c 2 files changed, 19 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 142efef..19859cf 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -296,16 +296,17 @@ } } -/** - * Send a GSM08.08 Assignment Request. Right now this does not contain the - * audio codec type or the allowed rates for the config. It is assumed that - * this is for audio handling only. In case the current channel does not allow - * the selected mode a new one will be allocated. - * - * TODO: Add multirate configuration, make it work for more than audio. - */ +/*! Send a GSM08.08 Assignment Request. Right now this does not contain the + * audio codec type or the allowed rates for the config. In case the current + * channel does not allow the selected mode a new one will be allocated. + * \param[out] conn related subscriber connection + * \param[in] chan_mode mode of the channel (see enum gsm48_chan_mode) + * \param[in] full_rate select full rate or half rate channel + * \returns 0 on success, 1 when no operation is neccessary, -1 on failure */ int gsm0808_assign_req(struct gsm_subscriber_connection *conn, int chan_mode, int full_rate) { + /* TODO: Add multirate configuration, make it work for more than audio. */ + struct bsc_api *api; api = conn->network->bsc_api; @@ -313,6 +314,11 @@ if (handle_new_assignment(conn, chan_mode, full_rate) != 0) goto error; } else { + /* Check if the channel is already in the requested mode, if + * yes, we skip unnecessary channel mode modify operations. */ + if (conn->lchan->tch_mode == chan_mode) + return 1; + if (chan_mode == GSM48_CMODE_SPEECH_AMR) handle_mr_config(conn, conn->lchan, full_rate); diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index b5e7e7d..7f53f1b 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -438,7 +438,11 @@ * change back to ST_ACTIVE (here) immediately. */ rc = gsm0808_assign_req(conn, conn->user_plane.chan_mode, conn->user_plane.full_rate); - if (rc != 0) { + + if (rc == 1) { + send_ass_compl(conn->lchan, fi, false); + return; + } else if (rc != 0) { resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); sigtran_send(conn, resp, fi); return; -- To view, visit https://gerrit.osmocom.org/8019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86a2d52836c54d2dbd77441b182f757327ec7262 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 09:26:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 09:26:20 +0000 Subject: [PATCH] osmo-ggsn[master]: debian/rules: Fix debian packaging after 1.2.0 release Message-ID: Review at https://gerrit.osmocom.org/8022 debian/rules: Fix debian packaging after 1.2.0 release The 1.2.0 release bumped lib version to 3 and updated the debian package gile accordingly, but forgot to increase dh_strip line in debian/rules. Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 --- M debian/rules M gtp/Makefile.am 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/22/8022/1 diff --git a/debian/rules b/debian/rules index 57fe24c..bcf1931 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp2 --dbg-package=libgtp-dbg + dh_strip -plibgtp3 --dbg-package=libgtp-dbg override_dh_autoreconf: echo $(VERSION) > .tarball-version diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a41a88..449292c 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,9 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +# If major=current-age is increased, remember to update the dh_strip line in debian/rules! LIBVERSION=3:0:0 + lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h -- To view, visit https://gerrit.osmocom.org/8022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 09:28:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 09:28:42 +0000 Subject: [PATCH] osmo-ggsn[master]: debian/rules: Fix debian packaging after 1.2.0 release In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8022 to look at the new patch set (#2). debian/rules: Fix debian packaging after 1.2.0 release The 1.2.0 release bumped lib version to 3 and updated the debian package file accordingly, but forgot to increase dh_strip line in debian/rules. Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 --- M debian/rules M gtp/Makefile.am 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/22/8022/2 diff --git a/debian/rules b/debian/rules index 57fe24c..bcf1931 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp2 --dbg-package=libgtp-dbg + dh_strip -plibgtp3 --dbg-package=libgtp-dbg override_dh_autoreconf: echo $(VERSION) > .tarball-version diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a41a88..449292c 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,9 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +# If major=current-age is increased, remember to update the dh_strip line in debian/rules! LIBVERSION=3:0:0 + lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h -- To view, visit https://gerrit.osmocom.org/8022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 09:29:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:29:28 +0000 Subject: osmo-ggsn[master]: debian/rules: Fix debian packaging after 1.2.0 release In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 09:29:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 09:29:29 +0000 Subject: [MERGED] osmo-ggsn[master]: debian/rules: Fix debian packaging after 1.2.0 release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/rules: Fix debian packaging after 1.2.0 release ...................................................................... debian/rules: Fix debian packaging after 1.2.0 release The 1.2.0 release bumped lib version to 3 and updated the debian package file accordingly, but forgot to increase dh_strip line in debian/rules. Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 --- M debian/rules M gtp/Makefile.am 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/rules b/debian/rules index 57fe24c..bcf1931 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: dh_strip -posmo-ggsn --dbg-package=osmo-ggsn-dbg - dh_strip -plibgtp2 --dbg-package=libgtp-dbg + dh_strip -plibgtp3 --dbg-package=libgtp-dbg override_dh_autoreconf: echo $(VERSION) > .tarball-version diff --git a/gtp/Makefile.am b/gtp/Makefile.am index 7a41a88..449292c 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -1,7 +1,9 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html +# If major=current-age is increased, remember to update the dh_strip line in debian/rules! LIBVERSION=3:0:0 + lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h -- To view, visit https://gerrit.osmocom.org/8022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib54f231943348c06acecd6f413b2c96b24f6db28 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 10:48:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 10:48:36 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E30=2E1-3dc5_=E2=86=92_0=2E9=2E31?= Message-ID: Review at https://gerrit.osmocom.org/8023 Bump version: 0.9.30.1-3dc5 ? 0.9.31 Change-Id: I8d192b1d29a47729a7c728dc35448e2daf6b9743 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libasn1c refs/changes/23/8023/1 diff --git a/debian/changelog b/debian/changelog index 26b8e9c..e7480c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libasn1c (0.9.31) unstable; urgency=medium + + [ Alexander Couzens ] + * debian: set VERSION to fix version in .pc files + + -- Pau Espin Pedrol Fri, 04 May 2018 12:15:34 +0200 + libasn1c (0.9.30) unstable; urgency=medium * configure.ac: Use git-version-gen to set VERSION -- To view, visit https://gerrit.osmocom.org/8023 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d192b1d29a47729a7c728dc35448e2daf6b9743 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 10:48:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 10:48:57 +0000 Subject: =?UTF-8?Q?libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E30=2E1-3dc5_=E2=86=92_0=2E9=2E31?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8023 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8d192b1d29a47729a7c728dc35448e2daf6b9743 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 10:49:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 10:49:17 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-36c4_=E2=86=92_1=2E2=2E1?= Message-ID: Review at https://gerrit.osmocom.org/8024 Bump version: 1.2.0.1-36c4 ? 1.2.1 Change-Id: I4a8bdcbee300296496f039b90795ff981018e17d --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/24/8024/1 diff --git a/debian/changelog b/debian/changelog index 83fd823..6588dca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-ggsn (1.2.1) unstable; urgency=medium + + * debian/rules: Fix debian packaging after 1.2.0 release + + -- Pau Espin Pedrol Fri, 04 May 2018 12:19:58 +0200 + osmo-ggsn (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8024 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a8bdcbee300296496f039b90795ff981018e17d Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 10:49:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 10:49:58 +0000 Subject: [PATCH] openbsc[master]: debian/changelog: change last release for unreleased to unst... Message-ID: Review at https://gerrit.osmocom.org/8025 debian/changelog: change last release for unreleased to unstable Otherwise osmo-release.mk overrides contents of last release. Change-Id: Ife77f6ddd45465b0a5fce80e51e3e64428787b91 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/25/8025/1 diff --git a/debian/changelog b/debian/changelog index 08636ef..ab33e8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openbsc (1.0.0) UNRELEASED; urgency=medium +openbsc (1.0.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] * Revert "gprs: Use RAND_bytes for p-tmsi" -- To view, visit https://gerrit.osmocom.org/8025 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife77f6ddd45465b0a5fce80e51e3e64428787b91 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 10:49:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 10:49:59 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E45-2b362-dirty_=E2=86=92_1=2E1=2E0?= Message-ID: Review at https://gerrit.osmocom.org/8026 Bump version: 1.0.0.45-2b362-dirty ? 1.1.0 Change-Id: I04ccac3ce79b58d5ef0b3c0503ef38708dac05ff --- M debian/changelog M openbsc/configure.ac 2 files changed, 75 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/8026/1 diff --git a/debian/changelog b/debian/changelog index ab33e8e..a157b2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,65 @@ +openbsc (1.1.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * debian/rules: show testsuite.log when tests are failing + * vty: skip installing cmds now always installed by default + * vty: skip installing cmds now always installed by default + * sms.db: silence libdbi warnings on out-of-range index + * fix build: gprs_ra_id_by_bts(): ensure to init all values + * backport support for 3-digit MNC with leading zeros + * Migrate from OpenSSL to osmo_get_rand_id() + + [ Harald Welte ] + * osmo-bsc: Print NOTICE message on unimplemented BSSMAP UDT + * osmo-bsc-sccplite: Implement incoming RESET procedure + * mgcp_transcoding_test: Add LIBOSMOABIS_CFLAGS + * sysinfo: Fix regression causing missing L2 Pseudo-Length in SI5/SI6 + (Closes: #3059) + + [ Pau Espin Pedrol ] + * Use type bool for boolean fields in gsm48_si_ro_info + * vty: Add cmd to configure 3g Early Classmark Sending + * mgcp_protocol: Don't print osmux stats if it is off + * bsc: Improve handling of paging_request return value + * bsc: paging: Fix losing paging messages for BTS + * libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc + * bsc_nat: ctrl: fix memleak on reply receival + * bsc_nat: forward_to_bsc: remove one level of indentation + * bsc_nat: forward_to_bsc: Fix memleak on send failure + * bsc_nat: Drop redundant ccon ptr in bsc_cmd_list + * bsc_nat: ctrl: Fix crash on receveing bsc reply + * nat: Add jitter buffer on the uplink receiver + * smpp_smsc_conf: Fix heap-use-after-free + * chan_alloc.c: Fix log var formatting issues + * mgcp: switch to new osmux output APIs + * debian/changelog: change last release for unreleased to unstable + + [ Max ] + * Fix tests after rate_ctr change + + [ Vadim Yanitskiy ] + * libmsc: add support for both comp128v2 and comp128v3 + * gsm_04_80.h: use '#pragma once' instead of includes + * gsm_04_80.h: cosmetic: whitespace fix + * src/libmsc/ussd.c: drop useless forward declaration + + [ Stefan Sperling ] + * Make "waiting indicator" of IMMEDIATE ASSIGN REJECT dynamic. + * bts chan_load: ignore unusable BTS + * Add stat items for the BTS's channel load average and T3122. + * Add support for Access Control Class ramping. + * fix a format string error in bts_update_t3122_chan_load() + * fix initialization of acc ramping + * only log actual access control class ramping changes + * ensure that acc_ramp_init() is only called once + * trigger acc ramping based on trx rf-locked state + * rename helper functions in the acc ramp code to avoid confusion + * trigger acc ramping on state-changed-event reports + * only trigger acc ramping if trx 0 is usable and unlocked + * fix handling of state changes in acc ramping + + -- Pau Espin Pedrol Fri, 04 May 2018 12:45:08 +0200 + openbsc (1.0.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 7183fda..2c3045a 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -39,19 +39,19 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) # Enabke/disable the NAT? AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"]) if test "$osmo_ac_build_nat" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) fi AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") AC_SUBST(osmo_ac_build_nat) @@ -60,7 +60,7 @@ AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"]) if test "$osmo_ac_build_bsc" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) fi AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") AC_SUBST(osmo_ac_build_bsc) @@ -69,7 +69,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") @@ -95,9 +95,9 @@ AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version? - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version? - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.31) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") -- To view, visit https://gerrit.osmocom.org/8026 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04ccac3ce79b58d5ef0b3c0503ef38708dac05ff Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 10:50:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 10:50:56 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_libasn1c=5Bmaster=5D=3A_Bump_version=3A_0=2E9=2E30=2E1-3dc5_=E2=86=92_0=2E9=2E31?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.9.30.1-3dc5 ? 0.9.31 ...................................................................... Bump version: 0.9.30.1-3dc5 ? 0.9.31 Change-Id: I8d192b1d29a47729a7c728dc35448e2daf6b9743 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 26b8e9c..e7480c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libasn1c (0.9.31) unstable; urgency=medium + + [ Alexander Couzens ] + * debian: set VERSION to fix version in .pc files + + -- Pau Espin Pedrol Fri, 04 May 2018 12:15:34 +0200 + libasn1c (0.9.30) unstable; urgency=medium * configure.ac: Use git-version-gen to set VERSION -- To view, visit https://gerrit.osmocom.org/8023 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d192b1d29a47729a7c728dc35448e2daf6b9743 Gerrit-PatchSet: 1 Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:10 +0000 Subject: =?UTF-8?Q?openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E45-2b362-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8026 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04ccac3ce79b58d5ef0b3c0503ef38708dac05ff Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:12 +0000 Subject: openbsc[master]: debian/changelog: change last release for unreleased to unst... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8025 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ife77f6ddd45465b0a5fce80e51e3e64428787b91 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:19 +0000 Subject: [MERGED] openbsc[master]: debian/changelog: change last release for unreleased to unst... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/changelog: change last release for unreleased to unstable ...................................................................... debian/changelog: change last release for unreleased to unstable Otherwise osmo-release.mk overrides contents of last release. Change-Id: Ife77f6ddd45465b0a5fce80e51e3e64428787b91 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 08636ef..ab33e8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -openbsc (1.0.0) UNRELEASED; urgency=medium +openbsc (1.0.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] * Revert "gprs: Use RAND_bytes for p-tmsi" -- To view, visit https://gerrit.osmocom.org/8025 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife77f6ddd45465b0a5fce80e51e3e64428787b91 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:19 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_openbsc=5Bmaster=5D=3A_Bump_version=3A_1=2E0=2E0=2E45-2b362-dirty_=E2=86=92_1=2E1=2E0?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 1.0.0.45-2b362-dirty ? 1.1.0 ...................................................................... Bump version: 1.0.0.45-2b362-dirty ? 1.1.0 Change-Id: I04ccac3ce79b58d5ef0b3c0503ef38708dac05ff --- M debian/changelog M openbsc/configure.ac 2 files changed, 75 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index ab33e8e..a157b2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,65 @@ +openbsc (1.1.0) unstable; urgency=medium + + [ Neels Hofmeyr ] + * debian/rules: show testsuite.log when tests are failing + * vty: skip installing cmds now always installed by default + * vty: skip installing cmds now always installed by default + * sms.db: silence libdbi warnings on out-of-range index + * fix build: gprs_ra_id_by_bts(): ensure to init all values + * backport support for 3-digit MNC with leading zeros + * Migrate from OpenSSL to osmo_get_rand_id() + + [ Harald Welte ] + * osmo-bsc: Print NOTICE message on unimplemented BSSMAP UDT + * osmo-bsc-sccplite: Implement incoming RESET procedure + * mgcp_transcoding_test: Add LIBOSMOABIS_CFLAGS + * sysinfo: Fix regression causing missing L2 Pseudo-Length in SI5/SI6 + (Closes: #3059) + + [ Pau Espin Pedrol ] + * Use type bool for boolean fields in gsm48_si_ro_info + * vty: Add cmd to configure 3g Early Classmark Sending + * mgcp_protocol: Don't print osmux stats if it is off + * bsc: Improve handling of paging_request return value + * bsc: paging: Fix losing paging messages for BTS + * libbsc: set_net_mcc_mnc_apply: Fix memleak on parsing incorrect mcc mnc + * bsc_nat: ctrl: fix memleak on reply receival + * bsc_nat: forward_to_bsc: remove one level of indentation + * bsc_nat: forward_to_bsc: Fix memleak on send failure + * bsc_nat: Drop redundant ccon ptr in bsc_cmd_list + * bsc_nat: ctrl: Fix crash on receveing bsc reply + * nat: Add jitter buffer on the uplink receiver + * smpp_smsc_conf: Fix heap-use-after-free + * chan_alloc.c: Fix log var formatting issues + * mgcp: switch to new osmux output APIs + * debian/changelog: change last release for unreleased to unstable + + [ Max ] + * Fix tests after rate_ctr change + + [ Vadim Yanitskiy ] + * libmsc: add support for both comp128v2 and comp128v3 + * gsm_04_80.h: use '#pragma once' instead of includes + * gsm_04_80.h: cosmetic: whitespace fix + * src/libmsc/ussd.c: drop useless forward declaration + + [ Stefan Sperling ] + * Make "waiting indicator" of IMMEDIATE ASSIGN REJECT dynamic. + * bts chan_load: ignore unusable BTS + * Add stat items for the BTS's channel load average and T3122. + * Add support for Access Control Class ramping. + * fix a format string error in bts_update_t3122_chan_load() + * fix initialization of acc ramping + * only log actual access control class ramping changes + * ensure that acc_ramp_init() is only called once + * trigger acc ramping based on trx rf-locked state + * rename helper functions in the acc ramp code to avoid confusion + * trigger acc ramping on state-changed-event reports + * only trigger acc ramping if trx 0 is usable and unlocked + * fix handling of state changes in acc ramping + + -- Pau Espin Pedrol Fri, 04 May 2018 12:45:08 +0200 + openbsc (1.0.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 7183fda..2c3045a 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -39,19 +39,19 @@ AC_SUBST(LIBRARY_DL) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.2.0) # Enabke/disable the NAT? AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])], [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"]) if test "$osmo_ac_build_nat" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) fi AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes") AC_SUBST(osmo_ac_build_nat) @@ -60,7 +60,7 @@ AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])], [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"]) if test "$osmo_ac_build_bsc" = "yes" ; then - PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6) + PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) fi AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes") AC_SUBST(osmo_ac_build_bsc) @@ -69,7 +69,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then - PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.12) + PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") @@ -95,9 +95,9 @@ AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version? - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version? - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version? + PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.31) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.3.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") -- To view, visit https://gerrit.osmocom.org/8026 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04ccac3ce79b58d5ef0b3c0503ef38708dac05ff Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:29 +0000 Subject: =?UTF-8?Q?osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-36c4_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8024 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4a8bdcbee300296496f039b90795ff981018e17d Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 11:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 11:08:30 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E1-36c4_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Bump version: 1.2.0.1-36c4 ? 1.2.1 ...................................................................... Bump version: 1.2.0.1-36c4 ? 1.2.1 Change-Id: I4a8bdcbee300296496f039b90795ff981018e17d --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 83fd823..6588dca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-ggsn (1.2.1) unstable; urgency=medium + + * debian/rules: Fix debian packaging after 1.2.0 release + + -- Pau Espin Pedrol Fri, 04 May 2018 12:19:58 +0200 + osmo-ggsn (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8024 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a8bdcbee300296496f039b90795ff981018e17d Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 12:09:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 12:09:39 +0000 Subject: osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 Does anybody disagree with this? can we merge it? -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 12:23:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 12:23:04 +0000 Subject: osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Patch Set 1: > Does anybody disagree with this? can we merge it? nobody has yet adressed Alexander Chemeris' coment ? -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 12:25:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 12:25:52 +0000 Subject: osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Patch Set 1: > > Does anybody disagree with this? can we merge it? > > nobody has yet adressed Alexander Chemeris' coment ? As far as I understand, his comment was a response refusing Vadim's approach, and I think the patch is fine as it is now. Can any of you guys confirm? -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 13:47:20 2018 From: gerrit-no-reply at lists.osmocom.org (Alexander Chemeris) Date: Fri, 4 May 2018 13:47:20 +0000 Subject: osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Patch Set 1: Yes, Pau is correct. -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 14:01:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 14:01:33 +0000 Subject: osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 14:01:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 14:01:50 +0000 Subject: [MERGED] osmo-trx[master]: doc: examples: Add umtrx sample config In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: doc: examples: Add umtrx sample config ...................................................................... doc: examples: Add umtrx sample config Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 --- A doc/examples/osmo-trx-umtrx.cfg 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Alexander Chemeris: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-umtrx.cfg new file mode 100644 index 0000000..b7a73b0 --- /dev/null +++ b/doc/examples/osmo-trx-umtrx.cfg @@ -0,0 +1,22 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging level all info +! +line vty + no login +! +trx + bind-ip 127.0.0.1 + remote-ip 127.0.0.1 + base-port 5700 + dev-args addr=192.168.10.2,pa=NONE,pa_power_max_dbm=23,fifo_ctrl_window=0,status_port=12345 + egprs disable + tx-sps 4 + rx-sps 4 + rssi-offset 38 + rt-prio 18 + chan 0 + chan 1 -- To view, visit https://gerrit.osmocom.org/7890 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id38de0bbbe75e5e6bbb0de2eecb7d1984786d528 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: ttsou From gerrit-no-reply at lists.osmocom.org Fri May 4 14:04:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 14:04:33 +0000 Subject: osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 (2 comments) tis is not what we really need, sorry. We'd want to have a second port upwards to the user, so the user (testcase) can specify if he wants to send something through PTP or signaling BVCI. Towards the bottom (NS), I would assume the single port is sufficient. https://gerrit.osmocom.org/#/c/8020/1/library/BSSGP_Emulation.ttcn File library/BSSGP_Emulation.ttcn: Line 538: [] BSSGP_SP.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { I would argue this template should match all BSSGP messages for BVCI=0 (signaling), not just PS-PAGING. Line 539: BSCP_SIG.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); also here, probably best to use BVCI=0? -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Fri May 4 14:06:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 14:06:27 +0000 Subject: osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/8020/1/library/NS_Emulation.ttcn File library/NS_Emulation.ttcn: Line 266: NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc))); this ud_req.bvci is comming from the user (BSSGP). So the BSSGP_Emulation can already send both via its point-to-point BVCI or via signaling (0) by setting it properly. I don't think we need any changes in this file. -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Fri May 4 14:14:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 May 2018 14:14:43 +0000 Subject: [PATCH] osmo-hlr[master]: fix luop crash: use buffer for APN that remains valid Message-ID: Review at https://gerrit.osmocom.org/8027 fix luop crash: use buffer for APN that remains valid In osmo_gsup_configure_wildcard_apn(), do not compose APN into a local buffer that becomes invalid as soon as the function exits. Instead, use a caller provided buf. Fixes OS#3231 crash: ==20030==ERROR: AddressSanitizer: stack-buffer-underflow on address 0x7fffffffd9c0 at pc 0x7ffff6e9b6c2 bp 0x7fffffffd900 sp 0x7fffffffd0b0 READ of size 2 at 0x7fffffffd9c0 thread T0 #0 0x7ffff6e9b6c1 (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x766c1) #1 0x7ffff6314419 in tlv_put ../../../../src/libosmocore/include/osmocom/gsm/tlv.h:107 #2 0x7ffff6314419 in msgb_tlv_put ../../../../src/libosmocore/include/osmocom/gsm/tlv.h:299 #3 0x7ffff6314419 in encode_pdp_info ../../../../src/libosmocore/src/gsm/gsup.c:419 #4 0x7ffff6314419 in osmo_gsup_encode ../../../../src/libosmocore/src/gsm/gsup.c:535 #5 0x555555580016 in _luop_tx_gsup ../../../src/osmo-hlr/src/luop.c:54 #6 0x5555555809d8 in lu_op_tx_insert_subscr_data ../../../src/osmo-hlr/src/luop.c:264 #7 0x55555558b356 in rx_upd_loc_req ../../../src/osmo-hlr/src/hlr.c:306 #8 0x55555558b356 in read_cb ../../../src/osmo-hlr/src/hlr.c:365 #9 0x555555586671 in osmo_gsup_server_read_cb ../../../src/osmo-hlr/src/gsup_server.c:105 #10 0x7ffff5b35911 in ipa_server_conn_read ../../../src/libosmo-abis/src/input/ipa.c:356 #11 0x7ffff5b35911 in ipa_server_conn_cb ../../../src/libosmo-abis/src/input/ipa.c:387 #12 0x7ffff5e5541f in osmo_fd_disp_fds ../../../src/libosmocore/src/select.c:216 #13 0x7ffff5e5541f in osmo_select_main ../../../src/libosmocore/src/select.c:256 #14 0x5555555791b6 in main ../../../src/osmo-hlr/src/hlr.c:600 #15 0x7ffff4707a86 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21a86) #16 0x555555579679 in _start (/usr/local/bin/osmo-hlr+0x25679) Address 0x7fffffffd9c0 is located in stack of thread T0 at offset 16 in frame #0 0x7ffff63131ff in osmo_gsup_encode ../../../../src/libosmocore/src/gsm/gsup.c:481 This frame has 1 object(s): [32, 64) 'bcd_buf' <== Memory access at offset 16 underflows this variable Related: OS#3231 Change-Id: I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/27/8027/1 diff --git a/src/gsup_server.c b/src/gsup_server.c index 24ba738..03a6f56 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -335,16 +335,19 @@ talloc_free(gsups); } -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup) +/* Set GSUP message's pdp_infos[0] to a wildcard APN. + * Use the provided apn_buf to store the produced APN data. This must remain valid until + * osmo_gsup_encode() is done. */ +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size) { int l; - uint8_t apn[APN_MAXLEN]; - l = osmo_apn_from_str(apn, sizeof(apn), "*"); + l = osmo_apn_from_str(apn_buf, apn_buf_size, "*"); if (l <= 0) return; - gsup->pdp_infos[0].apn_enc = apn; + gsup->pdp_infos[0].apn_enc = apn_buf; gsup->pdp_infos[0].apn_enc_len = l; gsup->pdp_infos[0].have_info = 1; gsup->num_pdp_infos = 1; diff --git a/src/gsup_server.h b/src/gsup_server.h index 3d36bff..b52b783 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -53,4 +53,5 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size); diff --git a/src/hlr.c b/src/hlr.c index 195e5d2..cab34f0 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "db.h" #include "hlr.h" @@ -67,6 +68,7 @@ uint8_t *peer; int peer_len; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + uint8_t apn[APN_MAXLEN]; int len; struct msgb *msg_out; @@ -96,7 +98,7 @@ /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); + osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); } else if (co->supports_cs) { gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; } else { diff --git a/src/luop.c b/src/luop.c index 7150b64..54c3884 100644 --- a/src/luop.c +++ b/src/luop.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "gsup_server.h" #include "gsup_router.h" @@ -233,6 +234,7 @@ { struct osmo_gsup_message gsup; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + uint8_t apn[APN_MAXLEN]; int l; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || @@ -257,7 +259,7 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); + osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/8027 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Fri May 4 14:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 May 2018 14:14:44 +0000 Subject: [PATCH] osmo-hlr[master]: add gsup_test to catch OS#3231 Message-ID: Review at https://gerrit.osmocom.org/8028 add gsup_test to catch OS#3231 Encode an Insert Subscr Data with is_ps == true to trigger the encoding bug described in OS#3231, i.e. show that it is fixed. Move osmo_gsup_addr_send() to a separate .c file, so that it can be overridden in the regression test to just dump the msgb instead. I used this test to reproduce issue OS#3231, and now that it's here we might as well keep it, and possibly expand on it in the future. Related: OS#3231 Change-Id: Id1453351758f3e1a9ff03bd99fefaf51886e77da --- M configure.ac M src/Makefile.am A src/gsup_send.c M src/luop.c M src/luop.h M tests/Makefile.am A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/testsuite.at 11 files changed, 191 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/28/8028/1 diff --git a/configure.ac b/configure.ac index a632a1d..cedba45 100644 --- a/configure.ac +++ b/configure.ac @@ -104,5 +104,6 @@ tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile tests/gsup_server/Makefile + tests/gsup/Makefile tests/db/Makefile ) diff --git a/src/Makefile.am b/src/Makefile.am index 60fc479..ea5023d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ rand_urandom.c \ hlr_vty.c \ hlr_vty_subscr.c \ + gsup_send.c \ $(NULL) osmo_hlr_LDADD = \ diff --git a/src/gsup_send.c b/src/gsup_send.c new file mode 100644 index 0000000..b2c4e02 --- /dev/null +++ b/src/gsup_send.c @@ -0,0 +1,45 @@ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/* This is kept separate to be able to override the actual sending functions from unit tests. */ + +#include + +#include "gsup_server.h" +#include "gsup_router.h" + +#include + +/* Send a msgb to a given address using routing */ +int osmo_gsup_addr_send(struct osmo_gsup_server *gs, + const uint8_t *addr, size_t addrlen, + struct msgb *msg) +{ + struct osmo_gsup_conn *conn; + + conn = gsup_route_find(gs, addr, addrlen); + if (!conn) { + DEBUGP(DLGSUP, "Cannot find route for addr %s\n", addr); + msgb_free(msg); + return -ENODEV; + } + + return osmo_gsup_conn_send(conn, msg); +} + diff --git a/src/luop.c b/src/luop.c index 54c3884..edf4c51 100644 --- a/src/luop.c +++ b/src/luop.c @@ -165,23 +165,6 @@ luop->state = new_state; } -/* Send a msgb to a given address using routing */ -int osmo_gsup_addr_send(struct osmo_gsup_server *gs, - const uint8_t *addr, size_t addrlen, - struct msgb *msg) -{ - struct osmo_gsup_conn *conn; - - conn = gsup_route_find(gs, addr, addrlen); - if (!conn) { - DEBUGP(DMAIN, "Cannot find route for addr %s\n", addr); - msgb_free(msg); - return -ENODEV; - } - - return osmo_gsup_conn_send(conn, msg); -} - /*! Transmit UPD_LOC_ERROR and destroy lu_operation */ void lu_op_tx_error(struct lu_operation *luop, enum gsm48_gmm_cause cause) { diff --git a/src/luop.h b/src/luop.h index 053a025..d690243 100644 --- a/src/luop.h +++ b/src/luop.h @@ -28,6 +28,7 @@ #include #include "db.h" +#include "gsup_server.h" #define CANCEL_TIMEOUT_SECS 30 #define ISD_TIMEOUT_SECS 30 diff --git a/tests/Makefile.am b/tests/Makefile.am index f1cc710..58679ed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ auc \ gsup_server \ db \ + gsup \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am new file mode 100644 index 0000000..7c33dbd --- /dev/null +++ b/tests/gsup/Makefile.am @@ -0,0 +1,41 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/src \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(NULL) + +EXTRA_DIST = \ + gsup_test.ok \ + gsup_test.err \ + $(NULL) + +noinst_PROGRAMS = \ + gsup_test \ + $(NULL) + +gsup_test_SOURCES = \ + gsup_test.c \ + $(NULL) + +gsup_test_LDADD = \ + $(top_srcdir)/src/luop.c \ + $(top_srcdir)/src/gsup_server.c \ + $(top_srcdir)/src/gsup_router.c \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/gsup_test >"$(srcdir)/gsup_test.ok" 2>"$(srcdir)/gsup_test.err" diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c new file mode 100644 index 0000000..41865d2 --- /dev/null +++ b/tests/gsup/gsup_test.c @@ -0,0 +1,91 @@ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include + +#include "logging.h" +#include "luop.h" + +struct osmo_gsup_server; + +/* override osmo_gsup_addr_send() to not actually send anything. */ +int osmo_gsup_addr_send(struct osmo_gsup_server *gs, + const uint8_t *addr, size_t addrlen, + struct msgb *msg) +{ + LOGP(DMAIN, LOGL_DEBUG, "%s\n", msgb_hexdump(msg)); + msgb_free(msg); + return 0; +} + +int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi, + struct hlr_subscriber *subscr) +{ + return 0; +} + +/* Verify that the internally allocated msgb is large enough */ +void test_gsup_tx_insert_subscr_data() +{ + struct lu_operation luop = { + .state = LU_S_LU_RECEIVED, + .subscr = { + .imsi = "123456789012345", + .msisdn = "987654321098765", + .nam_cs = true, + .nam_ps = true, + }, + .is_ps = true, + }; + + lu_op_tx_insert_subscr_data(&luop); +} + +const struct log_info_cat default_categories[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "Main Program", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +static struct log_info info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +int main(int argc, char **argv) +{ + void *ctx = talloc_named_const(NULL, 0, "gsup_test"); + osmo_init_logging2(ctx, &info); + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_timestamp(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + + test_gsup_tx_insert_subscr_data(); + + printf("Done.\n"); + return EXIT_SUCCESS; +} diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err new file mode 100644 index 0000000..d9d272a --- /dev/null +++ b/tests/gsup/gsup_test.err @@ -0,0 +1,2 @@ +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN LU OP state change: LU RECEIVED -> ISD SENT diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok new file mode 100644 index 0000000..619c561 --- /dev/null +++ b/tests/gsup/gsup_test.ok @@ -0,0 +1 @@ +Done. diff --git a/tests/testsuite.at b/tests/testsuite.at index 74179e7..70ae7ae 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -15,6 +15,13 @@ AT_CHECK([$abs_top_builddir/tests/auc/auc_ts_55_205_test_sets], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([gsup]) +AT_KEYWORDS([gsup]) +cat $abs_srcdir/gsup/gsup_test.ok > expout +cat $abs_srcdir/gsup/gsup_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gsup/gsup_test], [], [expout], [experr]) +AT_CLEANUP + AT_SETUP([gsup_server]) AT_KEYWORDS([gsup_server]) cat $abs_srcdir/gsup_server/gsup_server_test.ok > expout -- To view, visit https://gerrit.osmocom.org/8028 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1453351758f3e1a9ff03bd99fefaf51886e77da Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Fri May 4 14:31:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 14:31:49 +0000 Subject: osmo-hlr[master]: fix luop crash: use buffer for APN that remains valid In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8027 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 14:48:42 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 May 2018 14:48:42 +0000 Subject: [PATCH] osmo-hlr[master]: add error handling to osmo_gsup_configure_wildcard_apn() Message-ID: Review at https://gerrit.osmocom.org/8029 add error handling to osmo_gsup_configure_wildcard_apn() Follow-up to I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 as requested in code review. Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/29/8029/1 diff --git a/src/gsup_server.c b/src/gsup_server.c index 03a6f56..07d4feb 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -337,15 +337,16 @@ /* Set GSUP message's pdp_infos[0] to a wildcard APN. * Use the provided apn_buf to store the produced APN data. This must remain valid until - * osmo_gsup_encode() is done. */ -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, - uint8_t *apn_buf, size_t apn_buf_size) + * osmo_gsup_encode() is done. Return 0 if an entry was added, -ENOMEM if the provided buffer is too + * small. */ +int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size) { int l; l = osmo_apn_from_str(apn_buf, apn_buf_size, "*"); if (l <= 0) - return; + return -ENOMEM; gsup->pdp_infos[0].apn_enc = apn_buf; gsup->pdp_infos[0].apn_enc_len = l; @@ -353,4 +354,6 @@ gsup->num_pdp_infos = 1; /* FIXME: use real value: */ gsup->pdp_infos[0].context_id = 1; + + return 0; } diff --git a/src/gsup_server.h b/src/gsup_server.h index b52b783..66c1a9c 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -53,5 +53,5 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, - uint8_t *apn_buf, size_t apn_buf_size); +int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size); diff --git a/src/hlr.c b/src/hlr.c index cab34f0..1c72f45 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -98,7 +98,11 @@ /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); + if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", + subscr->imsi); + continue; + } } else if (co->supports_cs) { gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; } else { diff --git a/src/luop.c b/src/luop.c index edf4c51..db7b3c9 100644 --- a/src/luop.c +++ b/src/luop.c @@ -242,7 +242,12 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); + if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", + luop->subscr.imsi); + lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + return; + } } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/8029 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Fri May 4 14:51:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 14:51:54 +0000 Subject: osmo-hlr[master]: add error handling to osmo_gsup_configure_wildcard_apn() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8029 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 15:01:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 May 2018 15:01:40 +0000 Subject: [MERGED] osmo-hlr[master]: fix luop crash: use buffer for APN that remains valid In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: fix luop crash: use buffer for APN that remains valid ...................................................................... fix luop crash: use buffer for APN that remains valid In osmo_gsup_configure_wildcard_apn(), do not compose APN into a local buffer that becomes invalid as soon as the function exits. Instead, use a caller provided buf. Fixes OS#3231 crash: ==20030==ERROR: AddressSanitizer: stack-buffer-underflow on address 0x7fffffffd9c0 at pc 0x7ffff6e9b6c2 bp 0x7fffffffd900 sp 0x7fffffffd0b0 READ of size 2 at 0x7fffffffd9c0 thread T0 #0 0x7ffff6e9b6c1 (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x766c1) #1 0x7ffff6314419 in tlv_put ../../../../src/libosmocore/include/osmocom/gsm/tlv.h:107 #2 0x7ffff6314419 in msgb_tlv_put ../../../../src/libosmocore/include/osmocom/gsm/tlv.h:299 #3 0x7ffff6314419 in encode_pdp_info ../../../../src/libosmocore/src/gsm/gsup.c:419 #4 0x7ffff6314419 in osmo_gsup_encode ../../../../src/libosmocore/src/gsm/gsup.c:535 #5 0x555555580016 in _luop_tx_gsup ../../../src/osmo-hlr/src/luop.c:54 #6 0x5555555809d8 in lu_op_tx_insert_subscr_data ../../../src/osmo-hlr/src/luop.c:264 #7 0x55555558b356 in rx_upd_loc_req ../../../src/osmo-hlr/src/hlr.c:306 #8 0x55555558b356 in read_cb ../../../src/osmo-hlr/src/hlr.c:365 #9 0x555555586671 in osmo_gsup_server_read_cb ../../../src/osmo-hlr/src/gsup_server.c:105 #10 0x7ffff5b35911 in ipa_server_conn_read ../../../src/libosmo-abis/src/input/ipa.c:356 #11 0x7ffff5b35911 in ipa_server_conn_cb ../../../src/libosmo-abis/src/input/ipa.c:387 #12 0x7ffff5e5541f in osmo_fd_disp_fds ../../../src/libosmocore/src/select.c:216 #13 0x7ffff5e5541f in osmo_select_main ../../../src/libosmocore/src/select.c:256 #14 0x5555555791b6 in main ../../../src/osmo-hlr/src/hlr.c:600 #15 0x7ffff4707a86 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21a86) #16 0x555555579679 in _start (/usr/local/bin/osmo-hlr+0x25679) Address 0x7fffffffd9c0 is located in stack of thread T0 at offset 16 in frame #0 0x7ffff63131ff in osmo_gsup_encode ../../../../src/libosmocore/src/gsm/gsup.c:481 This frame has 1 object(s): [32, 64) 'bcd_buf' <== Memory access at offset 16 underflows this variable Related: OS#3231 Change-Id: I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 15 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsup_server.c b/src/gsup_server.c index 24ba738..03a6f56 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -335,16 +335,19 @@ talloc_free(gsups); } -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup) +/* Set GSUP message's pdp_infos[0] to a wildcard APN. + * Use the provided apn_buf to store the produced APN data. This must remain valid until + * osmo_gsup_encode() is done. */ +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size) { int l; - uint8_t apn[APN_MAXLEN]; - l = osmo_apn_from_str(apn, sizeof(apn), "*"); + l = osmo_apn_from_str(apn_buf, apn_buf_size, "*"); if (l <= 0) return; - gsup->pdp_infos[0].apn_enc = apn; + gsup->pdp_infos[0].apn_enc = apn_buf; gsup->pdp_infos[0].apn_enc_len = l; gsup->pdp_infos[0].have_info = 1; gsup->num_pdp_infos = 1; diff --git a/src/gsup_server.h b/src/gsup_server.h index 3d36bff..b52b783 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -53,4 +53,5 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup); +void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size); diff --git a/src/hlr.c b/src/hlr.c index 195e5d2..cab34f0 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "db.h" #include "hlr.h" @@ -67,6 +68,7 @@ uint8_t *peer; int peer_len; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + uint8_t apn[APN_MAXLEN]; int len; struct msgb *msg_out; @@ -96,7 +98,7 @@ /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); + osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); } else if (co->supports_cs) { gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; } else { diff --git a/src/luop.c b/src/luop.c index 7150b64..54c3884 100644 --- a/src/luop.c +++ b/src/luop.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "gsup_server.h" #include "gsup_router.h" @@ -233,6 +234,7 @@ { struct osmo_gsup_message gsup; uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + uint8_t apn[APN_MAXLEN]; int l; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || @@ -257,7 +259,7 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup); + osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/8027 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Fri May 4 15:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 4 May 2018 15:02:25 +0000 Subject: [MERGED] osmo-bsc[master]: resurrect meas_feed.c: vty, vty-test In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: resurrect meas_feed.c: vty, vty-test ...................................................................... resurrect meas_feed.c: vty, vty-test At this point, meas-feed is usable again, however, osmo-bsc is not able to include the IMSI in every report like osmo-nitb did. In consequence, the meas-vis and meas-web tools are unable to handle the current measurement reports: these so far use the IMSI to list reports, and all reports without an IMSI are collapsed onto the same line, swapping values. So though osmo-bsc now sends usable measurement reports via meas-feed, two avenues to improve should be pursued: OS#3192: the visualization tools should use bts,ts,ss numbers, not IMSI. OS#2969: osmo-bsc should always know a mobile identity. Related: OS#2968 Change-Id: I186c7a995dd2b81746c32a58b55da64ed195a1ce --- M include/osmocom/bsc/meas_feed.h M src/libbsc/bsc_vty.c A tests/osmo-bsc.vty 3 files changed, 69 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h index 55bce09..1849a89 100644 --- a/include/osmocom/bsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -1,5 +1,4 @@ -#ifndef _OPENBSC_MEAS_FEED_H -#define _OPENBSC_MEAS_FEED_H +#pragma once #include @@ -37,5 +36,8 @@ #define MEAS_FEED_VERSION 1 +int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port); +void meas_feed_scenario_set(const char *name); -#endif +void meas_feed_cfg_get(char **host, uint16_t *port); +const char *meas_feed_scenario_get(void); diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index c8d1637..1efca0c 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -61,6 +61,7 @@ #include #include #include +#include #include @@ -1016,6 +1017,22 @@ else vty_out(vty, " periodic location update %u%s", gsmnet->t3212 * 6, VTY_NEWLINE); + + { + uint16_t meas_port; + char *meas_host; + const char *meas_scenario; + + meas_feed_cfg_get(&meas_host, &meas_port); + meas_scenario = meas_feed_scenario_get(); + + if (meas_port) + vty_out(vty, " meas-feed destination %s %u%s", + meas_host, meas_port, VTY_NEWLINE); + if (strlen(meas_scenario) > 0) + vty_out(vty, " meas-feed scenario %s%s", + meas_scenario, VTY_NEWLINE); + } return CMD_SUCCESS; } @@ -4699,6 +4716,32 @@ return CMD_SUCCESS; } +#define MEAS_FEED_STR "Measurement Report export\n" + +DEFUN(cfg_net_meas_feed_dest, cfg_net_meas_feed_dest_cmd, + "meas-feed destination ADDR <0-65535>", + MEAS_FEED_STR "Where to forward Measurement Report feeds\n" "address or hostname\n" "port number\n") +{ + int rc; + const char *host = argv[0]; + uint16_t port = atoi(argv[1]); + + rc = meas_feed_cfg_set(host, port); + if (rc < 0) + return CMD_WARNING; + + return CMD_SUCCESS; +} + +DEFUN(cfg_net_meas_feed_scenario, cfg_net_meas_feed_scenario_cmd, + "meas-feed scenario NAME", + MEAS_FEED_STR "Set a name to include in the Measurement Report feeds\n" "Name string, up to 31 characters\n") +{ + meas_feed_scenario_set(argv[0]); + + return CMD_SUCCESS; +} + extern int bsc_vty_init_extra(void); int bsc_vty_init(struct gsm_network *network) @@ -4741,6 +4784,8 @@ install_element(GSMNET_NODE, &cfg_net_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd); install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty new file mode 100644 index 0000000..560fb36 --- /dev/null +++ b/tests/osmo-bsc.vty @@ -0,0 +1,19 @@ +OsmoBSC> enable + +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# list +... + meas-feed destination ADDR <0-65535> + meas-feed scenario NAME +... + +OsmoBSC(config-net)# meas-feed destination 127.0.0.23 4223 +OsmoBSC(config-net)# meas-feed scenario foo23 +OsmoBSC(config-net)# show running-config +... +network +... + meas-feed destination 127.0.0.23 4223 + meas-feed scenario foo23 +... -- To view, visit https://gerrit.osmocom.org/7995 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I186c7a995dd2b81746c32a58b55da64ed195a1ce Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Fri May 4 15:08:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 15:08:26 +0000 Subject: osmo-hlr[master]: add gsup_test to catch OS#3231 In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8028 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id1453351758f3e1a9ff03bd99fefaf51886e77da Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 15:08:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 15:08:28 +0000 Subject: osmo-hlr[master]: add error handling to osmo_gsup_configure_wildcard_apn() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8029 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 15:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 15:08:30 +0000 Subject: [MERGED] osmo-hlr[master]: add error handling to osmo_gsup_configure_wildcard_apn() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: add error handling to osmo_gsup_configure_wildcard_apn() ...................................................................... add error handling to osmo_gsup_configure_wildcard_apn() Follow-up to I83d9ef2868bbb01e3f1ddb7920fe735aca172b15 as requested in code review. Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c 4 files changed, 20 insertions(+), 8 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsup_server.c b/src/gsup_server.c index 03a6f56..07d4feb 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -337,15 +337,16 @@ /* Set GSUP message's pdp_infos[0] to a wildcard APN. * Use the provided apn_buf to store the produced APN data. This must remain valid until - * osmo_gsup_encode() is done. */ -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, - uint8_t *apn_buf, size_t apn_buf_size) + * osmo_gsup_encode() is done. Return 0 if an entry was added, -ENOMEM if the provided buffer is too + * small. */ +int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size) { int l; l = osmo_apn_from_str(apn_buf, apn_buf_size, "*"); if (l <= 0) - return; + return -ENOMEM; gsup->pdp_infos[0].apn_enc = apn_buf; gsup->pdp_infos[0].apn_enc_len = l; @@ -353,4 +354,6 @@ gsup->num_pdp_infos = 1; /* FIXME: use real value: */ gsup->pdp_infos[0].context_id = 1; + + return 0; } diff --git a/src/gsup_server.h b/src/gsup_server.h index b52b783..66c1a9c 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -53,5 +53,5 @@ void osmo_gsup_server_destroy(struct osmo_gsup_server *gsups); -void osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, - uint8_t *apn_buf, size_t apn_buf_size); +int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, + uint8_t *apn_buf, size_t apn_buf_size); diff --git a/src/hlr.c b/src/hlr.c index cab34f0..1c72f45 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -98,7 +98,11 @@ /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); + if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", + subscr->imsi); + continue; + } } else if (co->supports_cs) { gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; } else { diff --git a/src/luop.c b/src/luop.c index edf4c51..db7b3c9 100644 --- a/src/luop.c +++ b/src/luop.c @@ -242,7 +242,12 @@ if (luop->is_ps) { /* FIXME: PDP infos - use more fine-grained access control instead of wildcard APN */ - osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn)); + if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { + LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", + luop->subscr.imsi); + lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + return; + } } /* Send ISD to new VLR/SGSN */ -- To view, visit https://gerrit.osmocom.org/8029 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcee1e0d275741c1172b208600851861adb13238 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 15:08:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 15:08:30 +0000 Subject: [MERGED] osmo-hlr[master]: add gsup_test to catch OS#3231 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: add gsup_test to catch OS#3231 ...................................................................... add gsup_test to catch OS#3231 Encode an Insert Subscr Data with is_ps == true to trigger the encoding bug described in OS#3231, i.e. show that it is fixed. Move osmo_gsup_addr_send() to a separate .c file, so that it can be overridden in the regression test to just dump the msgb instead. I used this test to reproduce issue OS#3231, and now that it's here we might as well keep it, and possibly expand on it in the future. Related: OS#3231 Change-Id: Id1453351758f3e1a9ff03bd99fefaf51886e77da --- M configure.ac M src/Makefile.am A src/gsup_send.c M src/luop.c M src/luop.h M tests/Makefile.am A tests/gsup/Makefile.am A tests/gsup/gsup_test.c A tests/gsup/gsup_test.err A tests/gsup/gsup_test.ok M tests/testsuite.at 11 files changed, 191 insertions(+), 17 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index a632a1d..cedba45 100644 --- a/configure.ac +++ b/configure.ac @@ -104,5 +104,6 @@ tests/auc/Makefile tests/auc/gen_ts_55_205_test_sets/Makefile tests/gsup_server/Makefile + tests/gsup/Makefile tests/db/Makefile ) diff --git a/src/Makefile.am b/src/Makefile.am index 60fc479..ea5023d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,7 @@ rand_urandom.c \ hlr_vty.c \ hlr_vty_subscr.c \ + gsup_send.c \ $(NULL) osmo_hlr_LDADD = \ diff --git a/src/gsup_send.c b/src/gsup_send.c new file mode 100644 index 0000000..b2c4e02 --- /dev/null +++ b/src/gsup_send.c @@ -0,0 +1,45 @@ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/* This is kept separate to be able to override the actual sending functions from unit tests. */ + +#include + +#include "gsup_server.h" +#include "gsup_router.h" + +#include + +/* Send a msgb to a given address using routing */ +int osmo_gsup_addr_send(struct osmo_gsup_server *gs, + const uint8_t *addr, size_t addrlen, + struct msgb *msg) +{ + struct osmo_gsup_conn *conn; + + conn = gsup_route_find(gs, addr, addrlen); + if (!conn) { + DEBUGP(DLGSUP, "Cannot find route for addr %s\n", addr); + msgb_free(msg); + return -ENODEV; + } + + return osmo_gsup_conn_send(conn, msg); +} + diff --git a/src/luop.c b/src/luop.c index 54c3884..edf4c51 100644 --- a/src/luop.c +++ b/src/luop.c @@ -165,23 +165,6 @@ luop->state = new_state; } -/* Send a msgb to a given address using routing */ -int osmo_gsup_addr_send(struct osmo_gsup_server *gs, - const uint8_t *addr, size_t addrlen, - struct msgb *msg) -{ - struct osmo_gsup_conn *conn; - - conn = gsup_route_find(gs, addr, addrlen); - if (!conn) { - DEBUGP(DMAIN, "Cannot find route for addr %s\n", addr); - msgb_free(msg); - return -ENODEV; - } - - return osmo_gsup_conn_send(conn, msg); -} - /*! Transmit UPD_LOC_ERROR and destroy lu_operation */ void lu_op_tx_error(struct lu_operation *luop, enum gsm48_gmm_cause cause) { diff --git a/src/luop.h b/src/luop.h index 053a025..d690243 100644 --- a/src/luop.h +++ b/src/luop.h @@ -28,6 +28,7 @@ #include #include "db.h" +#include "gsup_server.h" #define CANCEL_TIMEOUT_SECS 30 #define ISD_TIMEOUT_SECS 30 diff --git a/tests/Makefile.am b/tests/Makefile.am index f1cc710..58679ed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ auc \ gsup_server \ db \ + gsup \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am new file mode 100644 index 0000000..7c33dbd --- /dev/null +++ b/tests/gsup/Makefile.am @@ -0,0 +1,41 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/src \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(NULL) + +EXTRA_DIST = \ + gsup_test.ok \ + gsup_test.err \ + $(NULL) + +noinst_PROGRAMS = \ + gsup_test \ + $(NULL) + +gsup_test_SOURCES = \ + gsup_test.c \ + $(NULL) + +gsup_test_LDADD = \ + $(top_srcdir)/src/luop.c \ + $(top_srcdir)/src/gsup_server.c \ + $(top_srcdir)/src/gsup_router.c \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/gsup_test >"$(srcdir)/gsup_test.ok" 2>"$(srcdir)/gsup_test.err" diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c new file mode 100644 index 0000000..41865d2 --- /dev/null +++ b/tests/gsup/gsup_test.c @@ -0,0 +1,91 @@ +/* (C) 2018 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include + +#include "logging.h" +#include "luop.h" + +struct osmo_gsup_server; + +/* override osmo_gsup_addr_send() to not actually send anything. */ +int osmo_gsup_addr_send(struct osmo_gsup_server *gs, + const uint8_t *addr, size_t addrlen, + struct msgb *msg) +{ + LOGP(DMAIN, LOGL_DEBUG, "%s\n", msgb_hexdump(msg)); + msgb_free(msg); + return 0; +} + +int db_subscr_get_by_imsi(struct db_context *dbc, const char *imsi, + struct hlr_subscriber *subscr) +{ + return 0; +} + +/* Verify that the internally allocated msgb is large enough */ +void test_gsup_tx_insert_subscr_data() +{ + struct lu_operation luop = { + .state = LU_S_LU_RECEIVED, + .subscr = { + .imsi = "123456789012345", + .msisdn = "987654321098765", + .nam_cs = true, + .nam_ps = true, + }, + .is_ps = true, + }; + + lu_op_tx_insert_subscr_data(&luop); +} + +const struct log_info_cat default_categories[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "Main Program", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, +}; + +static struct log_info info = { + .cat = default_categories, + .num_cat = ARRAY_SIZE(default_categories), +}; + +int main(int argc, char **argv) +{ + void *ctx = talloc_named_const(NULL, 0, "gsup_test"); + osmo_init_logging2(ctx, &info); + log_set_print_filename(osmo_stderr_target, 0); + log_set_print_timestamp(osmo_stderr_target, 0); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + + test_gsup_tx_insert_subscr_data(); + + printf("Done.\n"); + return EXIT_SUCCESS; +} diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err new file mode 100644 index 0000000..d9d272a --- /dev/null +++ b/tests/gsup/gsup_test.err @@ -0,0 +1,2 @@ +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN LU OP state change: LU RECEIVED -> ISD SENT diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok new file mode 100644 index 0000000..619c561 --- /dev/null +++ b/tests/gsup/gsup_test.ok @@ -0,0 +1 @@ +Done. diff --git a/tests/testsuite.at b/tests/testsuite.at index 74179e7..70ae7ae 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -15,6 +15,13 @@ AT_CHECK([$abs_top_builddir/tests/auc/auc_ts_55_205_test_sets], [], [expout], [experr]) AT_CLEANUP +AT_SETUP([gsup]) +AT_KEYWORDS([gsup]) +cat $abs_srcdir/gsup/gsup_test.ok > expout +cat $abs_srcdir/gsup/gsup_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gsup/gsup_test], [], [expout], [experr]) +AT_CLEANUP + AT_SETUP([gsup_server]) AT_KEYWORDS([gsup_server]) cat $abs_srcdir/gsup_server/gsup_server_test.ok > expout -- To view, visit https://gerrit.osmocom.org/8028 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1453351758f3e1a9ff03bd99fefaf51886e77da Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From jenkins at lists.osmocom.org Fri May 4 15:14:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 4 May 2018 15:14:02 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#112?= In-Reply-To: <506011951.344.1525360207183.JavaMail.jenkins@jenkins.osmocom.org> References: <506011951.344.1525360207183.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <819098146.355.1525446842356.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri May 4 16:12:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 16:12:52 +0000 Subject: [PATCH] docker-playground[master]: Add osmo-*-latest Dockerfiles Message-ID: Review at https://gerrit.osmocom.org/8030 Add osmo-*-latest Dockerfiles Those containers are using the OBS-built "latest" packages on Debian 9 Change-Id: I6a564206dd81743deb1eb27eca7081bc333d7434 --- A osmo-bsc-latest/.release A osmo-bsc-latest/Dockerfile A osmo-bsc-latest/Makefile A osmo-bsc-latest/Release.key A osmo-bsc-latest/osmo-bsc.cfg A osmo-bts-latest/.release A osmo-bts-latest/Dockerfile A osmo-bts-latest/Makefile A osmo-bts-latest/Release.key A osmo-bts-latest/osmo-bts.cfg A osmo-bts-latest/respawn.sh A osmo-ggsn-latest/.release A osmo-ggsn-latest/Dockerfile A osmo-ggsn-latest/Makefile A osmo-ggsn-latest/Release.key A osmo-ggsn-latest/osmo-ggsn.cfg A osmo-hlr-latest/.release A osmo-hlr-latest/Dockerfile A osmo-hlr-latest/Makefile A osmo-hlr-latest/Release.key A osmo-hlr-latest/osmo-hlr.cfg A osmo-hnbgw-latest/.release A osmo-hnbgw-latest/Dockerfile A osmo-hnbgw-latest/Makefile A osmo-hnbgw-latest/Release.key A osmo-hnbgw-latest/osmo-hnbgw.cfg A osmo-mgw-latest/.release A osmo-mgw-latest/Dockerfile A osmo-mgw-latest/Makefile A osmo-mgw-latest/Release.key A osmo-mgw-latest/osmo-mgw.cfg A osmo-msc-latest/.release A osmo-msc-latest/Dockerfile A osmo-msc-latest/Makefile A osmo-msc-latest/Release.key A osmo-msc-latest/osmo-msc.cfg A osmo-sgsn-latest/.release A osmo-sgsn-latest/Dockerfile A osmo-sgsn-latest/Makefile A osmo-sgsn-latest/Release.key A osmo-sgsn-latest/osmo-sgsn.cfg A osmo-sip-latest/.release A osmo-sip-latest/Dockerfile A osmo-sip-latest/Makefile A osmo-sip-latest/Release.key A osmo-sip-latest/osmo-sip-connector.cfg A osmo-stp-latest/.release A osmo-stp-latest/Dockerfile A osmo-stp-latest/Makefile A osmo-stp-latest/Release.key A osmo-stp-latest/osmo-stp.cfg 51 files changed, 1,337 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/30/8030/1 diff --git a/osmo-bsc-latest/.release b/osmo-bsc-latest/.release new file mode 100644 index 0000000..07f178d --- /dev/null +++ b/osmo-bsc-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-bsc-latest-0.0.0 diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile new file mode 100644 index 0000000..1682dea --- /dev/null +++ b/osmo-bsc-latest/Dockerfile @@ -0,0 +1,34 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-bsc \ + osmo-bsc-ipaccess-utils && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-bsc.cfg /data/osmo-bsc.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] + +EXPOSE 3003 3002 4242 diff --git a/osmo-bsc-latest/Makefile b/osmo-bsc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-bsc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-bsc-latest/Release.key b/osmo-bsc-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-bsc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg new file mode 100644 index 0000000..4176cae --- /dev/null +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -0,0 +1,360 @@ +! +! OsmoBSC (1.0.1.122-630df) configuration saved from vty +!! +password foo +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + dyn_ts_allow_tch_f 1 + periodic location update 30 + timer t3113 10 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1234 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 2 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1235 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1235 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1235 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1235 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 2 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1236 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1236 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1236 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1236 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + ip.access rtp-base 4000 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + dest 192.168.100.11 6666 0 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden + codec-list fr1 fr2 fr3 +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list diff --git a/osmo-bts-latest/.release b/osmo-bts-latest/.release new file mode 100644 index 0000000..f7ba498 --- /dev/null +++ b/osmo-bts-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-bts-latest-0.0.0 diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile new file mode 100644 index 0000000..05dcb24 --- /dev/null +++ b/osmo-bts-latest/Dockerfile @@ -0,0 +1,38 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-bts-trx \ + osmo-bts-virtual && \ + apt-get clean + +ADD respawn.sh /usr/local/bin/respawn.sh + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-bts.cfg /data/osmo-bts.cfg + +WORKDIR /data + # send GSMTAP data to .230 which is the ttcn3-sysinfo test +CMD ["/usr/bin/osmo-bts-virtual", "-i", "172.18.0.230"] + +#EXPOSE diff --git a/osmo-bts-latest/Makefile b/osmo-bts-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-bts-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-bts-latest/Release.key b/osmo-bts-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-bts-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-bts-latest/osmo-bts.cfg b/osmo-bts-latest/osmo-bts.cfg new file mode 100644 index 0000000..e8feff5 --- /dev/null +++ b/osmo-bts-latest/osmo-bts.cfg @@ -0,0 +1,75 @@ +! +! OsmoBTS (0.4.0.561-6b83-dirty) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +phy 0 + !virtual-um ms-multicast-group 239.193.23.1 + !virtual-um bts-multicast-group 239.193.23.2 + instance 0 +bts 0 + band DCS1800 + ipa unit-id 1234 0 + oml remote-ip 172.18.5.20 + rtp jitter-buffer 100 + paging queue-size 200 + paging lifetime 0 + uplink-power-target -75 + gsmtap-sapi bcch + gsmtap-sapi ccch + gsmtap-sapi agch + gsmtap-sapi pch + min-qual-rach 50 + min-qual-norm -5 + trx 0 + power-ramp max-initial 23000 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 diff --git a/osmo-bts-latest/respawn.sh b/osmo-bts-latest/respawn.sh new file mode 100755 index 0000000..ae5cf60 --- /dev/null +++ b/osmo-bts-latest/respawn.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +trap "kill 0" EXIT + +while [ -e /etc/passwd ]; do + $* & + LAST_PID=$! + wait $LAST_PID +done diff --git a/osmo-ggsn-latest/.release b/osmo-ggsn-latest/.release new file mode 100644 index 0000000..af2e5df --- /dev/null +++ b/osmo-ggsn-latest/.release @@ -0,0 +1,2 @@ +release=0.1.0 +tag=osmo-ggsn-latest-0.1.0 diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile new file mode 100644 index 0000000..c1ff3dc --- /dev/null +++ b/osmo-ggsn-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-ggsn && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-ggsn.cfg /data/osmo-ggsn.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-ggsn"] + +EXPOSE 3386/udp 2123/udp 2152/udp 4257/tcp 4260/tcp diff --git a/osmo-ggsn-latest/Makefile b/osmo-ggsn-latest/Makefile new file mode 100644 index 0000000..0142467 --- /dev/null +++ b/osmo-ggsn-latest/Makefile @@ -0,0 +1,10 @@ +RUN_ARGS?= \ + --rm \ + --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --sysctl net.ipv6.conf.all.forwarding=1 \ + --network sigtran --ip 172.18.0.201 \ + -v ggsn-vol:/data \ + --stop-signal SIGINT + +include ../make/Makefile diff --git a/osmo-ggsn-latest/Release.key b/osmo-ggsn-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-ggsn-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-ggsn-latest/osmo-ggsn.cfg b/osmo-ggsn-latest/osmo-ggsn.cfg new file mode 100644 index 0000000..b828789 --- /dev/null +++ b/osmo-ggsn-latest/osmo-ggsn.cfg @@ -0,0 +1,99 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log file /data/openggsn.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 172.18.0.201 + apn internet + gtpu-mode tun + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.222.0/24 + ip dns 0 192.168.100.1 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.222.0/24 + no shutdown + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 2001:4860:4860::8888 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + apn inet46 + gtpu-mode tun + tun-device tun46 + type-support v4v6 + ip prefix dynamic 176.16.46.0/24 + ip dns 0 192.168.100.1 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.46.0/24 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 2001:4860:4860::8888 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 + no shutdown + default-apn internet + no shutdown ggsn diff --git a/osmo-hlr-latest/.release b/osmo-hlr-latest/.release new file mode 100644 index 0000000..2ef6141 --- /dev/null +++ b/osmo-hlr-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-hlr-latest-0.0.0 diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile new file mode 100644 index 0000000..b54eef4 --- /dev/null +++ b/osmo-hlr-latest/Dockerfile @@ -0,0 +1,33 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libdbd-sqlite3 \ + osmo-hlr \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-hlr.cfg /data/osmo-hlr.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-hlr"] + +EXPOSE 4222 4258 4259 diff --git a/osmo-hlr-latest/Makefile b/osmo-hlr-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-hlr-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-hlr-latest/Release.key b/osmo-hlr-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-hlr-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-hlr-latest/osmo-hlr.cfg b/osmo-hlr-latest/osmo-hlr.cfg new file mode 100644 index 0000000..71a76c8 --- /dev/null +++ b/osmo-hlr-latest/osmo-hlr.cfg @@ -0,0 +1,19 @@ +! +! OsmoHLR example configuration +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error +! +line vty + bind 0.0.0.0 +ctrl + bind 0.0.0.0 +hlr + gsup + bind ip 0.0.0.0 diff --git a/osmo-hnbgw-latest/.release b/osmo-hnbgw-latest/.release new file mode 100644 index 0000000..877f1f8 --- /dev/null +++ b/osmo-hnbgw-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-hnbgw-latest-0.0.0 diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile new file mode 100644 index 0000000..4456c8e --- /dev/null +++ b/osmo-hnbgw-latest/Dockerfile @@ -0,0 +1,30 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-hnbgw && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-hnbgw.cfg /data/osmo-hnbgw.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-hnbgw", "-c", "/data/osmo-hnbgw.cfg"] diff --git a/osmo-hnbgw-latest/Makefile b/osmo-hnbgw-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-hnbgw-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-hnbgw-latest/Release.key b/osmo-hnbgw-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-hnbgw-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-hnbgw-latest/osmo-hnbgw.cfg b/osmo-hnbgw-latest/osmo-hnbgw.cfg new file mode 100644 index 0000000..8bffd76 --- /dev/null +++ b/osmo-hnbgw-latest/osmo-hnbgw.cfg @@ -0,0 +1,37 @@ +! +! OsmoHNBGW (0) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice +cs7 instance 0 + point-code 0.23.5 + asp asp-clnt-OsmoHNBGW 2905 0 m3ua + remote-ip 172.18.0.200 + sccp-address msc + point-code 0.23.2 + sccp-address sgsn + point-code 0.23.4 +hnbgw + iuh + local-ip 172.18.0.170 + hnbap-allow-tmsi 1 + iucs + remote-addr msc + iups + remote-addr sgsn diff --git a/osmo-mgw-latest/.release b/osmo-mgw-latest/.release new file mode 100644 index 0000000..16d398c --- /dev/null +++ b/osmo-mgw-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-mgw-latest-0.0.0 diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile new file mode 100644 index 0000000..e0afb1c --- /dev/null +++ b/osmo-mgw-latest/Dockerfile @@ -0,0 +1,31 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-mgw && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-mgw.cfg /data/osmo-mgw.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-mgw"] diff --git a/osmo-mgw-latest/Makefile b/osmo-mgw-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-mgw-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-mgw-latest/Release.key b/osmo-mgw-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-mgw-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg new file mode 100644 index 0000000..4bdde6b --- /dev/null +++ b/osmo-mgw-latest/osmo-mgw.cfg @@ -0,0 +1,52 @@ +! +! OsmoMGW (1.2.0.17-52e3) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug +! +stats interval 5 +! +line vty + no login +! +mgcp + bind ip 172.18.0.180 + bind port 2427 + rtp port-range 4002 16000 + rtp bind-ip 172.18.0.180 + rtp ip-probing + rtp ip-dscp 184 + no rtp keep-alive + no rtcp-omit + no rtp-patch + sdp audio-payload number 98 + sdp audio-payload name GSM + sdp audio-payload send-ptime + sdp audio-payload send-name + loop 0 + number endpoints 31 + allow-transcoding + osmux off diff --git a/osmo-msc-latest/.release b/osmo-msc-latest/.release new file mode 100644 index 0000000..5a4f385 --- /dev/null +++ b/osmo-msc-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-msc-latest-0.0.0 diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile new file mode 100644 index 0000000..02298e7 --- /dev/null +++ b/osmo-msc-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-msc \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-msc.cfg /data/osmo-msc.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-msc"] + +#EXPOSE diff --git a/osmo-msc-latest/Makefile b/osmo-msc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-msc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-msc-latest/Release.key b/osmo-msc-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-msc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-msc-latest/osmo-msc.cfg b/osmo-msc-latest/osmo-msc.cfg new file mode 100644 index 0000000..1261160 --- /dev/null +++ b/osmo-msc-latest/osmo-msc.cfg @@ -0,0 +1,21 @@ +! +! OsmoMSC configuration saved from vty +! +line vty + no login +! +network + network country code 1 + mobile network code 1 + short name OsmoMSC + long name OsmoMSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + rrlp mode none + mm info 1 +msc + mgw remote-ip 10.23.24.1 + assign-tmsi + auth-tuple-max-reuse-count 3 + auth-tuple-reuse-on-error 1 diff --git a/osmo-sgsn-latest/.release b/osmo-sgsn-latest/.release new file mode 100644 index 0000000..edfff32 --- /dev/null +++ b/osmo-sgsn-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-sgsn-latest-0.0.0 diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile new file mode 100644 index 0000000..56b5fda --- /dev/null +++ b/osmo-sgsn-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-sgsn && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-sgsn.cfg /data/osmo-sgsn.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-sgsn"] + +EXPOSE 23000/udp 4245/tcp 4249/tcp diff --git a/osmo-sgsn-latest/Makefile b/osmo-sgsn-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-sgsn-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-sgsn-latest/Release.key b/osmo-sgsn-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-sgsn-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-sgsn-latest/osmo-sgsn.cfg b/osmo-sgsn-latest/osmo-sgsn.cfg new file mode 100644 index 0000000..6db56b7 --- /dev/null +++ b/osmo-sgsn-latest/osmo-sgsn.cfg @@ -0,0 +1,24 @@ +! +! Osmocom SGSN (0.9.0.474-0ede2) configuration saved from vty +!! +! +line vty + no login + bind 0.0.0.0 +! +sgsn + gtp local-ip 172.18.0.21 + ggsn 0 remote-ip 172.18.0.201 + ggsn 0 gtp-version 1 +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + encapsulation udp local-ip 172.18.0.21 + encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 0 +bssgp diff --git a/osmo-sip-latest/.release b/osmo-sip-latest/.release new file mode 100644 index 0000000..05de073 --- /dev/null +++ b/osmo-sip-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-sip-latest-0.0.0 diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile new file mode 100644 index 0000000..9f978d8 --- /dev/null +++ b/osmo-sip-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-sip-connector \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-sip-connector"] + +#EXPOSE diff --git a/osmo-sip-latest/Makefile b/osmo-sip-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-sip-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-sip-latest/Release.key b/osmo-sip-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-sip-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-sip-latest/osmo-sip-connector.cfg b/osmo-sip-latest/osmo-sip-connector.cfg new file mode 100644 index 0000000..ad42969 --- /dev/null +++ b/osmo-sip-latest/osmo-sip-connector.cfg @@ -0,0 +1,6 @@ +app +mncc + socket-path /tmp/bsc_mncc +sip + local 0.0.0.0 5060 + remote pbx 5060 diff --git a/osmo-stp-latest/.release b/osmo-stp-latest/.release new file mode 100644 index 0000000..4d6775c --- /dev/null +++ b/osmo-stp-latest/.release @@ -0,0 +1,2 @@ +release=0.1.0 +tag=osmo-stp-latest-0.1.0 diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile new file mode 100644 index 0000000..f5920a5 --- /dev/null +++ b/osmo-stp-latest/Dockerfile @@ -0,0 +1,31 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-stp \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-stp.cfg /data/ + +CMD ["/usr/bin/osmo-stp", "-c", "/data/osmo-stp.cfg"] + +EXPOSE 2905 14001 4239 diff --git a/osmo-stp-latest/Makefile b/osmo-stp-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-stp-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-stp-latest/Release.key b/osmo-stp-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-stp-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg new file mode 100644 index 0000000..aab7f32 --- /dev/null +++ b/osmo-stp-latest/osmo-stp.cfg @@ -0,0 +1,71 @@ +! +! osmo-stp (0.0.6.3.179-b248) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp0 0 2905 m3ua + remote-ip 172.18.0.2 + asp asp-s-0 0 14001 sua + remote-ip 172.18.0.3 + as as0 m3ua + asp asp0 + routing-key 23 0.2.7 + as as-s-0 sua + asp asp-s-0 + routing-key 24 0.3.0 + route-table system + update route 0.2.7 0.2.7 linkset as0 + update route 0.3.0 0.3.0 linkset as-s-0 + listen m3ua 2905 + local-ip 172.18.0.200 + listen sua 14001 + local-ip 172.18.0.200 -- To view, visit https://gerrit.osmocom.org/8030 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a564206dd81743deb1eb27eca7081bc333d7434 Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Fri May 4 16:33:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 16:33:55 +0000 Subject: [PATCH] libosmocore[master]: control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb Message-ID: Review at https://gerrit.osmocom.org/8031 control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb Imagine following scenario: 1- client connects to CTRL iface, a new conn is created with POLL_READ enabled. 2- A non-related event happens which triggers a TRAP to be sent. As a result, the wqueue for the conn has now enabled POLL_WRITE, and message will be sent next time we go through osmo_main_select(). 3- At the same time, we receive the GET cmd from the CTRL client, which means POLL_READ event will be also triggered next time we call osmo_main_select(). 4- osmo_main_select triggers osmo_wqueue_bfd_cb with both READ/WRITE flags set. 5- The read_cb of wqueue is executed first. The handler closes the CTRL conn for some reason, freeing the osmo_fd struct and returns. 6- osmo_qeueue_bfd_cb keeps using the already freed osmo_fd and calls write_cb. So in step 6 we get a heap-use-after-free catched by AddressSanitizer: 20180424135406115 DLCTRL <0018> control_if.c:506 accept()ed new CTRL connection from (r=10.42.42.1:53910<->l=10.42.42.7:4249) 20180424135406116 DLCTRL <0018> control_cmd.c:378 Command: GET bts.0.oml-connection-state 20180424135406117 DLINP <0013> bts_ipaccess_nanobts.c:417 Identified BTS 1/0/0 20180424135406118 DNM <0005> abis_nm.c:1628 Get Attr (bts=0) 20180424135406118 DNM <0005> abis_nm.c:1628 Get Attr (bts=0) 20180424135406118 DCTRL <000e> osmo_bsc_ctrl.c:158 BTS connection (re)established, sending TRAP. 20180424135406119 DLCTRL <0018> control_if.c:173 close()d CTRL connection (r=10.42.42.1:53910<->l=10.42.42.7:4249) ================================================================= ==12301==ERROR: AddressSanitizer: heap-use-after-free on address 0x611000003e04 at pc 0x7f23091c3a2f bp 0x7ffc0cb73ff0 sp 0x7ffc0cb73fe8 READ of size 4 at 0x611000003e04 thread T0 #0 0x7f23091c3a2e in osmo_wqueue_bfd_cb /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/write_queue.c:65 #1 0x7f23091ad5d8 in osmo_fd_disp_fds /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/select.c:216 #2 0x7f23091ad5d8 in osmo_select_main /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/select.c:256 #3 0x56538bdb7a26 in main /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/osmo-bsc/src/osmo-bsc/osmo_bsc_main.c:532 #4 0x7f23077532e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #5 0x56538bdb8999 in _start (/home/jenkins/workspace/osmo-gsm-tester_run-prod/trial-896/inst/osmo-bsc/bin/osmo-bsc+0x259999) Fixes: OS#3206 Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 --- M include/osmocom/core/write_queue.h M src/ctrl/control_if.c 2 files changed, 25 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/8031/1 diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 2303f87..071621d 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -42,11 +42,11 @@ /*! actual linked list implementing the queue */ struct llist_head msg_queue; - /*! call-back in case qeueue is readable */ + /*! call-back in case qeueue is readable. Return -EBADF if fd is freed inside cb. */ int (*read_cb)(struct osmo_fd *fd); - /*! call-back in case qeueue is writable */ + /*! call-back in case qeueue is writable. Return -EBADF if fd is freed inside cb. */ int (*write_cb)(struct osmo_fd *fd, struct msgb *msg); - /*! call-back in case qeueue has exceptions */ + /*! call-back in case qeueue has exceptions. Return -EBADF if fd is freed inside cb. */ int (*except_cb)(struct osmo_fd *fd); }; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index cc613ee..0ba2512 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -327,7 +327,7 @@ static int handle_control_read(struct osmo_fd * bfd) { - int ret = -1; + int ret; struct osmo_wqueue *queue; struct ctrl_connection *ccon; struct msgb *msg = NULL; @@ -337,27 +337,28 @@ ccon = container_of(queue, struct ctrl_connection, write_queue); ret = ipa_msg_recv_buffered(bfd->fd, &msg, &ccon->pending_msg); - if (ret <= 0) { - if (ret == -EAGAIN) - /* received part of a message, it is stored in ccon->pending_msg and there's - * nothing left to do now. */ - return 0; + if (ret == 0) { /* msg was already discarded. */ - if (ret == 0) { - control_close_conn(ccon); - ret = -EIO; - } - else - LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); - - return ret; + goto close_fd; + } else if (ret == -EAGAIN) { + /* received part of a message, it is stored in ccon->pending_msg and there's + * nothing left to do now. */ + return 0; + } else if (ret < 0) { + LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); + return 0; } ret = ctrl_handle_msg(ctrl, ccon, msg); msgb_free(msg); if (ret) - control_close_conn(ccon); - return ret; + goto close_fd; + + return 0; + +close_fd: + control_close_conn(ccon); + return -EBADF; } int ctrl_handle_msg(struct ctrl_handle *ctrl, struct ctrl_connection *ccon, struct msgb *msg) @@ -435,12 +436,14 @@ ccon = container_of(queue, struct ctrl_connection, write_queue); rc = write(bfd->fd, msg->data, msg->len); - if (rc == 0) + if (rc == 0) { control_close_conn(ccon); - else if (rc != msg->len) + return -EBADF; + } + if (rc != msg->len) LOGP(DLCTRL, LOGL_ERROR, "Failed to write message to the CTRL connection.\n"); - return rc; + return 0; } /*! Allocate CTRL connection -- To view, visit https://gerrit.osmocom.org/8031 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 16:43:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 16:43:15 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-1b8a_=E2=86=92_0=2E2=2E1?= Message-ID: Review at https://gerrit.osmocom.org/8032 Bump version: 0.2.0.3-1b8a ? 0.2.1 Change-Id: I9c457e9baeb546bfefacacddddd48996902e587a --- M debian/changelog 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/32/8032/1 diff --git a/debian/changelog b/debian/changelog index dce4dd4..3763f55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-hlr (0.2.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix luop crash: use buffer for APN that remains valid + * add gsup_test to catch OS#3231 + * add error handling to osmo_gsup_configure_wildcard_apn() + + -- Pau Espin Pedrol Fri, 04 May 2018 18:41:35 +0200 + osmo-hlr (0.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8032 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c457e9baeb546bfefacacddddd48996902e587a Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 17:00:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 17:00:03 +0000 Subject: libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Patch Set 1: Similar thing is already done for ldl in libosmocore: configure.ac: AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) AC_SUBST(LIBRARY_DL) src/Makefile.am: 52:libosmocore_la_LIBADD += $(LIBRARY_DL) -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 17:00:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 17:00:11 +0000 Subject: libosmocore[master]: configure.ac: check clock_gettime for glib < 2.17 In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/7907 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice853d85ffe859b1d4df48b91b050c24d85c861b Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 17:01:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 17:01:45 +0000 Subject: =?UTF-8?Q?osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-1b8a_=E2=86=92_0=2E2=2E1?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8032 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9c457e9baeb546bfefacacddddd48996902e587a Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 17:03:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 17:03:18 +0000 Subject: libosmocore[master]: control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8031 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 17:04:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 17:04:05 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-hlr=5Bmaster=5D=3A_Bump_version=3A_0=2E2=2E0=2E3-1b8a_=E2=86=92_0=2E2=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 0.2.0.3-1b8a ? 0.2.1 ...................................................................... Bump version: 0.2.0.3-1b8a ? 0.2.1 Change-Id: I9c457e9baeb546bfefacacddddd48996902e587a --- M debian/changelog 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index dce4dd4..3763f55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-hlr (0.2.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix luop crash: use buffer for APN that remains valid + * add gsup_test to catch OS#3231 + * add error handling to osmo_gsup_configure_wildcard_apn() + + -- Pau Espin Pedrol Fri, 04 May 2018 18:41:35 +0200 + osmo-hlr (0.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/8032 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c457e9baeb546bfefacacddddd48996902e587a Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 17:25:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 4 May 2018 17:25:42 +0000 Subject: [PATCH] libosmocore[master]: configure: Check separately for lib implementing dlopen and ... Message-ID: Review at https://gerrit.osmocom.org/8033 configure: Check separately for lib implementing dlopen and dlsym Sometimes the library probiding dlopen is not the same one providing dlsym. This is the case when compiling with AddressSanitizer enabled. In this case, AC_SEARCH_LIBS([dlopen]...) reports no lib is required, but tests using dlsym still require to link against -ldl. Change-Id: Ic619b0885688066b60c97caf1e2c7e5402c1d9f7 --- M configure.ac M src/Makefile.am M tests/Makefile.am 3 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/8033/1 diff --git a/configure.ac b/configure.ac index 7f2aabd..6f56176 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,10 @@ AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h netinet/tcp.h) # for src/conv.c AC_FUNC_ALLOCA -AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) -AC_SUBST(LIBRARY_DL) +AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DLOPEN) +AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DLSYM) # for src/backtrace.c AC_CHECK_LIB(execinfo, backtrace, BACKTRACE_LIB=-lexecinfo, BACKTRACE_LIB=) AC_SUBST(BACKTRACE_LIB) diff --git a/src/Makefile.am b/src/Makefile.am index 60b76b5..2a77d5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ if ENABLE_PLUGIN libosmocore_la_SOURCES += plugin.c -libosmocore_la_LIBADD += $(LIBRARY_DL) +libosmocore_la_LIBADD += $(LIBRARY_DLOPEN) endif if ENABLE_MSGFILE diff --git a/tests/Makefile.am b/tests/Makefile.am index cca128d..70b5cb8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -132,17 +132,17 @@ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c -gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c -gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la logging_logging_test_SOURCES = logging/logging_test.c fr_fr_test_SOURCES = fr/fr_test.c -fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la codec_codec_test_SOURCES = codec/codec_test.c -- To view, visit https://gerrit.osmocom.org/8033 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic619b0885688066b60c97caf1e2c7e5402c1d9f7 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Fri May 4 18:32:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:32:52 +0000 Subject: libosmocore[master]: configure: Check separately for lib implementing dlopen and ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8033 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic619b0885688066b60c97caf1e2c7e5402c1d9f7 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 18:32:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:32:57 +0000 Subject: libosmocore[master]: control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8031 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 18:33:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:33:07 +0000 Subject: [MERGED] libosmocore[master]: control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb ...................................................................... control_if: Avoid heap-use-after-free in osmo_wqueue_bfd_cb Imagine following scenario: 1- client connects to CTRL iface, a new conn is created with POLL_READ enabled. 2- A non-related event happens which triggers a TRAP to be sent. As a result, the wqueue for the conn has now enabled POLL_WRITE, and message will be sent next time we go through osmo_main_select(). 3- At the same time, we receive the GET cmd from the CTRL client, which means POLL_READ event will be also triggered next time we call osmo_main_select(). 4- osmo_main_select triggers osmo_wqueue_bfd_cb with both READ/WRITE flags set. 5- The read_cb of wqueue is executed first. The handler closes the CTRL conn for some reason, freeing the osmo_fd struct and returns. 6- osmo_qeueue_bfd_cb keeps using the already freed osmo_fd and calls write_cb. So in step 6 we get a heap-use-after-free catched by AddressSanitizer: 20180424135406115 DLCTRL <0018> control_if.c:506 accept()ed new CTRL connection from (r=10.42.42.1:53910<->l=10.42.42.7:4249) 20180424135406116 DLCTRL <0018> control_cmd.c:378 Command: GET bts.0.oml-connection-state 20180424135406117 DLINP <0013> bts_ipaccess_nanobts.c:417 Identified BTS 1/0/0 20180424135406118 DNM <0005> abis_nm.c:1628 Get Attr (bts=0) 20180424135406118 DNM <0005> abis_nm.c:1628 Get Attr (bts=0) 20180424135406118 DCTRL <000e> osmo_bsc_ctrl.c:158 BTS connection (re)established, sending TRAP. 20180424135406119 DLCTRL <0018> control_if.c:173 close()d CTRL connection (r=10.42.42.1:53910<->l=10.42.42.7:4249) ================================================================= ==12301==ERROR: AddressSanitizer: heap-use-after-free on address 0x611000003e04 at pc 0x7f23091c3a2f bp 0x7ffc0cb73ff0 sp 0x7ffc0cb73fe8 READ of size 4 at 0x611000003e04 thread T0 #0 0x7f23091c3a2e in osmo_wqueue_bfd_cb /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/write_queue.c:65 #1 0x7f23091ad5d8 in osmo_fd_disp_fds /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/select.c:216 #2 0x7f23091ad5d8 in osmo_select_main /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/libosmocore/src/select.c:256 #3 0x56538bdb7a26 in main /home/osmocom-build/jenkins/workspace/osmo-gsm-tester_build-osmo-bsc/osmo-bsc/src/osmo-bsc/osmo_bsc_main.c:532 #4 0x7f23077532e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) #5 0x56538bdb8999 in _start (/home/jenkins/workspace/osmo-gsm-tester_run-prod/trial-896/inst/osmo-bsc/bin/osmo-bsc+0x259999) Fixes: OS#3206 Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 --- M include/osmocom/core/write_queue.h M src/ctrl/control_if.c 2 files changed, 25 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 2303f87..071621d 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -42,11 +42,11 @@ /*! actual linked list implementing the queue */ struct llist_head msg_queue; - /*! call-back in case qeueue is readable */ + /*! call-back in case qeueue is readable. Return -EBADF if fd is freed inside cb. */ int (*read_cb)(struct osmo_fd *fd); - /*! call-back in case qeueue is writable */ + /*! call-back in case qeueue is writable. Return -EBADF if fd is freed inside cb. */ int (*write_cb)(struct osmo_fd *fd, struct msgb *msg); - /*! call-back in case qeueue has exceptions */ + /*! call-back in case qeueue has exceptions. Return -EBADF if fd is freed inside cb. */ int (*except_cb)(struct osmo_fd *fd); }; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index cc613ee..0ba2512 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -327,7 +327,7 @@ static int handle_control_read(struct osmo_fd * bfd) { - int ret = -1; + int ret; struct osmo_wqueue *queue; struct ctrl_connection *ccon; struct msgb *msg = NULL; @@ -337,27 +337,28 @@ ccon = container_of(queue, struct ctrl_connection, write_queue); ret = ipa_msg_recv_buffered(bfd->fd, &msg, &ccon->pending_msg); - if (ret <= 0) { - if (ret == -EAGAIN) - /* received part of a message, it is stored in ccon->pending_msg and there's - * nothing left to do now. */ - return 0; + if (ret == 0) { /* msg was already discarded. */ - if (ret == 0) { - control_close_conn(ccon); - ret = -EIO; - } - else - LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); - - return ret; + goto close_fd; + } else if (ret == -EAGAIN) { + /* received part of a message, it is stored in ccon->pending_msg and there's + * nothing left to do now. */ + return 0; + } else if (ret < 0) { + LOGP(DLCTRL, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); + return 0; } ret = ctrl_handle_msg(ctrl, ccon, msg); msgb_free(msg); if (ret) - control_close_conn(ccon); - return ret; + goto close_fd; + + return 0; + +close_fd: + control_close_conn(ccon); + return -EBADF; } int ctrl_handle_msg(struct ctrl_handle *ctrl, struct ctrl_connection *ccon, struct msgb *msg) @@ -435,12 +436,14 @@ ccon = container_of(queue, struct ctrl_connection, write_queue); rc = write(bfd->fd, msg->data, msg->len); - if (rc == 0) + if (rc == 0) { control_close_conn(ccon); - else if (rc != msg->len) + return -EBADF; + } + if (rc != msg->len) LOGP(DLCTRL, LOGL_ERROR, "Failed to write message to the CTRL connection.\n"); - return rc; + return 0; } /*! Allocate CTRL connection -- To view, visit https://gerrit.osmocom.org/8031 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84d10caaadcfa6bd46ba8756ca89aa0badcfd2e3 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 18:33:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:33:07 +0000 Subject: [MERGED] libosmocore[master]: configure: Check separately for lib implementing dlopen and ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: configure: Check separately for lib implementing dlopen and dlsym ...................................................................... configure: Check separately for lib implementing dlopen and dlsym Sometimes the library probiding dlopen is not the same one providing dlsym. This is the case when compiling with AddressSanitizer enabled. In this case, AC_SEARCH_LIBS([dlopen]...) reports no lib is required, but tests using dlsym still require to link against -ldl. Change-Id: Ic619b0885688066b60c97caf1e2c7e5402c1d9f7 --- M configure.ac M src/Makefile.am M tests/Makefile.am 3 files changed, 8 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 7f2aabd..6f56176 100644 --- a/configure.ac +++ b/configure.ac @@ -58,8 +58,10 @@ AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h netinet/tcp.h) # for src/conv.c AC_FUNC_ALLOCA -AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) -AC_SUBST(LIBRARY_DL) +AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DLOPEN) +AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DLSYM) # for src/backtrace.c AC_CHECK_LIB(execinfo, backtrace, BACKTRACE_LIB=-lexecinfo, BACKTRACE_LIB=) AC_SUBST(BACKTRACE_LIB) diff --git a/src/Makefile.am b/src/Makefile.am index 60b76b5..2a77d5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ if ENABLE_PLUGIN libosmocore_la_SOURCES += plugin.c -libosmocore_la_LIBADD += $(LIBRARY_DL) +libosmocore_la_LIBADD += $(LIBRARY_DLOPEN) endif if ENABLE_MSGFILE diff --git a/tests/Makefile.am b/tests/Makefile.am index cca128d..70b5cb8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -132,17 +132,17 @@ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c -gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c -gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la logging_logging_test_SOURCES = logging/logging_test.c fr_fr_test_SOURCES = fr/fr_test.c -fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) \ +fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \ $(top_builddir)/src/gsm/libosmogsm.la codec_codec_test_SOURCES = codec/codec_test.c -- To view, visit https://gerrit.osmocom.org/8033 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic619b0885688066b60c97caf1e2c7e5402c1d9f7 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 4 18:33:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:33:21 +0000 Subject: docker-playground[master]: Add osmo-*-latest Dockerfiles In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8030 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a564206dd81743deb1eb27eca7081bc333d7434 Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 4 18:33:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 18:33:24 +0000 Subject: [MERGED] docker-playground[master]: Add osmo-*-latest Dockerfiles In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Add osmo-*-latest Dockerfiles ...................................................................... Add osmo-*-latest Dockerfiles Those containers are using the OBS-built "latest" packages on Debian 9 Change-Id: I6a564206dd81743deb1eb27eca7081bc333d7434 --- A osmo-bsc-latest/.release A osmo-bsc-latest/Dockerfile A osmo-bsc-latest/Makefile A osmo-bsc-latest/Release.key A osmo-bsc-latest/osmo-bsc.cfg A osmo-bts-latest/.release A osmo-bts-latest/Dockerfile A osmo-bts-latest/Makefile A osmo-bts-latest/Release.key A osmo-bts-latest/osmo-bts.cfg A osmo-bts-latest/respawn.sh A osmo-ggsn-latest/.release A osmo-ggsn-latest/Dockerfile A osmo-ggsn-latest/Makefile A osmo-ggsn-latest/Release.key A osmo-ggsn-latest/osmo-ggsn.cfg A osmo-hlr-latest/.release A osmo-hlr-latest/Dockerfile A osmo-hlr-latest/Makefile A osmo-hlr-latest/Release.key A osmo-hlr-latest/osmo-hlr.cfg A osmo-hnbgw-latest/.release A osmo-hnbgw-latest/Dockerfile A osmo-hnbgw-latest/Makefile A osmo-hnbgw-latest/Release.key A osmo-hnbgw-latest/osmo-hnbgw.cfg A osmo-mgw-latest/.release A osmo-mgw-latest/Dockerfile A osmo-mgw-latest/Makefile A osmo-mgw-latest/Release.key A osmo-mgw-latest/osmo-mgw.cfg A osmo-msc-latest/.release A osmo-msc-latest/Dockerfile A osmo-msc-latest/Makefile A osmo-msc-latest/Release.key A osmo-msc-latest/osmo-msc.cfg A osmo-sgsn-latest/.release A osmo-sgsn-latest/Dockerfile A osmo-sgsn-latest/Makefile A osmo-sgsn-latest/Release.key A osmo-sgsn-latest/osmo-sgsn.cfg A osmo-sip-latest/.release A osmo-sip-latest/Dockerfile A osmo-sip-latest/Makefile A osmo-sip-latest/Release.key A osmo-sip-latest/osmo-sip-connector.cfg A osmo-stp-latest/.release A osmo-stp-latest/Dockerfile A osmo-stp-latest/Makefile A osmo-stp-latest/Release.key A osmo-stp-latest/osmo-stp.cfg 51 files changed, 1,337 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-bsc-latest/.release b/osmo-bsc-latest/.release new file mode 100644 index 0000000..07f178d --- /dev/null +++ b/osmo-bsc-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-bsc-latest-0.0.0 diff --git a/osmo-bsc-latest/Dockerfile b/osmo-bsc-latest/Dockerfile new file mode 100644 index 0000000..1682dea --- /dev/null +++ b/osmo-bsc-latest/Dockerfile @@ -0,0 +1,34 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-bsc \ + osmo-bsc-ipaccess-utils && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-bsc.cfg /data/osmo-bsc.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"] + +EXPOSE 3003 3002 4242 diff --git a/osmo-bsc-latest/Makefile b/osmo-bsc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-bsc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-bsc-latest/Release.key b/osmo-bsc-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-bsc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg new file mode 100644 index 0000000..4176cae --- /dev/null +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -0,0 +1,360 @@ +! +! OsmoBSC (1.0.1.122-630df) configuration saved from vty +!! +password foo +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + dyn_ts_allow_tch_f 1 + periodic location update 30 + timer t3113 10 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1234 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 2 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1235 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1235 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1235 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1235 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 2 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1236 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1236 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1236 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1236 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + ip.access rtp-base 4000 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + dest 192.168.100.11 6666 0 + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden + codec-list fr1 fr2 fr3 +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list diff --git a/osmo-bts-latest/.release b/osmo-bts-latest/.release new file mode 100644 index 0000000..f7ba498 --- /dev/null +++ b/osmo-bts-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-bts-latest-0.0.0 diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile new file mode 100644 index 0000000..05dcb24 --- /dev/null +++ b/osmo-bts-latest/Dockerfile @@ -0,0 +1,38 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-bts-trx \ + osmo-bts-virtual && \ + apt-get clean + +ADD respawn.sh /usr/local/bin/respawn.sh + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-bts.cfg /data/osmo-bts.cfg + +WORKDIR /data + # send GSMTAP data to .230 which is the ttcn3-sysinfo test +CMD ["/usr/bin/osmo-bts-virtual", "-i", "172.18.0.230"] + +#EXPOSE diff --git a/osmo-bts-latest/Makefile b/osmo-bts-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-bts-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-bts-latest/Release.key b/osmo-bts-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-bts-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-bts-latest/osmo-bts.cfg b/osmo-bts-latest/osmo-bts.cfg new file mode 100644 index 0000000..e8feff5 --- /dev/null +++ b/osmo-bts-latest/osmo-bts.cfg @@ -0,0 +1,75 @@ +! +! OsmoBTS (0.4.0.561-6b83-dirty) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level all everything + logging level rsl info + logging level oml debug + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level pcu debug + logging level ho notice + logging level trx notice + logging level loop notice + logging level abis debug + logging level rtp notice + logging level sum notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +phy 0 + !virtual-um ms-multicast-group 239.193.23.1 + !virtual-um bts-multicast-group 239.193.23.2 + instance 0 +bts 0 + band DCS1800 + ipa unit-id 1234 0 + oml remote-ip 172.18.5.20 + rtp jitter-buffer 100 + paging queue-size 200 + paging lifetime 0 + uplink-power-target -75 + gsmtap-sapi bcch + gsmtap-sapi ccch + gsmtap-sapi agch + gsmtap-sapi pch + min-qual-rach 50 + min-qual-norm -5 + trx 0 + power-ramp max-initial 23000 mdBm + power-ramp step-size 2000 mdB + power-ramp step-interval 1 + ms-power-control dsp + phy 0 instance 0 diff --git a/osmo-bts-latest/respawn.sh b/osmo-bts-latest/respawn.sh new file mode 100755 index 0000000..ae5cf60 --- /dev/null +++ b/osmo-bts-latest/respawn.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +trap "kill 0" EXIT + +while [ -e /etc/passwd ]; do + $* & + LAST_PID=$! + wait $LAST_PID +done diff --git a/osmo-ggsn-latest/.release b/osmo-ggsn-latest/.release new file mode 100644 index 0000000..af2e5df --- /dev/null +++ b/osmo-ggsn-latest/.release @@ -0,0 +1,2 @@ +release=0.1.0 +tag=osmo-ggsn-latest-0.1.0 diff --git a/osmo-ggsn-latest/Dockerfile b/osmo-ggsn-latest/Dockerfile new file mode 100644 index 0000000..c1ff3dc --- /dev/null +++ b/osmo-ggsn-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-ggsn && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-ggsn.cfg /data/osmo-ggsn.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-ggsn"] + +EXPOSE 3386/udp 2123/udp 2152/udp 4257/tcp 4260/tcp diff --git a/osmo-ggsn-latest/Makefile b/osmo-ggsn-latest/Makefile new file mode 100644 index 0000000..0142467 --- /dev/null +++ b/osmo-ggsn-latest/Makefile @@ -0,0 +1,10 @@ +RUN_ARGS?= \ + --rm \ + --cap-add=NET_ADMIN --device /dev/net/tun:/dev/net/tun \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --sysctl net.ipv6.conf.all.forwarding=1 \ + --network sigtran --ip 172.18.0.201 \ + -v ggsn-vol:/data \ + --stop-signal SIGINT + +include ../make/Makefile diff --git a/osmo-ggsn-latest/Release.key b/osmo-ggsn-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-ggsn-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-ggsn-latest/osmo-ggsn.cfg b/osmo-ggsn-latest/osmo-ggsn.cfg new file mode 100644 index 0000000..b828789 --- /dev/null +++ b/osmo-ggsn-latest/osmo-ggsn.cfg @@ -0,0 +1,99 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log file /data/openggsn.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 172.18.0.201 + apn internet + gtpu-mode tun + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.222.0/24 + ip dns 0 192.168.100.1 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.222.0/24 + no shutdown + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 2001:4860:4860::8888 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + apn inet46 + gtpu-mode tun + tun-device tun46 + type-support v4v6 + ip prefix dynamic 176.16.46.0/24 + ip dns 0 192.168.100.1 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.46.0/24 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 2001:4860:4860::8888 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 + no shutdown + default-apn internet + no shutdown ggsn diff --git a/osmo-hlr-latest/.release b/osmo-hlr-latest/.release new file mode 100644 index 0000000..2ef6141 --- /dev/null +++ b/osmo-hlr-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-hlr-latest-0.0.0 diff --git a/osmo-hlr-latest/Dockerfile b/osmo-hlr-latest/Dockerfile new file mode 100644 index 0000000..b54eef4 --- /dev/null +++ b/osmo-hlr-latest/Dockerfile @@ -0,0 +1,33 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libdbd-sqlite3 \ + osmo-hlr \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-hlr.cfg /data/osmo-hlr.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-hlr"] + +EXPOSE 4222 4258 4259 diff --git a/osmo-hlr-latest/Makefile b/osmo-hlr-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-hlr-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-hlr-latest/Release.key b/osmo-hlr-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-hlr-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-hlr-latest/osmo-hlr.cfg b/osmo-hlr-latest/osmo-hlr.cfg new file mode 100644 index 0000000..71a76c8 --- /dev/null +++ b/osmo-hlr-latest/osmo-hlr.cfg @@ -0,0 +1,19 @@ +! +! OsmoHLR example configuration +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error +! +line vty + bind 0.0.0.0 +ctrl + bind 0.0.0.0 +hlr + gsup + bind ip 0.0.0.0 diff --git a/osmo-hnbgw-latest/.release b/osmo-hnbgw-latest/.release new file mode 100644 index 0000000..877f1f8 --- /dev/null +++ b/osmo-hnbgw-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-hnbgw-latest-0.0.0 diff --git a/osmo-hnbgw-latest/Dockerfile b/osmo-hnbgw-latest/Dockerfile new file mode 100644 index 0000000..4456c8e --- /dev/null +++ b/osmo-hnbgw-latest/Dockerfile @@ -0,0 +1,30 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-hnbgw && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-hnbgw.cfg /data/osmo-hnbgw.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-hnbgw", "-c", "/data/osmo-hnbgw.cfg"] diff --git a/osmo-hnbgw-latest/Makefile b/osmo-hnbgw-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-hnbgw-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-hnbgw-latest/Release.key b/osmo-hnbgw-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-hnbgw-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-hnbgw-latest/osmo-hnbgw.cfg b/osmo-hnbgw-latest/osmo-hnbgw.cfg new file mode 100644 index 0000000..8bffd76 --- /dev/null +++ b/osmo-hnbgw-latest/osmo-hnbgw.cfg @@ -0,0 +1,37 @@ +! +! OsmoHNBGW (0) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice +cs7 instance 0 + point-code 0.23.5 + asp asp-clnt-OsmoHNBGW 2905 0 m3ua + remote-ip 172.18.0.200 + sccp-address msc + point-code 0.23.2 + sccp-address sgsn + point-code 0.23.4 +hnbgw + iuh + local-ip 172.18.0.170 + hnbap-allow-tmsi 1 + iucs + remote-addr msc + iups + remote-addr sgsn diff --git a/osmo-mgw-latest/.release b/osmo-mgw-latest/.release new file mode 100644 index 0000000..16d398c --- /dev/null +++ b/osmo-mgw-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-mgw-latest-0.0.0 diff --git a/osmo-mgw-latest/Dockerfile b/osmo-mgw-latest/Dockerfile new file mode 100644 index 0000000..e0afb1c --- /dev/null +++ b/osmo-mgw-latest/Dockerfile @@ -0,0 +1,31 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-mgw && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data + +COPY osmo-mgw.cfg /data/osmo-mgw.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-mgw"] diff --git a/osmo-mgw-latest/Makefile b/osmo-mgw-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-mgw-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-mgw-latest/Release.key b/osmo-mgw-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-mgw-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-mgw-latest/osmo-mgw.cfg b/osmo-mgw-latest/osmo-mgw.cfg new file mode 100644 index 0000000..4bdde6b --- /dev/null +++ b/osmo-mgw-latest/osmo-mgw.cfg @@ -0,0 +1,52 @@ +! +! OsmoMGW (1.2.0.17-52e3) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp debug +! +stats interval 5 +! +line vty + no login +! +mgcp + bind ip 172.18.0.180 + bind port 2427 + rtp port-range 4002 16000 + rtp bind-ip 172.18.0.180 + rtp ip-probing + rtp ip-dscp 184 + no rtp keep-alive + no rtcp-omit + no rtp-patch + sdp audio-payload number 98 + sdp audio-payload name GSM + sdp audio-payload send-ptime + sdp audio-payload send-name + loop 0 + number endpoints 31 + allow-transcoding + osmux off diff --git a/osmo-msc-latest/.release b/osmo-msc-latest/.release new file mode 100644 index 0000000..5a4f385 --- /dev/null +++ b/osmo-msc-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-msc-latest-0.0.0 diff --git a/osmo-msc-latest/Dockerfile b/osmo-msc-latest/Dockerfile new file mode 100644 index 0000000..02298e7 --- /dev/null +++ b/osmo-msc-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-msc \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-msc.cfg /data/osmo-msc.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-msc"] + +#EXPOSE diff --git a/osmo-msc-latest/Makefile b/osmo-msc-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-msc-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-msc-latest/Release.key b/osmo-msc-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-msc-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-msc-latest/osmo-msc.cfg b/osmo-msc-latest/osmo-msc.cfg new file mode 100644 index 0000000..1261160 --- /dev/null +++ b/osmo-msc-latest/osmo-msc.cfg @@ -0,0 +1,21 @@ +! +! OsmoMSC configuration saved from vty +! +line vty + no login +! +network + network country code 1 + mobile network code 1 + short name OsmoMSC + long name OsmoMSC + auth policy closed + location updating reject cause 13 + encryption a5 0 + rrlp mode none + mm info 1 +msc + mgw remote-ip 10.23.24.1 + assign-tmsi + auth-tuple-max-reuse-count 3 + auth-tuple-reuse-on-error 1 diff --git a/osmo-sgsn-latest/.release b/osmo-sgsn-latest/.release new file mode 100644 index 0000000..edfff32 --- /dev/null +++ b/osmo-sgsn-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-sgsn-latest-0.0.0 diff --git a/osmo-sgsn-latest/Dockerfile b/osmo-sgsn-latest/Dockerfile new file mode 100644 index 0000000..56b5fda --- /dev/null +++ b/osmo-sgsn-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + telnet \ + osmo-sgsn && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-sgsn.cfg /data/osmo-sgsn.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-sgsn"] + +EXPOSE 23000/udp 4245/tcp 4249/tcp diff --git a/osmo-sgsn-latest/Makefile b/osmo-sgsn-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-sgsn-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-sgsn-latest/Release.key b/osmo-sgsn-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-sgsn-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-sgsn-latest/osmo-sgsn.cfg b/osmo-sgsn-latest/osmo-sgsn.cfg new file mode 100644 index 0000000..6db56b7 --- /dev/null +++ b/osmo-sgsn-latest/osmo-sgsn.cfg @@ -0,0 +1,24 @@ +! +! Osmocom SGSN (0.9.0.474-0ede2) configuration saved from vty +!! +! +line vty + no login + bind 0.0.0.0 +! +sgsn + gtp local-ip 172.18.0.21 + ggsn 0 remote-ip 172.18.0.201 + ggsn 0 gtp-version 1 +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + encapsulation udp local-ip 172.18.0.21 + encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 0 +bssgp diff --git a/osmo-sip-latest/.release b/osmo-sip-latest/.release new file mode 100644 index 0000000..05de073 --- /dev/null +++ b/osmo-sip-latest/.release @@ -0,0 +1,2 @@ +release=0.0.0 +tag=osmo-sip-latest-0.0.0 diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile new file mode 100644 index 0000000..9f978d8 --- /dev/null +++ b/osmo-sip-latest/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-sip-connector \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg + +WORKDIR /data +CMD ["/usr/bin/osmo-sip-connector"] + +#EXPOSE diff --git a/osmo-sip-latest/Makefile b/osmo-sip-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-sip-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-sip-latest/Release.key b/osmo-sip-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-sip-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-sip-latest/osmo-sip-connector.cfg b/osmo-sip-latest/osmo-sip-connector.cfg new file mode 100644 index 0000000..ad42969 --- /dev/null +++ b/osmo-sip-latest/osmo-sip-connector.cfg @@ -0,0 +1,6 @@ +app +mncc + socket-path /tmp/bsc_mncc +sip + local 0.0.0.0 5060 + remote pbx 5060 diff --git a/osmo-stp-latest/.release b/osmo-stp-latest/.release new file mode 100644 index 0000000..4d6775c --- /dev/null +++ b/osmo-stp-latest/.release @@ -0,0 +1,2 @@ +release=0.1.0 +tag=osmo-stp-latest-0.1.0 diff --git a/osmo-stp-latest/Dockerfile b/osmo-stp-latest/Dockerfile new file mode 100644 index 0000000..f5920a5 --- /dev/null +++ b/osmo-stp-latest/Dockerfile @@ -0,0 +1,31 @@ +FROM debian:stretch + +MAINTAINER Harald Welte + +ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/" + +COPY Release.key /tmp/Release.key + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gnupg + +RUN apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list + +ADD $OSMOCOM_REPO/Release /tmp/Release +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + osmo-stp \ + telnet && \ + apt-get clean + +WORKDIR /tmp + +VOLUME /data +COPY osmo-stp.cfg /data/ + +CMD ["/usr/bin/osmo-stp", "-c", "/data/osmo-stp.cfg"] + +EXPOSE 2905 14001 4239 diff --git a/osmo-stp-latest/Makefile b/osmo-stp-latest/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-stp-latest/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-stp-latest/Release.key b/osmo-stp-latest/Release.key new file mode 100644 index 0000000..e656238 --- /dev/null +++ b/osmo-stp-latest/Release.key @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFJBt/wBCADAht3d/ilNuyzaXYw/QwTRvmjyoDvfXw+H/3Fvk1zlDZoiKPPc +a1wCVBINUZl7vYM2OXqbJwYa++JP2Q48xKSvC6thbRc/YLievkbcvTemf7IaREfl +CTjoYpoqXHa9kHMw1aALDm8CNU88jZmnV7v9L6hKkbYDxie+jpoj7D6B9JlxgNJ4 +5dQyRNsFGVcIl4Vplt1HyGc5Q5nQI/VgS2rlF/IOXmhRQBc4LEDdU8R2IKnkU4ee +S7TWanAigGAQhxGuCkS39/CWzc1DhLhjlNhBl/+RTPejkqJtAy00ZLps3+RqUN1Y +CU/Fsr7aRlYVGqQ/BlptwV0XQ2VVYJX2oEBBABEBAAG0MG5ldHdvcmsgT0JTIFBy +b2plY3QgPG5ldHdvcmtAYnVpbGQub3BlbnN1c2Uub3JnPokBPAQTAQIAJgUCWmMc +aQIbAwUJDEAUbQYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEGLrGgkXKA3fjsoI +ALSXmXzFCpTxg8a6tvXkqddY/qAmeBMNUf7hslI9wN3leNmCrnuHS8TbHWYJZgtw +8M5fKL3aRQYaIiqqm1XOUF0OqwYNDj5V3y38mM68NYOkzgSP7foMwZp9Y0TlGhtI +L8weA+2RUjB4hwwGMAYMqkRZyKW3NhPqdlGGoXac1ilwEyGXFHdOLbkhtyS+P2yb +/EvaKIN5cMLzRZKeYgdp9WuAirV+yV/SDbgvabW098lrWhGLltlRRDQgMV883p8I +ERMI1wlLFZGnHL3mfBWGeQ24M/DaBOdXQDtfBLCJ9nGztmDBUb8i6GFWU7nD2TGi +8mYUsED1ZDwO/0jdvJ4gSluIRgQTEQIABgUCUkG3/AAKCRA7MBG3a51lIzhdAJ9v +d6XPffMZRcCGgDEY5OaTn/MsCQCgrXbeZpFJgnirSrc8rRonvzYFiF4= +=Gvly +-----END PGP PUBLIC KEY BLOCK----- diff --git a/osmo-stp-latest/osmo-stp.cfg b/osmo-stp-latest/osmo-stp.cfg new file mode 100644 index 0000000..aab7f32 --- /dev/null +++ b/osmo-stp-latest/osmo-stp.cfg @@ -0,0 +1,71 @@ +! +! osmo-stp (0.0.6.3.179-b248) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 0 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +log file /data/osmo-stp.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level lglobal notice + logging level llapd notice + logging level linp debug + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 debug + logging level lsccp debug + logging level lsua debug + logging level lm3ua debug +! +line vty + no login + bind 0.0.0.0 +! +cs7 instance 0 + asp asp0 0 2905 m3ua + remote-ip 172.18.0.2 + asp asp-s-0 0 14001 sua + remote-ip 172.18.0.3 + as as0 m3ua + asp asp0 + routing-key 23 0.2.7 + as as-s-0 sua + asp asp-s-0 + routing-key 24 0.3.0 + route-table system + update route 0.2.7 0.2.7 linkset as0 + update route 0.3.0 0.3.0 linkset as-s-0 + listen m3ua 2905 + local-ip 172.18.0.200 + listen sua 14001 + local-ip 172.18.0.200 -- To view, visit https://gerrit.osmocom.org/8030 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a564206dd81743deb1eb27eca7081bc333d7434 Gerrit-PatchSet: 1 Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte From gerrit-no-reply at lists.osmocom.org Fri May 4 19:00:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 19:00:57 +0000 Subject: [PATCH] libosmocore[master]: lapdm: Implement SABM related constraints In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7960 to look at the new patch set (#2). lapdm: Implement SABM related constraints * MO SAPI0 establishment *must always* have L3 payload for contention resolution * SAPI3 establishment *must never* use contention resolution * MT establish must never use contention resolution Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Closes: OS#2370 --- M src/gsm/lapdm.c 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/7960/2 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index ae21ccd..1e81bff 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -48,6 +48,8 @@ #include #include +#define LAPD_U_SABM 0x7 + /* TS 04.06 Figure 4 / Section 3.2 */ #define LAPDm_LPD_NORMAL 0 #define LAPDm_LPD_SMSCB 1 @@ -537,6 +539,42 @@ return rc; } +/* determine if receiving a given LAPDm message is not permitted */ +static int lapdm_rx_not_permitted(const struct lapdm_entity *le, + const struct lapd_msg_ctx *lctx) +{ + /* we currently only implement SABM related checks here */ + if (lctx->format != LAPD_FORM_U || lctx->s_u != LAPD_U_SABM) + return 0; + + if (le->mode == LAPDM_MODE_BTS) { + if (le == &le->lapdm_ch->lapdm_acch) { + /* no contention resolution on SACCH */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + } else { + switch (lctx->sapi) { + case 0: + /* SAPI0 must use contention resolution, i.e. L3 payload must exist */ + if (lctx->length == 0) + return RLL_CAUSE_UFRM_INC_PARAM; + break; + case 3: + /* SAPI3 doesn't support contention resolution */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + break; + } + } + } else if (le->mode == LAPDM_MODE_MS) { + /* contention resolution (L3 present) is only sent by MS, but + * never received by it */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + } + return 0; +} + /* input into layer2 (from layer 1) */ static int l2_ph_data_ind(struct msgb *msg, struct lapdm_entity *le, uint8_t chan_nr, uint8_t link_id) @@ -674,6 +712,13 @@ } /* store context for messages from lapd */ memcpy(&mctx.dl->mctx, &mctx, sizeof(mctx.dl->mctx)); + rc =lapdm_rx_not_permitted(le, &lctx); + if (rc > 0) { + LOGP(DLLAPD, LOGL_NOTICE, "received message not permitted"); + msgb_free(msg); + rsl_rll_error(rc, &mctx); + return -EINVAL; + } /* send to LAPD */ rc = lapd_ph_data_ind(msg, &lctx); break; -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Fri May 4 19:00:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 4 May 2018 19:00:58 +0000 Subject: [PATCH] libosmocore[master]: lapdm: Fix back-pointer from lapdm_entity to lapdm_channel Message-ID: Review at https://gerrit.osmocom.org/8034 lapdm: Fix back-pointer from lapdm_entity to lapdm_channel It seems that during all those years it has never been noted that the back-pointer from the lapdm_entity to the lapdm_channel was never initialized. Let's fix that. Change-Id: Iaca66cd6a2c9f315561e365b51163927868fc346 --- M src/gsm/lapdm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/8034/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 6a16012..ae21ccd 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -169,8 +169,10 @@ void lapdm_channel_init(struct lapdm_channel *lc, enum lapdm_mode mode) { lapdm_entity_init(&lc->lapdm_acch, mode, 2); + lc->lapdm_acch.lapdm_ch = lc; /* FIXME: this depends on chan type */ lapdm_entity_init(&lc->lapdm_dcch, mode, 1); + lc->lapdm_dcch.lapdm_ch = lc; } /*! flush and release all resoures in LAPDm entity */ -- To view, visit https://gerrit.osmocom.org/8034 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaca66cd6a2c9f315561e365b51163927868fc346 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From jenkins at lists.osmocom.org Fri May 4 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 4 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#24?= In-Reply-To: <1898314473.345.1525387280627.JavaMail.jenkins@jenkins.osmocom.org> References: <1898314473.345.1525387280627.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <433736721.362.1525473680568.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-5283/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-5283/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-5283/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-5283/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-5283/ libtool: install: (cd /tmp/am-dc-5283/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-5283/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-5283/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-5283/ libtool: install: chmod 644 /tmp/am-dc-5283/ libtool: install: ranlib /tmp/am-dc-5283/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-5283/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-5283/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-5283/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-5283/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-5283/ /bin/mkdir -p '/tmp/am-dc-5283/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-5283/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-5283/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-5283/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-5283/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-5283/ libtool: uninstall: rm -f /tmp/am-dc-5283/ /tmp/am-dc-5283/ /tmp/am-dc-5283/ /tmp/am-dc-5283/ /tmp/am-dc-5283/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-5283/ && rm -f html.tar ) ( cd '/tmp/am-dc-5283/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-5283/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Sat May 5 00:01:35 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 5 May 2018 00:01:35 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bts_=C2=BB_sysmo,s?= =?UTF-8?Q?uperfemto=5Fv3.1,default,osmocom-master-debian9_#595?= Message-ID: <172520243.363.1525478495511.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 58.74 KB...] flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/codec make[2]: Entering directory ' CC gsm610.lo CC gsm620.lo CC gsm660.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la ' libtool: warning: relinking 'libosmocodec.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:0:1 -no-undefined -o libosmocodec.la -rpath gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.0T libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.0 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.0 libosmocodec.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocodec.so.0.1.0 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.0 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gsm make[2]: Entering directory ' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory ' CC a5.lo CC rxlev_stat.lo CC comp128.lo CC rsl.lo CC comp128v23.lo CC gsm48.lo CC tlv_parser.lo CC gsm_utils.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^~~~~~~ gsm_utils.c: In function ?osmo_get_rand_id?: gsm_utils.c:448:9: note: #pragma message: Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25 #pragma message ("Using direct syscall access for getrandom(): consider upgrading to glibc >= 2.25") ^~~~~~~ gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^~~~~~~ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo CC bts_features.lo CC milenage/aes-encblock.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CCLD libgsmint.la ar: `u' modifier ignored since `D' is the default (see `U') CCLD libosmogsm.la make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmogsm.la ' libtool: warning: relinking 'libosmogsm.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmogsm.map -version-info 9:0:0 -no-undefined -o libosmogsm.la -rpath libgsmint.la -ltalloc -lgnutls ) libtool: install: /usr/bin/install -c .libs/libosmogsm.so.9.0.0T libtool: install: (cd && { ln -s -f libosmogsm.so.9.0.0 libosmogsm.so.9 || { rm -f libosmogsm.so.9 && ln -s libosmogsm.so.9.0.0 libosmogsm.so.9; }; }) libtool: install: (cd && { ln -s -f libosmogsm.so.9.0.0 libosmogsm.so || { rm -f libosmogsm.so && ln -s libosmogsm.so.9.0.0 libosmogsm.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmogsm.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/coding make[2]: Entering directory ' CC gsm0503_interleaving.lo CC gsm0503_mapping.lo CC gsm0503_parity.lo CC gsm0503_tables.lo CC gsm0503_coding.lo CCLD libosmocoding.la make[3]: Entering directory ' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p ' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocoding.la ' libtool: warning: relinking 'libosmocoding.la' libtool: install: (cd /bin/bash " --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -Wl,--version-script=./libosmocoding.map -version-info 1:0:1 -no-undefined -ltalloc -o libosmocoding.la -rpath gsm0503_interleaving.lo gsm0503_mapping.lo gsm0503_tables.lo gsm0503_parity.lo gsm0503_coding.lo ../libosmocore.la ../gsm/libosmogsm.la ../codec/libosmocodec.la ) libtool: install: /usr/bin/install -c .libs/libosmocoding.so.0.1.0T libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.0 libosmocoding.so.0 || { rm -f libosmocoding.so.0 && ln -s libosmocoding.so.0.1.0 libosmocoding.so.0; }; }) libtool: install: (cd && { ln -s -f libosmocoding.so.0.1.0 libosmocoding.so || { rm -f libosmocoding.so && ln -s libosmocoding.so.0.1.0 libosmocoding.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocoding.lai libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src/gb make[2]: Entering directory ' CC gprs_ns_frgre.lo CC gprs_ns.lo CC gprs_ns_vty.lo CC gprs_bssgp_vty.lo CC gprs_bssgp.lo CC gprs_bssgp_util.lo CC gprs_bssgp_bss.lo CC common_vty.lo /bin/bash: line 2: 11059 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../include -DBUILDING_LIBOSMOCORE -Wall -Wall -fno-strict-aliasing -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT gprs_bssgp_bss.lo -MD -MP -MF $depbase.Tpo -c -o gprs_bssgp_bss.lo gprs_bssgp_bss.c Makefile:484: recipe for target 'gprs_bssgp_bss.lo' failed make[2]: *** [gprs_bssgp_bss.lo] Error 139 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:601: recipe for target 'install-recursive' failed make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory ' Makefile:900: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sat May 5 00:49:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 5 May 2018 00:49:28 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bts_=C2=BB_sy?= =?UTF-8?Q?smo,superfemto=5Fv3.1,default,osmocom-master-debian9_#596?= In-Reply-To: <172520243.363.1525478495511.JavaMail.jenkins@jenkins.osmocom.org> References: <172520243.363.1525478495511.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <420778519.365.1525481368200.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat May 5 14:31:12 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 14:31:12 +0000 Subject: [PATCH] libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7844 to look at the new patch set (#2). add gsm0808 channel enum to IE val conversion functions Add: - gsm0808_current_channel_type_1() - gsm0808_permitted_speech() - gsm0808_chosen_channel() - gsm0808_channel_type_name() gsm0808_permitted_speech() is moved from osmo-bsc's bssap_speech_from_lchan(); gsm0808_chosen_channel() is moved from osmo-bsc's lchan_to_chosen_channel(); Rationale: will be re-used by inter-BSC handover, makes sense to keep with the other gsm0808 utils. Related: OS#2283 (inter-BSC handover, BSC side) Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 117 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/7844/2 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 8cdb74b..24c139a 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -26,7 +26,9 @@ struct sockaddr_storage; #include +#include #include +#include /*! (225-1)/2 is the maximum number of elements in a cell identifier list. */ #define GSM0808_CELL_ID_LIST2_MAXLEN 127 @@ -102,4 +104,109 @@ int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +/*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ +static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) +{ + switch (type) { + default: + return 0; + case GSM_LCHAN_SDCCH: + return 0x01; + case GSM_LCHAN_TCH_F: + return 0x18; + case GSM_LCHAN_TCH_H: + return 0x19; + } +} + +/*! Return 3GPP TS 48.008 3.2.2.51 Speech Version aka permitted speech version indication in 3.2.2.11 + * Channel Type. */ +static inline enum gsm0808_permitted_speech gsm0808_permitted_speech(enum gsm_chan_t type, + enum gsm48_chan_mode mode) +{ + switch (mode) { + case GSM48_CMODE_SPEECH_V1: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_FR1; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR1; + default: + return 0; + } + case GSM48_CMODE_SPEECH_EFR: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_FR2; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR2; + default: + return 0; + } + case GSM48_CMODE_SPEECH_AMR: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_HR3; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR3; + default: + return 0; + } + default: + return 0; + } +} + +/*! Return 3GPP TS 48.008 3.2.2.33 Chosen Channel. */ +static inline uint8_t gsm0808_chosen_channel(enum gsm_chan_t type, enum gsm48_chan_mode mode) +{ + uint8_t channel_mode = 0, channel = 0; + + switch (mode) { + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + channel_mode = 0x9; + break; + case GSM48_CMODE_SIGN: + channel_mode = 0x8; + break; + case GSM48_CMODE_DATA_14k5: + channel_mode = 0xe; + break; + case GSM48_CMODE_DATA_12k0: + channel_mode = 0xb; + break; + case GSM48_CMODE_DATA_6k0: + channel_mode = 0xc; + break; + case GSM48_CMODE_DATA_3k6: + channel_mode = 0xd; + break; + default: + return 0; + } + + switch (type) { + case GSM_LCHAN_NONE: + channel = 0x0; + break; + case GSM_LCHAN_SDCCH: + channel = 0x1; + break; + case GSM_LCHAN_TCH_F: + channel = 0x8; + break; + case GSM_LCHAN_TCH_H: + channel = 0x9; + break; + default: + return 0; + } + + return channel_mode << 4 | channel; +} + +const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct); + /*! @} */ diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 8ef8e24..2c659bb 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1273,4 +1273,13 @@ #undef APPEND_STR #undef APPEND_CELL_ID_U +const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct) +{ + static char buf[128]; + snprintf(buf, sizeof(buf), "ch_indctr=0x%x ch_rate_type=0x%x perm_spch=%s", + ct->ch_indctr, ct->ch_rate_type, + osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + return buf; +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index f04fd58..8c64020 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -188,6 +188,7 @@ gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_speech_codec_type_names; +gsm0808_channel_type_name; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:18 +0000 Subject: [PATCH] osmo-bts[master]: cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch Message-ID: Review at https://gerrit.osmocom.org/8035 cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch Use a switch statement and ample comments to clarify what is done and why. Cosmetically prepares for Ic06c8f0fe82ae8a06afa5defd93a685010687965. Related: OS#3235 Change-Id: I8a9953b011a4516972aae468754494f57ebc0a3f --- M src/common/rsl.c 1 file changed, 41 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/8035/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 9adb89a..d46a5f5 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -618,16 +618,48 @@ { struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr(lchan); + bool send_rel_ack; - /* - * Normally, PDCH deactivation via PCU does not ack back to the BSC. - * But for GSM_PCHAN_TCH_F_TCH_H_PDCH, send a non-standard rel ack for - * LCHAN_REL_ACT_PCU, since the rel req came from RSL initially. - */ - if (lchan->rel_act_kind != LCHAN_REL_ACT_RSL - && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH - && lchan->rel_act_kind == LCHAN_REL_ACT_PCU)) { + switch (lchan->rel_act_kind) { + case LCHAN_REL_ACT_RSL: + send_rel_ack = true; + break; + + case LCHAN_REL_ACT_PCU: + switch (lchan->ts->pchan) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) { + LOGP(DRSL, LOGL_ERROR, + "%s (ss=%d) PDCH release: not in PDCH mode\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr); + /* well, what to do about it ... carry on and hope it's fine. */ + } + /* Continue to ack the release below. (This is a non-standard rel ack invented + * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */ + send_rel_ack = true; + break; + case GSM_PCHAN_TCH_F_PDCH: + /* GSM_PCHAN_TCH_F_PDCH, does not require a rel ack. The caller + * l1sap_info_rel_cnf() will continue with bts_model_ts_disconnect(). */ + send_rel_ack = false; + break; + default: + LOGP(DRSL, LOGL_ERROR, "%s PCU rel ack for unexpected lchan kind\n", + gsm_lchan_name(lchan)); + /* Release certainly was not requested by the BSC via RSL, so don't ack. */ + send_rel_ack = false; + break; + } + break; + + default: + /* A rel that was not requested by the BSC via RSL, hence not sending a rel ack to the + * BSC. */ + send_rel_ack = false; + break; + } + + if (!send_rel_ack) { LOGP(DRSL, LOGL_NOTICE, "%s not sending REL ACK\n", gsm_lchan_name(lchan)); return 0; -- To view, visit https://gerrit.osmocom.org/8035 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a9953b011a4516972aae468754494f57ebc0a3f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:19 +0000 Subject: [PATCH] osmo-bts[master]: dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDC... Message-ID: Review at https://gerrit.osmocom.org/8036 dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDCH TS When a release of PDCH is complete, actually set the dyn.pchan_is to NONE. Failure to do so currently caused errors on activation of an Osmocom style dyn TS as TCH, in the shape of: rsl.c:636 (bts=0,trx=0,ts=2,ss=0) Tx RF CHAN REL ACK rsl.c:164 (bts=0,trx=0,ts=2,pchan=TCH/F_TCH/H_PDCH switching PDCH -> NONE) RSL rx DCHAN: mismatching chan_nr=0x12 rsl.c:2611 Rx RSL CHAN_ACTIV for unknown lchan rsl.c:710 0x12: Sending Channel Activated NACK: cause = 0x64 The Tx RF CHAN REL ACK shows that we're through with PDCH release, but the following line showing "chan=TCH/F_TCH/H_PDCH switching PDCH -> NONE" shows that the state still reflects active switching. Thus the DCHAN code decides that the chan_nr = 0x12 reflecting a TCH/H on TS 2 is a mismatch and NACKs the TCH activation. (For ip.access style TCH/F_PDCH, the ts->flags are cleared in ipacc_dyn_pdch_complete()). Related: OS#3235 Change-Id: Ic06c8f0fe82ae8a06afa5defd93a685010687965 --- M src/common/rsl.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/8036/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d46a5f5..cfdb19f 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -634,6 +634,8 @@ gsm_ts_and_pchan_name(lchan->ts), lchan->nr); /* well, what to do about it ... carry on and hope it's fine. */ } + /* remember the fact that the TS is now released */ + lchan->ts->dyn.pchan_is = GSM_PCHAN_NONE; /* Continue to ack the release below. (This is a non-standard rel ack invented * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */ send_rel_ack = true; -- To view, visit https://gerrit.osmocom.org/8036 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic06c8f0fe82ae8a06afa5defd93a685010687965 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:19 +0000 Subject: [PATCH] osmo-bts[master]: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, ... Message-ID: Review at https://gerrit.osmocom.org/8037 dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify When the PCU is not connected, we immediately call rsl_tx_rf_rel_ack() because we don't need to wait for a PDCH deactivation. Fix: properly mark rel_act_kind = LCHAN_REL_ACT_PCU to invoke identical behavior as when the PCU were involved. (When the PCU is connected, a PDCH release on an Osmocom style dyn TS causes an actual release of the PDCH TS, and then triggers an rsl_tx_rf_rel_ack() with rel_act_kind == LCHAN_REL_ACT_PCU.) Clarify the code flow: rc == 1 is the special case of no PCU being connected, so have that in a separate if{}. Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f --- M src/common/rsl.c 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/37/8037/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index cfdb19f..1dc200d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1182,10 +1182,13 @@ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { rc = dyn_ts_pdch_release(lchan); - if (rc != 1) - return rc; - /* If the PCU is not connected, continue right away. */ - return rsl_tx_rf_rel_ack(lchan); + if (rc == 1) { + /* If the PCU is not connected, continue to rel ack right away. */ + lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + return rsl_tx_rf_rel_ack(lchan); + } + /* Waiting for PDCH release */ + return rc; } l1sap_chan_rel(lchan->ts->trx, chan_nr); -- To view, visit https://gerrit.osmocom.org/8037 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:19 +0000 Subject: [PATCH] osmo-bts[master]: dyn TS: clear TCH state upon reconnecting as PDCH Message-ID: Review at https://gerrit.osmocom.org/8038 dyn TS: clear TCH state upon reconnecting as PDCH For ip.access style TCH/F_PDCH, this fixes switch-back to PDCH in case the TCH use employed encryption. For Osmocom style TCH/F_TCH/H_PDCH, do the same, purely out of sanity. Roughly the same should already be happening during PDCH Chan Activ, but make sure to clear all these fields, so they are cleared even if IEs are missing. >From both dyn TS code paths, call new clear_lchan_for_pdch_activ(), which clears the same fields that are normally overwritten by an RSL Chan Activ. Related: OS#3238 Change-Id: I8451039683b54bee910c97c5a3e6873e0ff1b160 --- M src/common/rsl.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/38/8038/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 1dc200d..52eb5f4 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -871,6 +871,26 @@ return 0; } +/* Make sure no state from TCH use remains. */ +static void clear_lchan_for_pdch_activ(struct gsm_lchan *lchan) +{ + /* These values don't apply to PDCH, just clear them. Particularly the encryption must be + * cleared, or we would enable encryption on PDCH with parameters remaining from the TCH. */ + lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); + lchan->ms_power_ctrl.current = lchan->ms_power; + lchan->ms_power_ctrl.fixed = 0; + lchan->rsl_cmode = 0; + lchan->tch_mode = 0; + memset(&lchan->encr, 0, sizeof(lchan->encr)); + memset(&lchan->ho, 0, sizeof(lchan->ho)); + lchan->bs_power = 0; + lchan->ms_power = 0; + memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl)); + lchan->rqd_ta = 0; + copy_sacch_si_to_lchan(lchan); + memset(&lchan->tch, 0, sizeof(lchan->tch)); +} + /*! * Store the CHAN_ACTIV msg, connect the L1 timeslot in the proper type and * then invoke rsl_rx_chan_activ() with msg. @@ -882,7 +902,10 @@ switch (ts->dyn.pchan_want) { case GSM_PCHAN_TCH_F: case GSM_PCHAN_TCH_H: + break; case GSM_PCHAN_PDCH: + /* Only the first lchan matters for PDCH */ + clear_lchan_for_pdch_activ(ts->lchan); break; default: LOGP(DRSL, LOGL_ERROR, @@ -2096,6 +2119,9 @@ } if (pdch_act) { + /* Clear TCH state. Only first lchan matters for PDCH */ + clear_lchan_for_pdch_activ(ts->lchan); + /* First, disconnect the TCH channel, to connect PDTCH later */ rc = bts_model_ts_disconnect(ts); } else { -- To view, visit https://gerrit.osmocom.org/8038 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8451039683b54bee910c97c5a3e6873e0ff1b160 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:20 +0000 Subject: [PATCH] osmo-bts[master]: cosmetic: dyn TS: clarify chan_nr composition Message-ID: Review at https://gerrit.osmocom.org/8039 cosmetic: dyn TS: clarify chan_nr composition In gsm_lchan2chan_nr(), use a switch to reflect both dyn TS kinds and enrich with comments. Move GSM_PCHAN_TCH_F_PDCH out of gsm_pchan2chan_nr(), which is now back to pure standard PCHAN values. Rationale: it's easier to figure out what is going on and why. Change-Id: I6a31b44220d97c9173c52d3567a1382541710d10 --- M src/common/gsm_data_shared.c 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/39/8039/1 diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 553c09b..328b57e 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -597,9 +597,11 @@ { uint8_t cbits, chan_nr; + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH); + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); + switch (pchan) { case GSM_PCHAN_TCH_F: - case GSM_PCHAN_TCH_F_PDCH: OSMO_ASSERT(lchan_nr == 0); cbits = 0x01; break; @@ -652,11 +654,19 @@ uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) { - enum gsm_phys_chan_config pchan = lchan->ts->pchan; - if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) + switch (lchan->ts->pchan) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the + * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ return gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); - return gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + case GSM_PCHAN_TCH_F_PDCH: + /* For ip.access style dyn TS, we always want to use the chan_nr as if it was TCH/F. + * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ + return gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + default: + return gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + } } uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, -- To view, visit https://gerrit.osmocom.org/8039 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a31b44220d97c9173c52d3567a1382541710d10 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:37:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:37:25 +0000 Subject: [PATCH] osmo-bts[master]: add/improve various logging Message-ID: Review at https://gerrit.osmocom.org/8040 add/improve various logging This logging turned up while I was debugging dynamic timeslots: * OML Set Channel Attributes logging. * a specific dyn TS pchan error. * show pchan and lchan types on CHAN ACT ACK and REL ACK logging. * move a dyn TS logging from DL1C to DRSL, where all the other dyn ts logging seems to be. Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea --- M src/common/oml.c M src/common/rsl.c 2 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/8040/1 diff --git a/src/common/oml.c b/src/common/oml.c index a1e7fda..0ab7f84 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -941,6 +941,7 @@ /* Call into BTS driver to check attribute values */ rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -956,6 +957,9 @@ ts->pchan = abis_nm_pchan4chcomb(comb); rc = conf_lchans(ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid Chan Comb 0x%x" + " (pchan=%s, conf_lchans()->%d)\n", + comb, gsm_pchan_name(ts->pchan), rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -971,8 +975,8 @@ /* If there is no TSC specified, use the BCC */ ts->tsc = BSIC2BCC(bts->bsic); } - LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC = %u)\n", - gsm_abis_mo_name(&ts->mo), ts->tsc); + LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC=%u pchan=%s)\n", + gsm_abis_mo_name(&ts->mo), ts->tsc, gsm_pchan_name(ts->pchan)); /* call into BTS driver to apply new attributes to hardware */ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts); diff --git a/src/common/rsl.c b/src/common/rsl.c index 52eb5f4..850bc66 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -667,7 +667,9 @@ return 0; } - LOGP(DRSL, LOGL_NOTICE, "%s Tx RF CHAN REL ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN REL ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); /* * Free the LAPDm resources now that the BTS @@ -693,7 +695,9 @@ uint8_t chan_nr = gsm_lchan2chan_nr(lchan); uint8_t ie[2]; - LOGP(DRSL, LOGL_NOTICE, "%s Tx CHAN ACT ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN ACT ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); if (!msg) @@ -978,6 +982,9 @@ return 1; } } + + LOGP(DRSL, LOGL_DEBUG, "%s: rx Channel Activation in state: %s.\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); /* Initialize channel defaults */ lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); @@ -2187,8 +2194,8 @@ break; default: LOGP(DRSL, LOGL_ERROR, - "%s Dyn TS disconnected, but invalid desired pchan", - gsm_ts_and_pchan_name(ts)); + "%s Dyn TS disconnected, but invalid desired pchan: %s\n", + gsm_ts_and_pchan_name(ts), gsm_pchan_name(ts->dyn.pchan_want)); ts->dyn.pchan_want = GSM_PCHAN_NONE; /* TODO: how would this recover? */ return; @@ -2326,7 +2333,7 @@ ts->flags |= TS_F_PDCH_ACTIVE; else ts->flags &= ~TS_F_PDCH_ACTIVE; - DEBUGP(DL1C, "%s %s switched to %s mode (ts->flags == %x)\n", + DEBUGP(DRSL, "%s %s switched to %s mode (ts->flags == %x)\n", gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan), pdch_act? "PDCH" : "TCH/F", ts->flags); -- To view, visit https://gerrit.osmocom.org/8040 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:39:54 +0000 Subject: [PATCH] osmo-bsc[master]: dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK Message-ID: Review at https://gerrit.osmocom.org/8041 dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK Sending PDCH activation upon RSL bootstrap is too early. Introduce OPSTART ACK handling to call dyn_ts_init() only when the dynamic timeslot is indeed ready to receive a PDCH activation. Related: OS#3205 Change-Id: Icf6e25ff068e8a2600562d52726ead65e864ec02 --- M include/osmocom/bsc/signal.h M src/libbsc/abis_nm.c M src/libbsc/bsc_init.c M src/libbsc/bts_ipaccess_nanobts.c 4 files changed, 54 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/8041/1 diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 9c0d5a3..1dde267 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -71,6 +71,7 @@ S_NM_STATECHG_OPER, /* Operational State changed*/ S_NM_STATECHG_ADM, /* Administrative State changed */ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ + S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct abis_om_fom_hdr* */ }; /* SS_LCHAN signals */ diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index e3c4408..b2cfa53 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -678,6 +678,14 @@ return 0; } +static int abis_nm_rx_opstart_ack(struct msgb *mb) +{ + struct abis_om_fom_hdr *foh = msgb_l3(mb); + DEBUGPFOH(DNM, foh, "Opstart ACK\n"); + osmo_signal_dispatch(SS_NM, S_NM_OPSTART_ACK, foh); + return 0; +} + bool all_trx_rsl_connected_unlocked(const struct gsm_bts *bts) { const struct gsm_bts_trx *trx; @@ -802,7 +810,7 @@ ret = abis_nm_rx_lmt_event(mb); break; case NM_MT_OPSTART_ACK: - DEBUGPFOH(DNM, foh, "Opstart ACK\n"); + abis_nm_rx_opstart_ack(mb); break; case NM_MT_SET_CHAN_ATTR_ACK: DEBUGPFOH(DNM, foh, "Set Channel Attributes ACK\n"); @@ -1896,6 +1904,7 @@ if (bts->type == GSM_BTS_TYPE_BS11) msgb_tlv_put(msg, 0x59, 1, &zero); + DEBUGPFOH(DNM, foh, "%s(): sending %s\n", __func__, msgb_hexdump(msg)); return abis_nm_sendmsg(bts, msg); } diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 429d3c7..92b8c27 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -354,7 +354,6 @@ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { generate_ma_for_ts(&trx->ts[i]); - dyn_ts_init(&trx->ts[i]); } } diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index d94a878..3eb7e0e 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -294,6 +294,46 @@ return 0; } +static struct gsm_bts_trx_ts *gsm_bts_trx_ts(struct gsm_network *net, + int bts_nr, int trx_nr, int ts_nr) +{ + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + bts = gsm_bts_num(net, bts_nr); + if (!bts) + return NULL; + trx = gsm_bts_trx_by_nr(bts, trx_nr); + if (!trx) + return NULL; + if (ts_nr < 0 || ts_nr > ARRAY_SIZE(trx->ts)) + return NULL; + return &trx->ts[ts_nr]; +} + +static void nm_rx_opstart_ack_chan(struct abis_om_fom_hdr *foh) +{ + struct gsm_bts_trx_ts *ts; + ts = gsm_bts_trx_ts(bsc_gsmnet, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr, foh->obj_inst.ts_nr); + if (!ts) { + LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for non-existent TS\n", + abis_nm_dump_foh(foh)); + return; + } + + dyn_ts_init(ts); +} + +static void nm_rx_opstart_ack(struct abis_om_fom_hdr *foh) +{ + switch (foh->obj_class) { + case NM_OC_CHANNEL: + nm_rx_opstart_ack_chan(foh); + break; + default: + break; + } +} + /* Callback function to be called every time we receive a signal from NM */ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -307,6 +347,9 @@ case S_NM_STATECHG_OPER: case S_NM_STATECHG_ADM: return nm_statechg_event(signal, signal_data); + case S_NM_OPSTART_ACK: + nm_rx_opstart_ack(signal_data); + return 0; default: break; } -- To view, visit https://gerrit.osmocom.org/8041 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf6e25ff068e8a2600562d52726ead65e864ec02 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:39:54 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:39:54 +0000 Subject: [PATCH] osmo-bsc[master]: dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in th... Message-ID: Review at https://gerrit.osmocom.org/8042 dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in the proper place Set lchan->state to LCHAN_S_ACT_REQ in rsl_chan_activate_lchan(), not in handle_new_assignment(). This is the first part of a fix for dynamic timeslots handling in the gscon. Rationale: In rsl_chan_activate_lchan(), we may choose to set the lchan state to LCHAN_S_REL_REQ and wait for dyn TS switchover from PDCH. So the caller from bsc_api.c handle_new_assignment() must not bluntly set the state to LCHAN_S_ACT_REQ, which is not accurate in the case of dyn TS switchover. In case of dyn TS switchover, a later release ack received from the BTS will cause rsl_chan_activate_lchan() to be called again, at which point we may accurately set state LCHAN_S_ACT_REQ, and continue the Assignment. Related: OS#3211 Change-Id: Iedb4fb63bf1959d5f1d2c6edb6a7f5097ff16bd7 --- M src/libbsc/abis_rsl.c M src/libbsc/bsc_api.c 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/8042/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 10bef6e..b36e496 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -694,7 +694,10 @@ rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]); - return abis_rsl_sendmsg(msg); + rc = abis_rsl_sendmsg(msg); + if (!rc) + rsl_lchan_set_state(lchan, LCHAN_S_ACT_REQ); + return rc; } /* Chapter 8.4.9: Modify channel mode on BTS side */ diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 19859cf..13fe099 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -156,8 +156,6 @@ /* remember that we have the channel */ conn->secondary_lchan = new_lchan; new_lchan->conn = conn; - - rsl_lchan_set_state(new_lchan, LCHAN_S_ACT_REQ); return 0; } -- To view, visit https://gerrit.osmocom.org/8042 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedb4fb63bf1959d5f1d2c6edb6a7f5097ff16bd7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sat May 5 18:39:55 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 5 May 2018 18:39:55 +0000 Subject: [PATCH] osmo-bsc[master]: dyn TS, assignment: allow switch from PDCH with associated conn Message-ID: Review at https://gerrit.osmocom.org/8043 dyn TS, assignment: allow switch from PDCH with associated conn Typically, an lchan that is released should no longer be associated with subscriber connection. If that is the case, an S_LCHAN_UNEXPECTED_RELEASE is triggered, which aborts, e.g., an ongoing assignment. However, with dynamic timeslots, we may set lchan->conn and then start to switch over from PDCH to a TCH mode, in which case it is perfectly fine to release an lchan that is associated to a conn. In lchan_free(), do not fire S_LCHAN_UNEXPECTED_RELEASE for a dyn TS that is currently in switchover. This is the second and last part to fix dynamic timeslots handling of the gscon. Related: OS#3211 Change-Id: Id7d9dd06451722eb328db77bb586826c954bd85c --- M src/libbsc/chan_alloc.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/8043/1 diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index e72ab3c..9668968 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -448,7 +448,9 @@ lchan->type = GSM_LCHAN_NONE; - if (lchan->conn) { + if (lchan->conn + && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH + && lchan->ts->dyn.pchan_is != lchan->ts->dyn.pchan_want)) { struct lchan_signal_data sig; /* We might kill an active channel... */ @@ -479,7 +481,9 @@ sig.bts = lchan->ts->trx->bts; osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_FREED, &sig); - if (lchan->conn) { + if (lchan->conn + && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH + && lchan->ts->dyn.pchan_is != lchan->ts->dyn.pchan_want)) { LOGP(DRLL, LOGL_ERROR, "the subscriber connection should be gone.\n"); lchan->conn = NULL; } -- To view, visit https://gerrit.osmocom.org/8043 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id7d9dd06451722eb328db77bb586826c954bd85c Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From jenkins at lists.osmocom.org Sat May 5 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 5 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#25?= In-Reply-To: <433736721.362.1525473680568.JavaMail.jenkins@jenkins.osmocom.org> References: <433736721.362.1525473680568.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <361855.383.1525560080611.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-922/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-922/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-922/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-922/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-922/ libtool: install: (cd /tmp/am-dc-922/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-922/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-922/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-922/ libtool: install: chmod 644 /tmp/am-dc-922/ libtool: install: ranlib /tmp/am-dc-922/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-922/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-922/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-922/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-922/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-922/ /bin/mkdir -p '/tmp/am-dc-922/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-922/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-922/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-922/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-922/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-922/ libtool: uninstall: rm -f /tmp/am-dc-922/ /tmp/am-dc-922/ /tmp/am-dc-922/ /tmp/am-dc-922/ /tmp/am-dc-922/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-922/ && rm -f html.tar ) ( cd '/tmp/am-dc-922/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-922/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Sun May 6 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 6 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#114?= Message-ID: <1876621568.404.1525619406732.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.15 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun May 6 15:40:19 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 6 May 2018 15:40:19 +0000 Subject: [PATCH] osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration Message-ID: Review at https://gerrit.osmocom.org/8044 osmo_bsc_vty.c: fix: write MGW configuration Previously the MGW configuration was ignored during writing of the MSC configuration. Let's fix this by calling the mgcp_client_config_write() function. Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d --- M src/osmo-bsc/osmo_bsc_vty.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/8044/1 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index e6ae078..36c3223 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -181,6 +181,9 @@ vty_out(vty, " msc-addr %s%s", msc->a.msc_addr_name, VTY_NEWLINE); } + + /* write MGW configuration */ + mgcp_client_config_write(vty, " "); } static int config_write_msc(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Sun May 6 15:50:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 15:50:15 +0000 Subject: =?UTF-8?Q?=5BPATCH=5D_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E11-11a0-dirty_=E2=86=92_1=2E1=2E1?= Message-ID: Review at https://gerrit.osmocom.org/8045 Bump version: 1.1.0.11-11a0-dirty ? 1.1.1 Change-Id: Iefb8ada270a7a34d5db1c1e3c94f72a02e2dd609 --- M configure.ac M debian/changelog 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/45/8045/1 diff --git a/configure.ac b/configure.ac index 88248d4..20b682e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE([vty_tests], diff --git a/debian/changelog b/debian/changelog index c71377b..81f0271 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +osmo-sip-connector (1.1.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + + [ Harald Welte ] + * mncc.c: Ensure proper string buffer NUL termination + * debian/control: Fix URLs for homepage / git + * comments + * mncc: use 'const' to denote read-only input buffer/message + * Call the program "OsmoSIPcon" (also in vty) + * osmoappdesc: Fix VTY prompt to use OsmoSIPcon, not old OsmoMNCC + * sip: Register log callback function with sofia-sip + * use osmo_init_logging2() to avoid allocating from NULL context + + [ Pau Espin Pedrol ] + * contrib: Add systemd service file + * contrib: jenkins.sh: Disable doxygen in libosmocore build + + -- Pau Espin Pedrol Sun, 06 May 2018 17:45:55 +0200 + osmo-sip-connector (1.1.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] -- To view, visit https://gerrit.osmocom.org/8045 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefb8ada270a7a34d5db1c1e3c94f72a02e2dd609 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 15:56:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 15:56:55 +0000 Subject: osmo-bts[master]: cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8035 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a9953b011a4516972aae468754494f57ebc0a3f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 15:57:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 15:57:28 +0000 Subject: osmo-bts[master]: dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDC... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8036 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic06c8f0fe82ae8a06afa5defd93a685010687965 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 15:57:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 15:57:58 +0000 Subject: osmo-bts[master]: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8037 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 15:58:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 15:58:30 +0000 Subject: osmo-bts[master]: dyn TS: clear TCH state upon reconnecting as PDCH In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8038 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8451039683b54bee910c97c5a3e6873e0ff1b160 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 15:59:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 15:59:15 +0000 Subject: osmo-bts[master]: cosmetic: dyn TS: clarify chan_nr composition In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8039 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a31b44220d97c9173c52d3567a1382541710d10 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:05:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:05:11 +0000 Subject: =?UTF-8?Q?osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E11-11a0-dirty_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8045 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iefb8ada270a7a34d5db1c1e3c94f72a02e2dd609 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:05:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:05:45 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:06:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:06:28 +0000 Subject: osmo-bsc[master]: dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8041 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf6e25ff068e8a2600562d52726ead65e864ec02 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:07:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:07:05 +0000 Subject: osmo-bsc[master]: dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in th... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8042 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iedb4fb63bf1959d5f1d2c6edb6a7f5097ff16bd7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:01 +0000 Subject: osmo-bsc[master]: dyn TS, assignment: allow switch from PDCH with associated conn In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8043 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id7d9dd06451722eb328db77bb586826c954bd85c Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:06 +0000 Subject: [MERGED] osmo-bsc[master]: dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK ...................................................................... dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK Sending PDCH activation upon RSL bootstrap is too early. Introduce OPSTART ACK handling to call dyn_ts_init() only when the dynamic timeslot is indeed ready to receive a PDCH activation. Related: OS#3205 Change-Id: Icf6e25ff068e8a2600562d52726ead65e864ec02 --- M include/osmocom/bsc/signal.h M src/libbsc/abis_nm.c M src/libbsc/bsc_init.c M src/libbsc/bts_ipaccess_nanobts.c 4 files changed, 54 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 9c0d5a3..1dde267 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -71,6 +71,7 @@ S_NM_STATECHG_OPER, /* Operational State changed*/ S_NM_STATECHG_ADM, /* Administrative State changed */ S_NM_OM2K_CONF_RES, /* OM2K Configuration Result */ + S_NM_OPSTART_ACK, /* Received OPSTART ACK, arg is struct abis_om_fom_hdr* */ }; /* SS_LCHAN signals */ diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index e3c4408..b2cfa53 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -678,6 +678,14 @@ return 0; } +static int abis_nm_rx_opstart_ack(struct msgb *mb) +{ + struct abis_om_fom_hdr *foh = msgb_l3(mb); + DEBUGPFOH(DNM, foh, "Opstart ACK\n"); + osmo_signal_dispatch(SS_NM, S_NM_OPSTART_ACK, foh); + return 0; +} + bool all_trx_rsl_connected_unlocked(const struct gsm_bts *bts) { const struct gsm_bts_trx *trx; @@ -802,7 +810,7 @@ ret = abis_nm_rx_lmt_event(mb); break; case NM_MT_OPSTART_ACK: - DEBUGPFOH(DNM, foh, "Opstart ACK\n"); + abis_nm_rx_opstart_ack(mb); break; case NM_MT_SET_CHAN_ATTR_ACK: DEBUGPFOH(DNM, foh, "Set Channel Attributes ACK\n"); @@ -1896,6 +1904,7 @@ if (bts->type == GSM_BTS_TYPE_BS11) msgb_tlv_put(msg, 0x59, 1, &zero); + DEBUGPFOH(DNM, foh, "%s(): sending %s\n", __func__, msgb_hexdump(msg)); return abis_nm_sendmsg(bts, msg); } diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 429d3c7..92b8c27 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -354,7 +354,6 @@ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { generate_ma_for_ts(&trx->ts[i]); - dyn_ts_init(&trx->ts[i]); } } diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index d94a878..3eb7e0e 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -294,6 +294,46 @@ return 0; } +static struct gsm_bts_trx_ts *gsm_bts_trx_ts(struct gsm_network *net, + int bts_nr, int trx_nr, int ts_nr) +{ + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + bts = gsm_bts_num(net, bts_nr); + if (!bts) + return NULL; + trx = gsm_bts_trx_by_nr(bts, trx_nr); + if (!trx) + return NULL; + if (ts_nr < 0 || ts_nr > ARRAY_SIZE(trx->ts)) + return NULL; + return &trx->ts[ts_nr]; +} + +static void nm_rx_opstart_ack_chan(struct abis_om_fom_hdr *foh) +{ + struct gsm_bts_trx_ts *ts; + ts = gsm_bts_trx_ts(bsc_gsmnet, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr, foh->obj_inst.ts_nr); + if (!ts) { + LOGP(DNM, LOGL_ERROR, "%s Channel OPSTART ACK for non-existent TS\n", + abis_nm_dump_foh(foh)); + return; + } + + dyn_ts_init(ts); +} + +static void nm_rx_opstart_ack(struct abis_om_fom_hdr *foh) +{ + switch (foh->obj_class) { + case NM_OC_CHANNEL: + nm_rx_opstart_ack_chan(foh); + break; + default: + break; + } +} + /* Callback function to be called every time we receive a signal from NM */ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -307,6 +347,9 @@ case S_NM_STATECHG_OPER: case S_NM_STATECHG_ADM: return nm_statechg_event(signal, signal_data); + case S_NM_OPSTART_ACK: + nm_rx_opstart_ack(signal_data); + return 0; default: break; } -- To view, visit https://gerrit.osmocom.org/8041 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf6e25ff068e8a2600562d52726ead65e864ec02 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:17 +0000 Subject: [MERGED] osmo-bts[master]: cosmetic: dyn TS: clarify chan_nr composition In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: cosmetic: dyn TS: clarify chan_nr composition ...................................................................... cosmetic: dyn TS: clarify chan_nr composition In gsm_lchan2chan_nr(), use a switch to reflect both dyn TS kinds and enrich with comments. Move GSM_PCHAN_TCH_F_PDCH out of gsm_pchan2chan_nr(), which is now back to pure standard PCHAN values. Rationale: it's easier to figure out what is going on and why. Change-Id: I6a31b44220d97c9173c52d3567a1382541710d10 --- M src/common/gsm_data_shared.c 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 553c09b..328b57e 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -597,9 +597,11 @@ { uint8_t cbits, chan_nr; + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH); + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); + switch (pchan) { case GSM_PCHAN_TCH_F: - case GSM_PCHAN_TCH_F_PDCH: OSMO_ASSERT(lchan_nr == 0); cbits = 0x01; break; @@ -652,11 +654,19 @@ uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) { - enum gsm_phys_chan_config pchan = lchan->ts->pchan; - if (pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) + switch (lchan->ts->pchan) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the + * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ return gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); - return gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + case GSM_PCHAN_TCH_F_PDCH: + /* For ip.access style dyn TS, we always want to use the chan_nr as if it was TCH/F. + * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ + return gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + default: + return gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + } } uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, -- To view, visit https://gerrit.osmocom.org/8039 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a31b44220d97c9173c52d3567a1382541710d10 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:18 +0000 Subject: [MERGED] osmo-bts[master]: dyn TS: clear TCH state upon reconnecting as PDCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: clear TCH state upon reconnecting as PDCH ...................................................................... dyn TS: clear TCH state upon reconnecting as PDCH For ip.access style TCH/F_PDCH, this fixes switch-back to PDCH in case the TCH use employed encryption. For Osmocom style TCH/F_TCH/H_PDCH, do the same, purely out of sanity. Roughly the same should already be happening during PDCH Chan Activ, but make sure to clear all these fields, so they are cleared even if IEs are missing. >From both dyn TS code paths, call new clear_lchan_for_pdch_activ(), which clears the same fields that are normally overwritten by an RSL Chan Activ. Related: OS#3238 Change-Id: I8451039683b54bee910c97c5a3e6873e0ff1b160 --- M src/common/rsl.c 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 1dc200d..52eb5f4 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -871,6 +871,26 @@ return 0; } +/* Make sure no state from TCH use remains. */ +static void clear_lchan_for_pdch_activ(struct gsm_lchan *lchan) +{ + /* These values don't apply to PDCH, just clear them. Particularly the encryption must be + * cleared, or we would enable encryption on PDCH with parameters remaining from the TCH. */ + lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); + lchan->ms_power_ctrl.current = lchan->ms_power; + lchan->ms_power_ctrl.fixed = 0; + lchan->rsl_cmode = 0; + lchan->tch_mode = 0; + memset(&lchan->encr, 0, sizeof(lchan->encr)); + memset(&lchan->ho, 0, sizeof(lchan->ho)); + lchan->bs_power = 0; + lchan->ms_power = 0; + memset(&lchan->ms_power_ctrl, 0, sizeof(lchan->ms_power_ctrl)); + lchan->rqd_ta = 0; + copy_sacch_si_to_lchan(lchan); + memset(&lchan->tch, 0, sizeof(lchan->tch)); +} + /*! * Store the CHAN_ACTIV msg, connect the L1 timeslot in the proper type and * then invoke rsl_rx_chan_activ() with msg. @@ -882,7 +902,10 @@ switch (ts->dyn.pchan_want) { case GSM_PCHAN_TCH_F: case GSM_PCHAN_TCH_H: + break; case GSM_PCHAN_PDCH: + /* Only the first lchan matters for PDCH */ + clear_lchan_for_pdch_activ(ts->lchan); break; default: LOGP(DRSL, LOGL_ERROR, @@ -2096,6 +2119,9 @@ } if (pdch_act) { + /* Clear TCH state. Only first lchan matters for PDCH */ + clear_lchan_for_pdch_activ(ts->lchan); + /* First, disconnect the TCH channel, to connect PDTCH later */ rc = bts_model_ts_disconnect(ts); } else { -- To view, visit https://gerrit.osmocom.org/8038 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8451039683b54bee910c97c5a3e6873e0ff1b160 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:18 +0000 Subject: [MERGED] osmo-bts[master]: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify ...................................................................... dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify When the PCU is not connected, we immediately call rsl_tx_rf_rel_ack() because we don't need to wait for a PDCH deactivation. Fix: properly mark rel_act_kind = LCHAN_REL_ACT_PCU to invoke identical behavior as when the PCU were involved. (When the PCU is connected, a PDCH release on an Osmocom style dyn TS causes an actual release of the PDCH TS, and then triggers an rsl_tx_rf_rel_ack() with rel_act_kind == LCHAN_REL_ACT_PCU.) Clarify the code flow: rc == 1 is the special case of no PCU being connected, so have that in a separate if{}. Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f --- M src/common/rsl.c 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index cfdb19f..1dc200d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1182,10 +1182,13 @@ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { rc = dyn_ts_pdch_release(lchan); - if (rc != 1) - return rc; - /* If the PCU is not connected, continue right away. */ - return rsl_tx_rf_rel_ack(lchan); + if (rc == 1) { + /* If the PCU is not connected, continue to rel ack right away. */ + lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + return rsl_tx_rf_rel_ack(lchan); + } + /* Waiting for PDCH release */ + return rc; } l1sap_chan_rel(lchan->ts->trx, chan_nr); -- To view, visit https://gerrit.osmocom.org/8037 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I654b963815b32fcbce050c2e15f3190c97bc259f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:19 +0000 Subject: [MERGED] osmo-bts[master]: dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDC... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDCH TS ...................................................................... dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDCH TS When a release of PDCH is complete, actually set the dyn.pchan_is to NONE. Failure to do so currently caused errors on activation of an Osmocom style dyn TS as TCH, in the shape of: rsl.c:636 (bts=0,trx=0,ts=2,ss=0) Tx RF CHAN REL ACK rsl.c:164 (bts=0,trx=0,ts=2,pchan=TCH/F_TCH/H_PDCH switching PDCH -> NONE) RSL rx DCHAN: mismatching chan_nr=0x12 rsl.c:2611 Rx RSL CHAN_ACTIV for unknown lchan rsl.c:710 0x12: Sending Channel Activated NACK: cause = 0x64 The Tx RF CHAN REL ACK shows that we're through with PDCH release, but the following line showing "chan=TCH/F_TCH/H_PDCH switching PDCH -> NONE" shows that the state still reflects active switching. Thus the DCHAN code decides that the chan_nr = 0x12 reflecting a TCH/H on TS 2 is a mismatch and NACKs the TCH activation. (For ip.access style TCH/F_PDCH, the ts->flags are cleared in ipacc_dyn_pdch_complete()). Related: OS#3235 Change-Id: Ic06c8f0fe82ae8a06afa5defd93a685010687965 --- M src/common/rsl.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index d46a5f5..cfdb19f 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -634,6 +634,8 @@ gsm_ts_and_pchan_name(lchan->ts), lchan->nr); /* well, what to do about it ... carry on and hope it's fine. */ } + /* remember the fact that the TS is now released */ + lchan->ts->dyn.pchan_is = GSM_PCHAN_NONE; /* Continue to ack the release below. (This is a non-standard rel ack invented * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */ send_rel_ack = true; -- To view, visit https://gerrit.osmocom.org/8036 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic06c8f0fe82ae8a06afa5defd93a685010687965 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:08:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:08:19 +0000 Subject: [MERGED] osmo-bts[master]: cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch ...................................................................... cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch Use a switch statement and ample comments to clarify what is done and why. Cosmetically prepares for Ic06c8f0fe82ae8a06afa5defd93a685010687965. Related: OS#3235 Change-Id: I8a9953b011a4516972aae468754494f57ebc0a3f --- M src/common/rsl.c 1 file changed, 41 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 9adb89a..d46a5f5 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -618,16 +618,48 @@ { struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr(lchan); + bool send_rel_ack; - /* - * Normally, PDCH deactivation via PCU does not ack back to the BSC. - * But for GSM_PCHAN_TCH_F_TCH_H_PDCH, send a non-standard rel ack for - * LCHAN_REL_ACT_PCU, since the rel req came from RSL initially. - */ - if (lchan->rel_act_kind != LCHAN_REL_ACT_RSL - && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH - && lchan->rel_act_kind == LCHAN_REL_ACT_PCU)) { + switch (lchan->rel_act_kind) { + case LCHAN_REL_ACT_RSL: + send_rel_ack = true; + break; + + case LCHAN_REL_ACT_PCU: + switch (lchan->ts->pchan) { + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (lchan->ts->dyn.pchan_is != GSM_PCHAN_PDCH) { + LOGP(DRSL, LOGL_ERROR, + "%s (ss=%d) PDCH release: not in PDCH mode\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr); + /* well, what to do about it ... carry on and hope it's fine. */ + } + /* Continue to ack the release below. (This is a non-standard rel ack invented + * specifically for GSM_PCHAN_TCH_F_TCH_H_PDCH). */ + send_rel_ack = true; + break; + case GSM_PCHAN_TCH_F_PDCH: + /* GSM_PCHAN_TCH_F_PDCH, does not require a rel ack. The caller + * l1sap_info_rel_cnf() will continue with bts_model_ts_disconnect(). */ + send_rel_ack = false; + break; + default: + LOGP(DRSL, LOGL_ERROR, "%s PCU rel ack for unexpected lchan kind\n", + gsm_lchan_name(lchan)); + /* Release certainly was not requested by the BSC via RSL, so don't ack. */ + send_rel_ack = false; + break; + } + break; + + default: + /* A rel that was not requested by the BSC via RSL, hence not sending a rel ack to the + * BSC. */ + send_rel_ack = false; + break; + } + + if (!send_rel_ack) { LOGP(DRSL, LOGL_NOTICE, "%s not sending REL ACK\n", gsm_lchan_name(lchan)); return 0; -- To view, visit https://gerrit.osmocom.org/8035 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a9953b011a4516972aae468754494f57ebc0a3f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 16:10:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:10:18 +0000 Subject: libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+1 note entirely sure if most of the functions should be inline... otherwise fine with me! -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:10:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:10:27 +0000 Subject: libosmocore[master]: lapdm: Fix back-pointer from lapdm_entity to lapdm_channel In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8034 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaca66cd6a2c9f315561e365b51163927868fc346 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 16:10:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 6 May 2018 16:10:30 +0000 Subject: [MERGED] libosmocore[master]: lapdm: Fix back-pointer from lapdm_entity to lapdm_channel In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: lapdm: Fix back-pointer from lapdm_entity to lapdm_channel ...................................................................... lapdm: Fix back-pointer from lapdm_entity to lapdm_channel It seems that during all those years it has never been noted that the back-pointer from the lapdm_entity to the lapdm_channel was never initialized. Let's fix that. Change-Id: Iaca66cd6a2c9f315561e365b51163927868fc346 --- M src/gsm/lapdm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 6a16012..ae21ccd 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -169,8 +169,10 @@ void lapdm_channel_init(struct lapdm_channel *lc, enum lapdm_mode mode) { lapdm_entity_init(&lc->lapdm_acch, mode, 2); + lc->lapdm_acch.lapdm_ch = lc; /* FIXME: this depends on chan type */ lapdm_entity_init(&lc->lapdm_dcch, mode, 1); + lc->lapdm_dcch.lapdm_ch = lc; } /*! flush and release all resoures in LAPDm entity */ -- To view, visit https://gerrit.osmocom.org/8034 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaca66cd6a2c9f315561e365b51163927868fc346 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Sun May 6 19:33:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 19:33:48 +0000 Subject: =?UTF-8?Q?=5BMERGED=5D_osmo-sip-connector=5Bmaster=5D=3A_Bump_version=3A_1=2E1=2E0=2E11-11a0-dirty_=E2=86=92_1=2E1=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Bump version: 1.1.0.11-11a0-dirty ? 1.1.1 ...................................................................... Bump version: 1.1.0.11-11a0-dirty ? 1.1.1 Change-Id: Iefb8ada270a7a34d5db1c1e3c94f72a02e2dd609 --- M configure.ac M debian/changelog 2 files changed, 23 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 88248d4..20b682e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE([vty_tests], diff --git a/debian/changelog b/debian/changelog index c71377b..81f0271 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +osmo-sip-connector (1.1.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * vty: skip installing cmds now always installed by default + + [ Harald Welte ] + * mncc.c: Ensure proper string buffer NUL termination + * debian/control: Fix URLs for homepage / git + * comments + * mncc: use 'const' to denote read-only input buffer/message + * Call the program "OsmoSIPcon" (also in vty) + * osmoappdesc: Fix VTY prompt to use OsmoSIPcon, not old OsmoMNCC + * sip: Register log callback function with sofia-sip + * use osmo_init_logging2() to avoid allocating from NULL context + + [ Pau Espin Pedrol ] + * contrib: Add systemd service file + * contrib: jenkins.sh: Disable doxygen in libosmocore build + + -- Pau Espin Pedrol Sun, 06 May 2018 17:45:55 +0200 + osmo-sip-connector (1.1.0) unstable; urgency=medium [ Holger Hans Peter Freyther ] -- To view, visit https://gerrit.osmocom.org/8045 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefb8ada270a7a34d5db1c1e3c94f72a02e2dd609 Gerrit-PatchSet: 1 Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 20:11:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 May 2018 20:11:30 +0000 Subject: [MERGED] osmo-bsc[master]: dyn TS, assignment: allow switch from PDCH with associated conn In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: dyn TS, assignment: allow switch from PDCH with associated conn ...................................................................... dyn TS, assignment: allow switch from PDCH with associated conn Typically, an lchan that is released should no longer be associated with subscriber connection. If that is the case, an S_LCHAN_UNEXPECTED_RELEASE is triggered, which aborts, e.g., an ongoing assignment. However, with dynamic timeslots, we may set lchan->conn and then start to switch over from PDCH to a TCH mode, in which case it is perfectly fine to release an lchan that is associated to a conn. In lchan_free(), do not fire S_LCHAN_UNEXPECTED_RELEASE for a dyn TS that is currently in switchover. This is the second and last part to fix dynamic timeslots handling of the gscon. Related: OS#3211 Change-Id: Id7d9dd06451722eb328db77bb586826c954bd85c --- M src/libbsc/chan_alloc.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index e72ab3c..9668968 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -448,7 +448,9 @@ lchan->type = GSM_LCHAN_NONE; - if (lchan->conn) { + if (lchan->conn + && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH + && lchan->ts->dyn.pchan_is != lchan->ts->dyn.pchan_want)) { struct lchan_signal_data sig; /* We might kill an active channel... */ @@ -479,7 +481,9 @@ sig.bts = lchan->ts->trx->bts; osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_FREED, &sig); - if (lchan->conn) { + if (lchan->conn + && !(lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH + && lchan->ts->dyn.pchan_is != lchan->ts->dyn.pchan_want)) { LOGP(DRLL, LOGL_ERROR, "the subscriber connection should be gone.\n"); lchan->conn = NULL; } -- To view, visit https://gerrit.osmocom.org/8043 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id7d9dd06451722eb328db77bb586826c954bd85c Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sun May 6 20:11:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 6 May 2018 20:11:30 +0000 Subject: [MERGED] osmo-bsc[master]: dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in th... In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. Change subject: dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in the proper place ...................................................................... dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in the proper place Set lchan->state to LCHAN_S_ACT_REQ in rsl_chan_activate_lchan(), not in handle_new_assignment(). This is the first part of a fix for dynamic timeslots handling in the gscon. Rationale: In rsl_chan_activate_lchan(), we may choose to set the lchan state to LCHAN_S_REL_REQ and wait for dyn TS switchover from PDCH. So the caller from bsc_api.c handle_new_assignment() must not bluntly set the state to LCHAN_S_ACT_REQ, which is not accurate in the case of dyn TS switchover. In case of dyn TS switchover, a later release ack received from the BTS will cause rsl_chan_activate_lchan() to be called again, at which point we may accurately set state LCHAN_S_ACT_REQ, and continue the Assignment. Related: OS#3211 Change-Id: Iedb4fb63bf1959d5f1d2c6edb6a7f5097ff16bd7 --- M src/libbsc/abis_rsl.c M src/libbsc/bsc_api.c 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 10bef6e..b36e496 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -694,7 +694,10 @@ rate_ctr_inc(&lchan->ts->trx->bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]); - return abis_rsl_sendmsg(msg); + rc = abis_rsl_sendmsg(msg); + if (!rc) + rsl_lchan_set_state(lchan, LCHAN_S_ACT_REQ); + return rc; } /* Chapter 8.4.9: Modify channel mode on BTS side */ diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 19859cf..13fe099 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -156,8 +156,6 @@ /* remember that we have the channel */ conn->secondary_lchan = new_lchan; new_lchan->conn = conn; - - rsl_lchan_set_state(new_lchan, LCHAN_S_ACT_REQ); return 0; } -- To view, visit https://gerrit.osmocom.org/8042 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedb4fb63bf1959d5f1d2c6edb6a7f5097ff16bd7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:10 +0000 Subject: [PATCH] meta-telephony[201705]: Remove libosmo-sccp_0.0.6.1.bb Message-ID: Review at https://gerrit.osmocom.org/8046 Remove libosmo-sccp_0.0.6.1.bb This recipe is outdated as we use the _git ones nowadays. Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 --- D recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb 1 file changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/46/8046/1 diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb deleted file mode 100644 index 7e8b92f..0000000 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "2d2d885bd124b8ae2d3a04f3583a756029820dc0" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} -- To view, visit https://gerrit.osmocom.org/8046 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:11 +0000 Subject: [PATCH] meta-telephony[201705]: recipes-osmocom: Remove manual recreation of tarball-version... Message-ID: Review at https://gerrit.osmocom.org/8047 recipes-osmocom: Remove manual recreation of tarball-version file The reasoning behind this manual operation in configure_prepend doesn't apply anymore. In pyro it seems configure can properly set the version, and it was seen during latest releases in upstream that having those manually is counterproductive, because then outdated versions are used. Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/openbsc/openbsc.inc 2 files changed, 0 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/47/8047/1 diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 23ee6b7..b353acb 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -14,11 +14,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ba0d75c..5e4b10d 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -18,11 +18,6 @@ inherit autotools update-rc.d pkgconfig -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} - do_install_append() { install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg -- To view, visit https://gerrit.osmocom.org/8047 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:11 +0000 Subject: [PATCH] meta-telephony[201705]: recipes-osmocom: Move DEPENDS to .inc files Message-ID: Review at https://gerrit.osmocom.org/8048 recipes-osmocom: Move DEPENDS to .inc files Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif.inc M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmocore/libosmocore.inc M recipes-osmocom/libosmocore/libosmocore_git.bb 6 files changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/48/8048/1 diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 3f1ce3c..8d02a75 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -1,5 +1,5 @@ DESCRIPTION = "An utility library for Open Source Mobile Communications" -DEPENDS = "libosmocore ortp" +DEPENDS = "libosmocore ortp libtalloc" DEPENDS_append_geode = "dahdi-linux" HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "AGPLv3" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 8d1b56e..16b0da3 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,5 @@ require ${PN}.inc -DEPENDS += "libtalloc" - S = "${WORKDIR}/git" SRCREV = "49917c129b1456585258b0ebe89a513ecef823a8" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 2b7c0fa..511b668 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -1,5 +1,5 @@ -DESCRIPTION = "Osmux utility classes" -DEPENDS = "libosmo-abis" +DESCRIPTION = "Osmocom network interface library" +DEPENDS = "libosmo-abis libtalloc lksctp-tools" HOMEPAGE = "http://git.osmocom.org" LICENSE = "GPLv2+" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index cc1795a..0aef031 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,5 @@ require ${PN}.inc -DEPENDS += "libtalloc lksctp-tools" - S = "${WORKDIR}/git" SRCREV = "9d726d0e56665b4439bb4efe782be06be2e83ffb" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 25ed5c3..a501c2a 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,5 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools pkgconfig +DEPENDS = "libtalloc gnutls" +inherit autotools pkgconfig diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 98081bf..43a9426 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -6,8 +6,6 @@ PV = "0.10.2+gitr${SRCPV}" PR = "r0" -DEPENDS += "libtalloc gnutls" - PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/8048 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:11 +0000 Subject: [PATCH] meta-telephony[201705]: libosmo-sccp: Move version independent bits to .inc file Message-ID: Review at https://gerrit.osmocom.org/8049 libosmo-sccp: Move version independent bits to .inc file Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 2 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/49/8049/1 diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index d269dae..c388c32 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -9,4 +9,26 @@ inherit autotools pkgconfig systemd +# we require the tests to link to the static libosmo-sigtran library to +# access symbols not starting with osmo_* +EXTRA_OECONF_remove = "--disable-static" + +PACKAGES =+ "osmo-stp" +SYSTEMD_PACKAGES = "osmo-stp" +SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" + +do_install_append() { + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}${sysconfdir}/osmocom/ + + install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ +} + +FILES_osmo-stp = " \ + ${bindir}/osmo-stp \ + ${sysconfdir}/osmocom/osmo-stp.cfg \ + " +CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg" + ALLOW_EMPTY_libosmo-sccp = "1" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index b353acb..20cecb8 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -5,25 +5,3 @@ SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" PV = "0.8.1+gitr${SRCPV}" PR = "${INC_PR}.0" - -# we require the tests to link to the static libosmo-sigtran library to -# access symbols not starting with osmo_* -EXTRA_OECONF_remove = "--disable-static" - -PACKAGES =+ "osmo-stp" -SYSTEMD_PACKAGES = "osmo-stp" -SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - -FILES_osmo-stp = " \ - ${bindir}/osmo-stp \ - ${sysconfdir}/osmocom/osmo-stp.cfg \ - " -CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg" -- To view, visit https://gerrit.osmocom.org/8049 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:11 +0000 Subject: [PATCH] meta-telephony[201705]: recipes-osmocom: Update to latest release Message-ID: Review at https://gerrit.osmocom.org/8050 recipes-osmocom: Update to latest release Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis.inc M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif.inc M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore.inc M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc.inc M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc.inc M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr.inc M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw.inc M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc.inc M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 26 files changed, 42 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/50/8050/1 diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 6cfe4e5..e04e525 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "0cad3b4538710a91881ddbb80424c2d7c62de962" +SRCREV = "6996e5dba9603208609f4604a3b3d59f88c85d90" SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.12.0+gitr${SRCPV}" +PV = "1.13.0+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index af6486e..9d4fa87 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "202022eaa9c36d1209cf024830b99d7d2463663e" +SRCREV = "d36012fb029fd9914b4e8125c9c3186785940258" SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.28+gitr${SRCPV}" +PV = "0.9.31+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 8d02a75..58f4242 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "AGPLv3" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 16b0da3..1bfdb18 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "49917c129b1456585258b0ebe89a513ecef823a8" +SRCREV = "7b89f12e66a280746fc8e7906505b2d769d19706" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 511b668..a353be6 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://git.osmocom.org" LICENSE = "GPLv2+" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 0aef031..419cb2c 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "9d726d0e56665b4439bb4efe782be06be2e83ffb" +SRCREV = "e38ee9b808970cd49663221cb823365ef18797d5" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.1.1+gitr${SRCPV}" -PR = "${INC_PR}.1" +PV = "0.2.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index c388c32..60793e3 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 20cecb8..bb83638 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "58fcc5344ea0e914c7f9be69c309998d243142bd" +SRCREV = "c88605c41c25b34d2e2b08f0e1028c2bd6d9404b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "0.8.1+gitr${SRCPV}" +PV = "0.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index a501c2a..6077ff5 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,7 +2,7 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 43a9426..c2c37f5 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a2501a20651bad1c1645547c8ad99af4f5c64e2e" +SRCREV = "cacaa4a1616d7c0ea370ff197d816f706909bde5" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.10.2+gitr${SRCPV}" +PV = "0.11.0+gitr${SRCPV}" PR = "r0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 5e4b10d..36c57e7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,8 +11,7 @@ file://osmo-bsc-sccplite.service \ " -INC_PR = "r25.${META_TELEPHONY_OSMO_INC}" - +INC_PR = "r0.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7aee169..e3af4bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "c6382b5e0b4790d15681e89f704465160b9aef1d" +SRCREV = "cc69659217d19af5635638a0fbd4f0702f79bac4" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d14fdd2..f20362f 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,7 +5,7 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index ef1eee9..44e0f99 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a8eafef966bfbd8046ee8319b889b2dee8391434" +SRCREV = "1b11bc808f9fe4234bb3b42965f8b7ca5c33e303" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.1.2+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 77aa4be..13d3cbd 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -2,10 +2,10 @@ HOMEPAGE = "https://osmocom.org/projects/openggsn" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.1+gitr${SRCPV}" PR = "r0" -SRCREV = "a16c7501a4eccded2919fab0d485f77fb87dc81a" +SRCREV = "ac07625086948281295e54dd295228153ecd5ff0" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 7dd6234..7e75d13 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index b1a1955..d10d893 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "70e7f21cb1748dbc766361d139d8854f7f63ceb0" +SRCREV = "78f430102516a970b9899f962d4562ebdb718670" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "0.1.0+gitr${SRCPV}" +PV = "0.2.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 2737412..6dfb344 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,7 +5,7 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index dba79e9..a983c4e 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "cf5fbea78f2f7316e7cbe91f32cb79b4a02abd75" +SRCREV = "ba941e553d60a06a45ad96f0ad4161383d4c0d30" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.2.0+gitr${SRCPV}" +PV = "0.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 3294464..b083a9c 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,7 +5,7 @@ DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 8731c68..d863300 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "086c3f3c674a276205a793300c80802d2355cabd" +SRCREV = "d761d355f9b71b1dfe462e55a6e030bb026d8bf1" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index a6584a0..06f5b10 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,7 +5,7 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r4.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 14c1690..3e5e9d7 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "053e27528cf4da1f96bd5bf78c6982b73b790100" +SRCREV = "cb8c75bba030c7ab9f2e49b2f40292a1738f3220" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.1.2+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 84c4e41..4711a2c 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,7 +5,7 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r4.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index 07e16c6..f76ced5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "69e356be93c420b5e2f8b96fbc89ef889cbcfe53" +SRCREV = "39c67e2640fc34346dffe3cff9f9f8e905fe5ad9" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index f13f677..b5a1627 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a6a34fd7188bbe46fbd84484610697dd5930d584" +SRCREV = "55faf3867540f5d42a69e17cdc02f0e522f42478" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/8050 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:35 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Update to latest release In-Reply-To: References: Message-ID: Patch Set 1: TODO after merge: rebase laforge/nightly on top of 201705 -- To view, visit https://gerrit.osmocom.org/8050 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 21:02:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:02:58 +0000 Subject: meta-telephony[201705]: Remove libosmo-sccp_0.0.6.1.bb In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/8046 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 21:03:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:03:01 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Remove manual recreation of tarball-version... In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/8047 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 21:03:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:03:06 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Move DEPENDS to .inc files In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/8048 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 21:03:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:03:09 +0000 Subject: meta-telephony[201705]: libosmo-sccp: Move version independent bits to .inc file In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/8049 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 21:03:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 21:03:13 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Update to latest release In-Reply-To: References: Message-ID: Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/8050 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From jenkins at lists.osmocom.org Sun May 6 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 6 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#26?= In-Reply-To: <361855.383.1525560080611.JavaMail.jenkins@jenkins.osmocom.org> References: <361855.383.1525560080611.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <50418736.411.1525646480722.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-14274/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-14274/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-14274/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-14274/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-14274/ libtool: install: (cd /tmp/am-dc-14274/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-14274/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-14274/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-14274/ libtool: install: chmod 644 /tmp/am-dc-14274/ libtool: install: ranlib /tmp/am-dc-14274/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-14274/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-14274/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-14274/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-14274/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-14274/ /bin/mkdir -p '/tmp/am-dc-14274/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-14274/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-14274/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-14274/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-14274/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-14274/ libtool: uninstall: rm -f /tmp/am-dc-14274/ /tmp/am-dc-14274/ /tmp/am-dc-14274/ /tmp/am-dc-14274/ /tmp/am-dc-14274/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-14274/ && rm -f html.tar ) ( cd '/tmp/am-dc-14274/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-14274/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Sun May 6 22:53:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 22:53:13 +0000 Subject: [PATCH] osmo-gsm-tester[master]: osmo-trx binary is now called osmo-trx-uhd Message-ID: Review at https://gerrit.osmocom.org/8051 osmo-trx binary is now called osmo-trx-uhd Change-Id: Ibf111ba89b24964127b9c1db7102953e1dba3181 --- M contrib/jenkins-build-osmo-trx.sh M src/osmo_gsm_tester/bts_osmotrx.py 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/51/8051/1 diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh index 0113568..67fca35 100755 --- a/contrib/jenkins-build-osmo-trx.sh +++ b/contrib/jenkins-build-osmo-trx.sh @@ -6,6 +6,6 @@ # AddressSanitizer is not enabled on purpose since overhead affects the clocking. build_repo libosmocore --disable-doxygen -build_repo osmo-trx --without-sse +build_repo osmo-trx --without-sse --with-uhd -create_bin_tgz osmo-trx +create_bin_tgz osmo-trx-uhd diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index bdfb97c..85d37c0 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -146,7 +146,7 @@ env = None proc_trx = None - BIN_TRX = 'osmo-trx' + BIN_TRX = 'osmo-trx-uhd' CONF_OSMO_TRX = 'osmo-trx.cfg' def __init__(self, suite_run, conf, listen_ip, bts_ip): -- To view, visit https://gerrit.osmocom.org/8051 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf111ba89b24964127b9c1db7102953e1dba3181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 23:03:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 23:03:48 +0000 Subject: [PATCH] osmo-ci[master]: osmo-gsm-tester-builder: notify unstable builds Message-ID: Review at https://gerrit.osmocom.org/8052 osmo-gsm-tester-builder: notify unstable builds Change-Id: I5a1d7b5e1af5b4fbd12effa870542df2d6be7647 --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/8052/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 8f3ce61..a43580c 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -52,6 +52,9 @@ artifacts: '*.tgz, *.md5' only-if-success: 'true' default-excludes: false + - email: + recipients: 'pespin at sysmocom.de' + notify-every-unstable-build: true properties: - build-discarder: num-to-keep: 20 -- To view, visit https://gerrit.osmocom.org/8052 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a1d7b5e1af5b4fbd12effa870542df2d6be7647 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Sun May 6 23:23:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 23:23:57 +0000 Subject: osmo-gsm-tester[master]: osmo-trx binary is now called osmo-trx-uhd In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8051 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibf111ba89b24964127b9c1db7102953e1dba3181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Sun May 6 23:23:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sun, 6 May 2018 23:23:59 +0000 Subject: [MERGED] osmo-gsm-tester[master]: osmo-trx binary is now called osmo-trx-uhd In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: osmo-trx binary is now called osmo-trx-uhd ...................................................................... osmo-trx binary is now called osmo-trx-uhd Change-Id: Ibf111ba89b24964127b9c1db7102953e1dba3181 --- M contrib/jenkins-build-osmo-trx.sh M src/osmo_gsm_tester/bts_osmotrx.py 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/contrib/jenkins-build-osmo-trx.sh b/contrib/jenkins-build-osmo-trx.sh index 0113568..67fca35 100755 --- a/contrib/jenkins-build-osmo-trx.sh +++ b/contrib/jenkins-build-osmo-trx.sh @@ -6,6 +6,6 @@ # AddressSanitizer is not enabled on purpose since overhead affects the clocking. build_repo libosmocore --disable-doxygen -build_repo osmo-trx --without-sse +build_repo osmo-trx --without-sse --with-uhd -create_bin_tgz osmo-trx +create_bin_tgz osmo-trx-uhd diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index bdfb97c..85d37c0 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -146,7 +146,7 @@ env = None proc_trx = None - BIN_TRX = 'osmo-trx' + BIN_TRX = 'osmo-trx-uhd' CONF_OSMO_TRX = 'osmo-trx.cfg' def __init__(self, suite_run, conf, listen_ip, bts_ip): -- To view, visit https://gerrit.osmocom.org/8051 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf111ba89b24964127b9c1db7102953e1dba3181 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 09:00:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 09:00:37 +0000 Subject: [PATCH] osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7992 to look at the new patch set (#2). move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 90 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/2 diff --git a/src/gsup_server.c b/src/gsup_server.c index 07d4feb..685633e 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsup_server.h" @@ -357,3 +358,42 @@ return 0; } + +struct osmo_gsup_message * +osmo_gsup_create_insert_subscriber_data_msg(char *imsi, char *msisdn, enum osmo_gsup_cn_domain cn_domain) +{ + struct osmo_gsup_message *gsup; + int len; + uint8_t *msisdn_enc; + + gsup = talloc_zero(NULL, struct osmo_gsup_message); + OSMO_ASSERT(gsup); + + gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST; + osmo_strlcpy(gsup->imsi, imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + msisdn_enc = talloc_size(gsup, OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN); + OSMO_ASSERT(msisdn_enc); + + len = gsm48_encode_bcd_number(msisdn_enc, OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN, 0, msisdn); + if (len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn); + talloc_free(gsup); + return NULL; + } + gsup->msisdn_enc = msisdn_enc; + gsup->msisdn_enc_len = len; + + #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" + + gsup->cn_domain = cn_domain; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + uint8_t *apn = talloc_size(gsup, APN_MAXLEN); + OSMO_ASSERT(apn); + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(gsup, apn, APN_MAXLEN); + } + + return gsup; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 66c1a9c..0945d71 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -6,6 +6,10 @@ #include #include +#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#endif + struct osmo_gsup_conn; /* Expects message in msg->l2h */ @@ -55,3 +59,5 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, uint8_t *apn_buf, size_t apn_buf_size); +struct osmo_gsup_message *osmo_gsup_create_insert_subscriber_data_msg(char *imsi, char *msisdn, + enum osmo_gsup_cn_domain cn_domain); diff --git a/src/hlr.c b/src/hlr.c index 1c72f45..919751c 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,51 +61,28 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct osmo_gsup_message gsup = { - .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST - }; + struct osmo_gsup_message *gsup; + struct msgb *msg_out; uint8_t *peer; int peer_len; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - uint8_t apn[APN_MAXLEN]; - int len; - struct msgb *msg_out; + enum osmo_gsup_cn_domain cn_domain; - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { + if (co->supports_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else if (co->supports_cs) + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + gsup = osmo_gsup_create_insert_subscriber_data_msg(subscr->imsi, subscr->msisdn, cn_domain); + if (gsup == NULL) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "IMSI='%s': Cannot notify GSUP client; could not allocate gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - - osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); - - len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); - if (len < 1) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", - subscr->imsi, subscr->msisdn); - continue; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = len; - - if (co->supports_ps) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - subscr->imsi); - continue; - } - } else if (co->supports_cs) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - } else { - /* We have not yet received a location update from this subscriber .*/ continue; } @@ -118,10 +94,23 @@ "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); + talloc_free(gsup); + gsup = NULL; + continue; + } + osmo_gsup_encode(msg_out, gsup); + talloc_free(gsup); + gsup = NULL; + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_gsup_encode(msg_out, &gsup); if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " diff --git a/src/luop.c b/src/luop.c index db7b3c9..40cc6fb 100644 --- a/src/luop.c +++ b/src/luop.c @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -52,6 +51,7 @@ struct msgb *msg_out; msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP"); + OSMO_ASSERT(msg_out); osmo_gsup_encode(msg_out, gsup); osmo_gsup_addr_send(luop->gsup_server, luop->peer, @@ -215,43 +215,29 @@ /*! Transmit Insert Subscriber Data to new VLR/SGSN */ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { - struct osmo_gsup_message gsup; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - uint8_t apn[APN_MAXLEN]; - int l; + struct hlr_subscriber *subscr = &luop->subscr; + struct osmo_gsup_message *gsup; + enum osmo_gsup_cn_domain cn_domain; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || luop->state == LU_S_CANCEL_ACK_RECEIVED); - fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST); + if (luop->is_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, - luop->subscr.msisdn); - if (l < 1) { + gsup = osmo_gsup_create_insert_subscriber_data_msg(subscr->imsi, subscr->msisdn, cn_domain); + if (gsup == NULL) { LOGP(DMAIN, LOGL_ERROR, - "%s: Error: cannot encode MSISDN '%s'\n", - luop->subscr.imsi, luop->subscr.msisdn); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + "IMSI='%s': Cannot notify GSUP client; could not allocate gsup message " + "for %s\n", subscr->imsi, luop->peer); return; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = l; - - #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" - - if (luop->is_ps) { - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - luop->subscr.imsi); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); - return; - } } /* Send ISD to new VLR/SGSN */ - _luop_tx_gsup(luop, &gsup); + _luop_tx_gsup(luop, gsup); + talloc_free(gsup); lu_op_statechg(luop, LU_S_ISD_SENT); osmo_timer_schedule(&luop->timer, ISD_TIMEOUT_SECS, 0); diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index d9d272a..0aeae30 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -1,2 +1,2 @@ -DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 DMAIN LU OP state change: LU RECEIVED -> ISD SENT -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Mon May 7 09:01:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 09:01:16 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts_osmotrx: Don't use binary name as inst name Message-ID: Review at https://gerrit.osmocom.org/8053 bts_osmotrx: Don't use binary name as inst name Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/53/8053/1 diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 85d37c0..bd8aedf 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -180,7 +180,7 @@ def start(self): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() - self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(OsmoTrx.BIN_TRX))) + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } self.proc_trx = self.launch_process(OsmoTrx.BIN_TRX, '-x', -- To view, visit https://gerrit.osmocom.org/8053 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 09:02:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 09:02:02 +0000 Subject: osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/7992/1/src/luop.c File src/luop.c: Line 53: if (msg_out == NULL) { > same here. OSMO_ASSERT(msg_out) is sufficient. Changed accordingly in next patch set. -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 09:02:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 09:02:50 +0000 Subject: osmo-gsm-tester[master]: bts_osmotrx: Don't use binary name as inst name In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 Verified+1 -- To view, visit https://gerrit.osmocom.org/8053 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 09:02:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 09:02:53 +0000 Subject: osmo-gsm-tester[master]: bts_osmotrx: Don't use binary name as inst name In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8053 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 09:02:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 09:02:54 +0000 Subject: [MERGED] osmo-gsm-tester[master]: bts_osmotrx: Don't use binary name as inst name In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: bts_osmotrx: Don't use binary name as inst name ...................................................................... bts_osmotrx: Don't use binary name as inst name Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e --- M src/osmo_gsm_tester/bts_osmotrx.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 85d37c0..bd8aedf 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -180,7 +180,7 @@ def start(self): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() - self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(OsmoTrx.BIN_TRX))) + self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } self.proc_trx = self.launch_process(OsmoTrx.BIN_TRX, '-x', -- To view, visit https://gerrit.osmocom.org/8053 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee20738f2aa750aa9035a9e54ad667d8753ea12e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 09:07:01 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 09:07:01 +0000 Subject: [MERGED] libosmocore[master]: define a constant for the max length of called party BCD IE In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. Change subject: define a constant for the max length of called party BCD IE ...................................................................... define a constant for the max length of called party BCD IE According to TS 24.008 10.5.4.7 the called party BSC number IE has a maximum length of 43 octets. This length is assumed inside osmo-hlr with a magic number: uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ This change makes libosmocore provide a constant which osmo-hlr can use. Change-Id: Ia0bf6ceadcac38a8c75d166402b54058e5c6c6d4 --- M include/osmocom/gsm/gsup.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 1a8a3b2..a7fa820 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -52,6 +52,7 @@ #define OSMO_GSUP_MAX_NUM_AUTH_INFO 5 /*! Maximum number of octets encoding MSISDN in BCD format */ #define OSMO_GSUP_MAX_MSISDN_LEN 9 +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ #define OSMO_GSUP_PDP_TYPE_SIZE 2 -- To view, visit https://gerrit.osmocom.org/7989 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0bf6ceadcac38a8c75d166402b54058e5c6c6d4 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Mon May 7 10:11:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 10:11:13 +0000 Subject: osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/8020/1/library/BSSGP_Emulation.ttcn File library/BSSGP_Emulation.ttcn: Line 538: [] BSSGP_SP.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { > I would argue this template should match all BSSGP messages for BVCI=0 (sig This sounds like a good idea but I don't see an obvious way of achieving it. What is the easiest way to achieve a match on any BSSGP PDU with BCVCI == 0? PDU_BSSGP is a union which overlays several types of BSSGP PDUs. If every such PDU had a common 'bvci' field to match on this would be trivial. But as far as I can tell, the location and name of the BVCI value may differ between various PDUs represented in this union. For example, in paging-related PDUs the BVCI is part of a Paging_Field4 subfield. The FLUSH_LL message type even has two BVCI fields (bVCI_old and bVCI_new). Do I need to add a separate .receive() case here, for each specific BSSGP PDU type of interest? Or could I write a function which returns returns true or false depending on whether a specific type of PDU belongs to a signaling or PTP virtual connection? This could probably cover most messages except the paging messages which can use either type of virtual connection. -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 10:13:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 10:13:14 +0000 Subject: osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Patch Set 1: The next patch set will use a separate signaling port facing towards the test case. As you predicted, that approach works. However, the patch will still match on paging-ps messages only (see my other question). -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 10:14:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 10:14:17 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8020 to look at the new patch set (#2). make PCU tests send PS paging requests on BVCI zero osmo-pcu discards PAGING-PS messages unless received on the signalling BVCI 0. The BVCI value must be set to zero both in the NS header and the BSSGP header. Create new ports between the PCU_Test components which the TC_paging test case can use to ensure that both layers send frames with BVCI value of zero. This does not make PCU_Tests.tc_paging work yet, however the PS paging request is now processed by osmo-pcu rather than discarded. Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Related: OS#2404 --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/8020/2 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c7766dc..beae327 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -80,6 +80,7 @@ type component BSSGP_Client_CT { port BSSGP_PT BSSGP; + port BSSGP_PT BSSGP_SIG; port BSSGP_PROC_PT BSSGP_PROC; }; @@ -99,10 +100,11 @@ } type component BSSGP_CT { - /* UDP port towards the bottom (IUT) */ + /* UDP ports towards the bottom (IUT) */ port NS_PT BSCP; /* NS-User SAP towards the user */ port BSSGP_SP_PT BSSGP_SP; + port BSSGP_SP_PT BSSGP_SP_SIG; port BSSGP_PROC_PT BSSGP_PROC; var BssgpConfig g_cfg; @@ -534,6 +536,10 @@ } } + [] BSSGP_SP_SIG.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { + BSCP.send(f_BnsUdReq(bs_pdu, 0)); + } + /* pass virtually any PDU from user to NS-UNITDATA PDU on network */ [] BSSGP_SP.receive(PDU_BSSGP:?) -> value bs_pdu sender vc_conn { BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 12b63d6..6e36f68 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -60,6 +60,7 @@ bssgp_component := BSSGP_CT.create; /* connect our BSSGP port to the BSSGP Emulation */ connect(self:BSSGP, bssgp_component:BSSGP_SP); + connect(self:BSSGP_SIG, bssgp_component:BSSGP_SP_SIG); connect(self:BSSGP_PROC, bssgp_component:BSSGP_PROC); /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); @@ -200,8 +201,9 @@ g_mmctx.tlli := f_random_tlli(); f_init(); - BSSGP.send(ts_BSSGP_PS_PAGING_IMSI(mp_gb_cfg.bvci, g_mmctx.imsi)); - BSSGP.send(ts_BSSGP_PS_PAGING_PTMSI(mp_gb_cfg.bvci, g_mmctx.imsi, tmsi)); + /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); while (true) { var BssgpDecoded bd; -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Mon May 7 10:33:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 May 2018 10:33:49 +0000 Subject: [PATCH] osmo-msc[master]: a_reset: cleanup + remove dead code Message-ID: Review at https://gerrit.osmocom.org/8054 a_reset: cleanup + remove dead code a_reset.c/h was originally developed to be used in both, bsc and msc without changes. Unfortunately no suitable library has been found for a_reset.c/h so the file ended up as duplicated code in both split brances. Eventually we decided to specialize the generalized code again, which means some of the functions needed only by osmo-bsc are removed. - Remove dead code - Fix counter number - Minor cosmetic fixes Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Related: OS#3103 --- M include/osmocom/msc/a_reset.h M src/libmsc/a_reset.c 2 files changed, 7 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/8054/1 diff --git a/include/osmocom/msc/a_reset.h b/include/osmocom/msc/a_reset.h index cdb17c2..31b7d4a 100644 --- a/include/osmocom/msc/a_reset.h +++ b/include/osmocom/msc/a_reset.h @@ -20,21 +20,11 @@ #pragma once - - /* Reset context data (callbacks, state machine etc...) */ struct a_reset_ctx { /* FSM instance, which handles the reset procedure */ struct osmo_fsm_inst *fsm; - - /* Connection failure counter. When this counter - * reaches a certain threshold, the reset procedure - * will be triggered */ - int conn_loss_counter; - - /* A human readable name to display in the logs */ - char name[256]; /* Callback function to be called when a connection * failure is detected and a rest must occur */ @@ -48,17 +38,8 @@ struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv, bool already_connected); -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset); - /* Confirm that we sucessfully received a reset acknowlege message */ void a_reset_ack_confirm(struct a_reset_ctx *reset); - -/* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset); - -/* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset); /* Check if we have a connection to a specified msc */ bool a_reset_conn_ready(struct a_reset_ctx *reset); diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c index 701066f..5629fbe 100644 --- a/src/libmsc/a_reset.c +++ b/src/libmsc/a_reset.c @@ -29,8 +29,7 @@ #include #define RESET_RESEND_INTERVAL 2 /* sec */ -#define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ -#define BAD_CONNECTION_THRESOLD 3 /* connection failures */ +#define RESET_RESEND_TIMER_NO 16/* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ enum fsm_states { ST_DISC, /* Disconnected from remote end */ @@ -39,14 +38,10 @@ enum fsm_evt { EV_RESET_ACK, /* got reset acknowlegement from remote end */ - EV_N_DISCONNECT, /* lost a connection */ - EV_N_CONNECT, /* made a successful connection */ }; static const struct value_string fsm_event_names[] = { OSMO_VALUE_STRING(EV_RESET_ACK), - OSMO_VALUE_STRING(EV_N_DISCONNECT), - OSMO_VALUE_STRING(EV_N_CONNECT), {0, NULL} }; @@ -58,7 +53,6 @@ OSMO_ASSERT(reset->fsm); LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection succeded.\n"); - reset->conn_loss_counter = 0; osmo_fsm_inst_state_chg(fi, ST_CONN, 0, 0); } @@ -67,19 +61,8 @@ { struct a_reset_ctx *reset = (struct a_reset_ctx *)data; OSMO_ASSERT(reset); - - switch (event) { - case EV_N_DISCONNECT: - if (reset->conn_loss_counter >= BAD_CONNECTION_THRESOLD) { - LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection down, reconnecting...\n"); - osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); - } else - reset->conn_loss_counter++; - break; - case EV_N_CONNECT: - reset->conn_loss_counter = 0; - break; - } + OSMO_ASSERT(reset->fsm); + LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection (already) succeded.\n"); } /* Timer callback to retransmit the reset signal */ @@ -99,13 +82,13 @@ static struct osmo_fsm_state fsm_states[] = { [ST_DISC] = { .in_event_mask = (1 << EV_RESET_ACK), - .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN), + .out_state_mask = (1 << ST_CONN), .name = "DISC", .action = fsm_disc_cb, }, [ST_CONN] = { - .in_event_mask = (1 << EV_N_DISCONNECT) | (1 << EV_N_CONNECT), - .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN), + .in_event_mask = (1 << EV_RESET_ACK), + .out_state_mask = 0, .name = "CONN", .action = fsm_conn_cb, }, @@ -138,7 +121,6 @@ OSMO_ASSERT(reset); reset->priv = priv; reset->cb = cb; - reset->conn_loss_counter = 0; reset->fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, name); OSMO_ASSERT(reset->fsm); reset->fsm->priv = reset; @@ -154,19 +136,6 @@ return reset; } -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset) -{ - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_free(reset->fsm); - reset->fsm = NULL; - - memset(reset, 0, sizeof(*reset)); - talloc_free(reset); -} - /* Confirm that we sucessfully received a reset acknowlege message */ void a_reset_ack_confirm(struct a_reset_ctx *reset) { @@ -176,31 +145,7 @@ osmo_fsm_inst_dispatch(reset->fsm, EV_RESET_ACK, reset); } -/* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset) -{ - /* If no reset context is supplied, just drop the info */ - if (!reset) - return; - - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_DISCONNECT, reset); -} - -/* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset) -{ - /* If no reset context is supplied, just drop the info */ - if (!reset) - return; - - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_CONNECT, reset); -} - -/* Check if we have a connection to a specified msc */ +/* Check if we have a connection to a specified bsc */ bool a_reset_conn_ready(struct a_reset_ctx *reset) { /* If no reset context is supplied, we assume that -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Mon May 7 10:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 7 May 2018 10:48:21 +0000 Subject: [PATCH] osmo-bsc[master]: a_reset: cleanup + remove dead code Message-ID: Review at https://gerrit.osmocom.org/8055 a_reset: cleanup + remove dead code The function a_reset_free() is not used anywhere at the code. The reason for this is that a BSC instance is never cleared once it is started up. Also the timer number is not according to the spec. - Remove a_reset_free() - Fix timer number - Fix sourcecode formatting Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Related: OS#3102 --- M include/osmocom/bsc/a_reset.h M src/libbsc/a_reset.c 2 files changed, 1 insertion(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/8055/1 diff --git a/include/osmocom/bsc/a_reset.h b/include/osmocom/bsc/a_reset.h index c01a8b0..6e1c74f 100644 --- a/include/osmocom/bsc/a_reset.h +++ b/include/osmocom/bsc/a_reset.h @@ -20,8 +20,6 @@ #pragma once - - /* Reset context data (callbacks, state machine etc...) */ struct a_reset_ctx { @@ -43,9 +41,6 @@ /* Create and start state machine which handles the reset/reset-ack procedure */ struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv); - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset); /* Confirm that we sucessfully received a reset acknowlege message */ void a_reset_ack_confirm(struct a_reset_ctx *reset); diff --git a/src/libbsc/a_reset.c b/src/libbsc/a_reset.c index 1fccc5f..21c6d5f 100644 --- a/src/libbsc/a_reset.c +++ b/src/libbsc/a_reset.c @@ -30,7 +30,7 @@ #include #define RESET_RESEND_INTERVAL 2 /* sec */ -#define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ +#define RESET_RESEND_TIMER_NO 4/* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.1 */ #define BAD_CONNECTION_THRESOLD 3 /* connection failures */ enum fsm_states { @@ -147,19 +147,6 @@ osmo_fsm_inst_state_chg(reset->fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); return reset; -} - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset) -{ - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_free(reset->fsm); - reset->fsm = NULL; - - memset(reset, 0, sizeof(*reset)); - talloc_free(reset); } /* Confirm that we sucessfully received a reset acknowlege message */ -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Mon May 7 12:18:37 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 12:18:37 +0000 Subject: [PATCH] osmo-bts[master]: let osmo-bts log a special notice if OML connection is close... Message-ID: Review at https://gerrit.osmocom.org/8056 let osmo-bts log a special notice if OML connection is closed early A frequent configuration file error is that the unit_id settings of osmo-bts and osmo-bsc don't match. The BSC already prints an error in this case. Let the BTS print an error as well. We use a heuristic for this purpose: If the OML link is dropped within 10 seconds after being established, log a special warning which alerts the user and recommend a manual configuration file check. Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Related: OS#3143 --- M include/osmo-bts/gsm_data_shared.h M src/common/abis.c 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/8056/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 812d086..6a1613b 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -514,6 +514,10 @@ uint8_t initial_mcs; }; +/* The amount of time within which a sudden disconnect of a newly established + * OML connection will cause a special warning to be logged. */ +#define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ + /* One BTS */ struct gsm_bts { /* list header in net->bts_list */ @@ -552,6 +556,7 @@ /* how do we talk OML with this TRX? */ uint8_t oml_tei; struct e1inp_sign_link *oml_link; + struct timeval oml_conn_established_timestamp; /* Abis network management O&M handle */ struct abis_nm_h *nmh; diff --git a/src/common/abis.c b/src/common/abis.c index 6aa2f1d..6c303b9 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,9 @@ sign_link = g_bts->oml_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1], E1INP_SIGN_OML, NULL, 255, 0); + if (osmo_gettimeofday(&g_bts->oml_conn_established_timestamp, NULL) != 0) + memset(&g_bts->oml_conn_established_timestamp, 0, + sizeof(g_bts->oml_conn_established_timestamp)); drain_oml_queue(g_bts); sign_link->trx = g_bts->c0; bts_link_estab(g_bts); @@ -140,9 +144,22 @@ LOGP(DABIS, LOGL_ERROR, "Signalling link down\n"); /* First remove the OML signalling link */ - if (g_bts->oml_link) + if (g_bts->oml_link) { + struct timeval now; + e1inp_sign_link_destroy(g_bts->oml_link); + + /* Log a special notice if the OML connection was dropped relatively quickly. */ + if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && osmo_gettimeofday(&now, NULL) == 0 && + g_bts->oml_conn_established_timestamp.tv_sec + OSMO_BTS_OML_CONN_EARLY_DISCONNECT >= now.tv_sec) { + LOGP(DABIS, LOGL_NOTICE, "OML link was closed early within %" PRIu64 " seconds. " + "If this situation persists, please check your BTS and BSC configuration files for errors. " + "A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n", + (uint64_t)(now.tv_sec - g_bts->oml_conn_established_timestamp.tv_sec)); + } + } g_bts->oml_link = NULL; + memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(g_bts->oml_conn_established_timestamp)); /* Then iterate over the RSL signalling links */ llist_for_each_entry(trx, &g_bts->trx_list, list) { -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Mon May 7 12:52:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 12:52:07 +0000 Subject: osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 (7 comments) +2 for the dead code removal. Also added some general comments related to OS#3103. https://gerrit.osmocom.org/#/c/8054/1/src/libmsc/a_reset.c File src/libmsc/a_reset.c: Line 32: #define RESET_RESEND_TIMER_NO 16/* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ (space before comment) Line 60: static void fsm_conn_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) Looks like you can also drop this cb function. So, there is no way to transition back to ST_DISC? How is a disconnect noticed, by terminating the FSM? Line 71: struct a_reset_ctx *reset = (struct a_reset_ctx *)fi->priv; I don't see anywhere pointing fi->priv to a_reset_ctx. Something tells me you haven't tested reset ack timeout and Reset resending? Line 74: LOGPFSML(reset->fsm, LOGL_NOTICE, "(re)sending BSSMAP RESET message...\n"); (rather use fi; of course they should be identical, just is more like the usual fi code flow) Line 90: .in_event_mask = (1 << EV_RESET_ACK), we explicitly allow repeated RESET ACKs? Is that a real thing? Line 122: reset->priv = priv; re priv, see here. Line 145: osmo_fsm_inst_dispatch(reset->fsm, EV_RESET_ACK, reset); re priv, this uses event's data pointer instead of priv. -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 13:15:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 13:15:43 +0000 Subject: osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review-1 (2 comments) One thing that's worse after this patch: we add a couple of short-lived small dynamic allocations (gsup message, msisdn, apn). The root cause being that we failed to use actual arrays in the original definition of the gsup message struct. Instead of talloc, we could pass in non-dynamic buffers (maybe even in a struct definition with the sole purpose of providing uint8_t[] for a gsup message), or we could use static buffers within the new function (and make it non-threadsafe, which is ok because we use select() to handle messages one after the other anyway). What do others think, is avoiding dynamic allocation micro-optimisation or worth rewriting this patch for? https://gerrit.osmocom.org/#/c/7992/2/src/gsup_server.c File src/gsup_server.c: Line 369: gsup = talloc_zero(NULL, struct osmo_gsup_message); do not talloc from NULL ctx, pass a ctx in as arg. If you talloc at NULL, we are likely to miss memory leaks should they show up. Line 373: osmo_strlcpy(gsup->imsi, imsi, GSM23003_IMSI_MAX_DIGITS + 1); wouldn't it make sense to use sizeof(gsup->imsi) instead of guessing the same constants again, hopefully correctly? -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 13:33:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 13:33:57 +0000 Subject: osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Patch Set 1: (5 comments) please clarify... https://gerrit.osmocom.org/#/c/8055/1/src/libbsc/a_reset.c File src/libbsc/a_reset.c: Line 158 good point, where is the inevitable osmo_fsm_inst_term() needed to end this FSM when the connection to an MSC ends? Line 162 and now, who does ever free the reset_ctx? Seeing above that the fsm is allocated with 'reset' as its ctx, instead of the other way round, you need to separately talloc_free(reset) *somewhere*. And also an FSM term has to take care to NULL the reset->fsm pointer. (I've been through all this a couple of times working on the VLR back in the days.) The easiest solution is to keep 'reset' as the FSM's priv pointer, and also alloc the 'reset' as a talloc-child of the fi. Line 33: #define RESET_RESEND_TIMER_NO 4/* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.1 */ (missing space before comment) Line 74: if (reset->conn_loss_counter >= BAD_CONNECTION_THRESOLD) { I thought this wasn't used anymore. If it was, that would bring back the situation that caused a Reset after every third message? Line 144: reset->fsm->priv = reset; rather pass priv to osmo_fsm_inst_alloc()? :) -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 13:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 13:35:30 +0000 Subject: osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/8054/1/src/libmsc/a_reset.c File src/libmsc/a_reset.c: Line 126: reset->fsm->priv = reset; ah, my bad, fsm->priv is actually set here. But rather use the priv arg of osmo_fsm_inst_alloc(), and rather decide on using priv or using the event data pointer, not both. (I'd favor fi->priv) -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 14:48:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Mon, 7 May 2018 14:48:21 +0000 Subject: [PATCH] osmo-bts[master]: send a State Changed Event Report when rf is locked/unlocked Message-ID: Review at https://gerrit.osmocom.org/8057 send a State Changed Event Report when rf is locked/unlocked Make osmo-bts send a State Changed Event Report when RF is locked or unlocked. This behaviour isn't mentioned in the spec as far as we know, but an ipaccess nanobts also produces these messages. Change-Id: I37e44ef4881c41f8835428b610e7863f37397c9f Related: OS#3161 --- M src/common/oml.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/8057/1 diff --git a/src/common/oml.c b/src/common/oml.c index a1e7fda..89db9cf 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -322,6 +322,9 @@ /* 9.4.7 Availability Status */ msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &mo->nm_state.availability); + /* 9.4.4 Administrative Status -- not in spec but also sent by nanobts */ + msgb_tv_put(nmsg, NM_ATT_ADM_STATE, mo->nm_state.administrative); + return oml_mo_send_msg(mo, nmsg, NM_MT_STATECHG_EVENT_REP); } @@ -383,6 +386,7 @@ int oml_mo_statechg_ack(struct gsm_abis_mo *mo) { struct msgb *msg; + int rc = 0; msg = oml_msgb_alloc(); if (!msg) @@ -390,7 +394,12 @@ msgb_tv_put(msg, NM_ATT_ADM_STATE, mo->nm_state.administrative); - return oml_mo_send_msg(mo, msg, NM_MT_CHG_ADM_STATE_ACK); + rc = oml_mo_send_msg(mo, msg, NM_MT_CHG_ADM_STATE_ACK); + if (rc != 0) + return rc; + + /* Emulate behaviour of ipaccess nanobts: Send a 'State Changed Event Report' as well. */ + return oml_tx_state_changed(mo); } int oml_mo_statechg_nack(struct gsm_abis_mo *mo, uint8_t nack_cause) -- To view, visit https://gerrit.osmocom.org/8057 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37e44ef4881c41f8835428b610e7863f37397c9f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Mon May 7 14:49:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:49:56 +0000 Subject: osmo-bts[master]: send a State Changed Event Report when rf is locked/unlocked In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 nice catch! -- To view, visit https://gerrit.osmocom.org/8057 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I37e44ef4881c41f8835428b610e7863f37397c9f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:50:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:50:21 +0000 Subject: meta-telephony[201705]: Remove libosmo-sccp_0.0.6.1.bb In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8046 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:50:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:50:34 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Remove manual recreation of tarball-version... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8047 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:50:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:50:44 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Move DEPENDS to .inc files In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8048 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:50:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:50:54 +0000 Subject: meta-telephony[201705]: libosmo-sccp: Move version independent bits to .inc file In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8049 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:51:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:51:19 +0000 Subject: meta-telephony[201705]: recipes-osmocom: Update to latest release In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8050 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:55:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:55:13 +0000 Subject: osmo-bts[master]: let osmo-bts log a special notice if OML connection is close... In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/8056/1/src/common/abis.c File src/common/abis.c: Line 153: if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && osmo_gettimeofday(&now, NULL) == 0 && it's not super critical, I guess, but gettimeofday is not monotonic. So if ntpdate or gpsdate or whatever else is adjusting the time/date meanwhile, we'll get quite some weird output / behavior. "clock_gettime(CLOCK_MONOTONIC, &tp);" would prevent that. -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 14:55:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:55:53 +0000 Subject: osmo-ci[master]: osmo-gsm-tester-builder: notify unstable builds In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8052 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a1d7b5e1af5b4fbd12effa870542df2d6be7647 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 14:55:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:55:58 +0000 Subject: [MERGED] osmo-ci[master]: osmo-gsm-tester-builder: notify unstable builds In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-gsm-tester-builder: notify unstable builds ...................................................................... osmo-gsm-tester-builder: notify unstable builds Change-Id: I5a1d7b5e1af5b4fbd12effa870542df2d6be7647 --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index 8f3ce61..a43580c 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -52,6 +52,9 @@ artifacts: '*.tgz, *.md5' only-if-success: 'true' default-excludes: false + - email: + recipients: 'pespin at sysmocom.de' + notify-every-unstable-build: true properties: - build-discarder: num-to-keep: 20 -- To view, visit https://gerrit.osmocom.org/8052 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a1d7b5e1af5b4fbd12effa870542df2d6be7647 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: lynxis lazus From gerrit-no-reply at lists.osmocom.org Mon May 7 14:56:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:56:04 +0000 Subject: [MERGED] meta-telephony[201705]: recipes-osmocom: Update to latest release In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: recipes-osmocom: Update to latest release ...................................................................... recipes-osmocom: Update to latest release Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e --- M recipes-misc/libsmpp/libsmpp34_git.bb M recipes-osmocom/libasn1c/libasn1c_git.bb M recipes-osmocom/libosmo-abis/libosmo-abis.inc M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif.inc M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/libosmocore/libosmocore.inc M recipes-osmocom/libosmocore/libosmocore_git.bb M recipes-osmocom/openbsc/openbsc.inc M recipes-osmocom/openbsc/openbsc_git.bb M recipes-osmocom/osmo-bsc/osmo-bsc.inc M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb M recipes-osmocom/osmo-hlr/osmo-hlr.inc M recipes-osmocom/osmo-hlr/osmo-hlr_git.bb M recipes-osmocom/osmo-iuh/osmo-iuh.inc M recipes-osmocom/osmo-iuh/osmo-iuh_git.bb M recipes-osmocom/osmo-mgw/osmo-mgw.inc M recipes-osmocom/osmo-mgw/osmo-mgw_git.bb M recipes-osmocom/osmo-msc/osmo-msc.inc M recipes-osmocom/osmo-msc/osmo-msc_git.bb M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc M recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb M recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb 26 files changed, 42 insertions(+), 43 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-misc/libsmpp/libsmpp34_git.bb b/recipes-misc/libsmpp/libsmpp34_git.bb index 6cfe4e5..e04e525 100644 --- a/recipes-misc/libsmpp/libsmpp34_git.bb +++ b/recipes-misc/libsmpp/libsmpp34_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libxml2" S = "${WORKDIR}/git" -SRCREV = "0cad3b4538710a91881ddbb80424c2d7c62de962" +SRCREV = "6996e5dba9603208609f4604a3b3d59f88c85d90" SRC_URI = "git://git.osmocom.org/libsmpp34.git;protocol=git" -PV = "1.12.0+gitr${SRCPV}" +PV = "1.13.0+gitr${SRCPV}" PR = "r0" PARALLEL_MAKE = "" diff --git a/recipes-osmocom/libasn1c/libasn1c_git.bb b/recipes-osmocom/libasn1c/libasn1c_git.bb index af6486e..9d4fa87 100644 --- a/recipes-osmocom/libasn1c/libasn1c_git.bb +++ b/recipes-osmocom/libasn1c/libasn1c_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "202022eaa9c36d1209cf024830b99d7d2463663e" +SRCREV = "d36012fb029fd9914b4e8125c9c3186785940258" SRC_URI = "git://git.osmocom.org/libasn1c.git;protocol=git" -PV = "0.9.28+gitr${SRCPV}" +PV = "0.9.31+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 8d02a75..58f4242 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "AGPLv3" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 16b0da3..1bfdb18 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "49917c129b1456585258b0ebe89a513ecef823a8" +SRCREV = "7b89f12e66a280746fc8e7906505b2d769d19706" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" -PV = "0.4.0+gitr${SRCPV}" +PV = "0.5.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 511b668..a353be6 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://git.osmocom.org" LICENSE = "GPLv2+" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index 0aef031..419cb2c 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "9d726d0e56665b4439bb4efe782be06be2e83ffb" +SRCREV = "e38ee9b808970cd49663221cb823365ef18797d5" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" -PV = "0.1.1+gitr${SRCPV}" -PR = "${INC_PR}.1" +PV = "0.2.0+gitr${SRCPV}" +PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index c388c32..60793e3 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -3,7 +3,7 @@ HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp" LICENSE = "AGPLv3" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 20cecb8..bb83638 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "58fcc5344ea0e914c7f9be69c309998d243142bd" +SRCREV = "c88605c41c25b34d2e2b08f0e1028c2bd6d9404b" SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PV = "0.8.1+gitr${SRCPV}" +PV = "0.9.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index a501c2a..6077ff5 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -2,7 +2,7 @@ HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "GPLv2+" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 43a9426..c2c37f5 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -1,9 +1,9 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a2501a20651bad1c1645547c8ad99af4f5c64e2e" +SRCREV = "cacaa4a1616d7c0ea370ff197d816f706909bde5" SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git;nobranch=1" -PV = "0.10.2+gitr${SRCPV}" +PV = "0.11.0+gitr${SRCPV}" PR = "r0" PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 5e4b10d..36c57e7 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,8 +11,7 @@ file://osmo-bsc-sccplite.service \ " -INC_PR = "r25.${META_TELEPHONY_OSMO_INC}" - +INC_PR = "r0.${META_TELEPHONY_OSMO_INC}" EXTRA_OECONF += "--enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index 7aee169..e3af4bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,10 @@ require ${PN}.inc -PV = "1.0.0+gitr${SRCPV}" +PV = "1.1.0+gitr${SRCPV}" PRINC = "0" PR = "${INC_PR}.0" -SRCREV = "c6382b5e0b4790d15681e89f704465160b9aef1d" +SRCREV = "cc69659217d19af5635638a0fbd4f0702f79bac4" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git" S = "${WORKDIR}/git/openbsc" diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index d14fdd2..f20362f 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -5,7 +5,7 @@ DEPENDS = "sqlite3 libpcap libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index ef1eee9..44e0f99 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a8eafef966bfbd8046ee8319b889b2dee8391434" +SRCREV = "1b11bc808f9fe4234bb3b42965f8b7ca5c33e303" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.1.2+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 77aa4be..13d3cbd 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -2,10 +2,10 @@ HOMEPAGE = "https://osmocom.org/projects/openggsn" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.2.1+gitr${SRCPV}" PR = "r0" -SRCREV = "a16c7501a4eccded2919fab0d485f77fb87dc81a" +SRCREV = "ac07625086948281295e54dd295228153ecd5ff0" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc index 7dd6234..7e75d13 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc +++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc @@ -5,7 +5,7 @@ DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb index b1a1955..d10d893 100644 --- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb +++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "70e7f21cb1748dbc766361d139d8854f7f63ceb0" +SRCREV = "78f430102516a970b9899f962d4562ebdb718670" SRC_URI = "git://git.osmocom.org/osmo-hlr.git;protocol=git" -PV = "0.1.0+gitr${SRCPV}" +PV = "0.2.1+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc index 2737412..6dfb344 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc +++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc @@ -5,7 +5,7 @@ DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c" -INC_PR="r2.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb index dba79e9..a983c4e 100644 --- a/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb +++ b/recipes-osmocom/osmo-iuh/osmo-iuh_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "cf5fbea78f2f7316e7cbe91f32cb79b4a02abd75" +SRCREV = "ba941e553d60a06a45ad96f0ad4161383d4c0d30" SRC_URI = "git://git.osmocom.org/osmo-iuh.git;protocol=git" -PV = "0.2.0+gitr${SRCPV}" +PV = "0.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc index 3294464..b083a9c 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc +++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc @@ -5,7 +5,7 @@ DEPENDS = "libosmocore libosmo-netif bcg729 libgsm" -INC_PR="r1.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb index 8731c68..d863300 100644 --- a/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb +++ b/recipes-osmocom/osmo-mgw/osmo-mgw_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "086c3f3c674a276205a793300c80802d2355cabd" +SRCREV = "d761d355f9b71b1dfe462e55a6e030bb026d8bf1" SRC_URI = "git://git.osmocom.org/osmo-mgw.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc index a6584a0..06f5b10 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc.inc +++ b/recipes-osmocom/osmo-msc/osmo-msc.inc @@ -5,7 +5,7 @@ DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw" -INC_PR="r4.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-msc/osmo-msc_git.bb b/recipes-osmocom/osmo-msc/osmo-msc_git.bb index 14c1690..3e5e9d7 100644 --- a/recipes-osmocom/osmo-msc/osmo-msc_git.bb +++ b/recipes-osmocom/osmo-msc/osmo-msc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "053e27528cf4da1f96bd5bf78c6982b73b790100" +SRCREV = "cb8c75bba030c7ab9f2e49b2f40292a1738f3220" SRC_URI = "git://git.osmocom.org/osmo-msc.git;protocol=git" -PV = "1.1.2+gitr${SRCPV}" +PV = "1.2.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc index 84c4e41..4711a2c 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc @@ -5,7 +5,7 @@ DEPENDS = "c-ares libosmocore libosmo-netif osmo-ggsn" -INC_PR="r4.${META_TELEPHONY_OSMO_INC}" +INC_PR="r0.${META_TELEPHONY_OSMO_INC}" inherit autotools pkgconfig systemd diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb index 07e16c6..f76ced5 100644 --- a/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb +++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "69e356be93c420b5e2f8b96fbc89ef889cbcfe53" +SRCREV = "39c67e2640fc34346dffe3cff9f9f8e905fe5ad9" SRC_URI = "git://git.osmocom.org/osmo-sgsn.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.3.0+gitr${SRCPV}" PR = "${INC_PR}.0" diff --git a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb index f13f677..b5a1627 100644 --- a/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb +++ b/recipes-osmocom/osmo-sip-connector/osmo-sip-connector_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "a6a34fd7188bbe46fbd84484610697dd5930d584" +SRCREV = "55faf3867540f5d42a69e17cdc02f0e522f42478" SRC_URI = "git://git.osmocom.org/osmo-sip-connector.git;protocol=git" -PV = "1.1.0+gitr${SRCPV}" +PV = "1.1.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/8050 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd3b95f51e8085df669015e107483e89b2a7d64e Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 14:56:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:56:04 +0000 Subject: [MERGED] meta-telephony[201705]: libosmo-sccp: Move version independent bits to .inc file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: libosmo-sccp: Move version independent bits to .inc file ...................................................................... libosmo-sccp: Move version independent bits to .inc file Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 --- M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb 2 files changed, 22 insertions(+), 22 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc index d269dae..c388c32 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc @@ -9,4 +9,26 @@ inherit autotools pkgconfig systemd +# we require the tests to link to the static libosmo-sigtran library to +# access symbols not starting with osmo_* +EXTRA_OECONF_remove = "--disable-static" + +PACKAGES =+ "osmo-stp" +SYSTEMD_PACKAGES = "osmo-stp" +SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" + +do_install_append() { + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}${sysconfdir}/osmocom/ + + install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ + install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ +} + +FILES_osmo-stp = " \ + ${bindir}/osmo-stp \ + ${sysconfdir}/osmocom/osmo-stp.cfg \ + " +CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg" + ALLOW_EMPTY_libosmo-sccp = "1" diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index b353acb..20cecb8 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -5,25 +5,3 @@ SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" PV = "0.8.1+gitr${SRCPV}" PR = "${INC_PR}.0" - -# we require the tests to link to the static libosmo-sigtran library to -# access symbols not starting with osmo_* -EXTRA_OECONF_remove = "--disable-static" - -PACKAGES =+ "osmo-stp" -SYSTEMD_PACKAGES = "osmo-stp" -SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" - -do_install_append() { - install -d ${D}${systemd_system_unitdir}/ - install -d ${D}${sysconfdir}/osmocom/ - - install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/ -} - -FILES_osmo-stp = " \ - ${bindir}/osmo-stp \ - ${sysconfdir}/osmocom/osmo-stp.cfg \ - " -CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg" -- To view, visit https://gerrit.osmocom.org/8049 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 14:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:56:05 +0000 Subject: [MERGED] meta-telephony[201705]: recipes-osmocom: Move DEPENDS to .inc files In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: recipes-osmocom: Move DEPENDS to .inc files ...................................................................... recipes-osmocom: Move DEPENDS to .inc files Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b --- M recipes-osmocom/libosmo-abis/libosmo-abis.inc M recipes-osmocom/libosmo-abis/libosmo-abis_git.bb M recipes-osmocom/libosmo-netif/libosmo-netif.inc M recipes-osmocom/libosmo-netif/libosmo-netif_git.bb M recipes-osmocom/libosmocore/libosmocore.inc M recipes-osmocom/libosmocore/libosmocore_git.bb 6 files changed, 5 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc b/recipes-osmocom/libosmo-abis/libosmo-abis.inc index 3f1ce3c..8d02a75 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc +++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc @@ -1,5 +1,5 @@ DESCRIPTION = "An utility library for Open Source Mobile Communications" -DEPENDS = "libosmocore ortp" +DEPENDS = "libosmocore ortp libtalloc" DEPENDS_append_geode = "dahdi-linux" HOMEPAGE = "http://openbsc.gnumonks.org" LICENSE = "AGPLv3" diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb index 8d1b56e..16b0da3 100644 --- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb +++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb @@ -1,7 +1,5 @@ require ${PN}.inc -DEPENDS += "libtalloc" - S = "${WORKDIR}/git" SRCREV = "49917c129b1456585258b0ebe89a513ecef823a8" SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif.inc b/recipes-osmocom/libosmo-netif/libosmo-netif.inc index 2b7c0fa..511b668 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif.inc +++ b/recipes-osmocom/libosmo-netif/libosmo-netif.inc @@ -1,5 +1,5 @@ -DESCRIPTION = "Osmux utility classes" -DEPENDS = "libosmo-abis" +DESCRIPTION = "Osmocom network interface library" +DEPENDS = "libosmo-abis libtalloc lksctp-tools" HOMEPAGE = "http://git.osmocom.org" LICENSE = "GPLv2+" diff --git a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb index cc1795a..0aef031 100644 --- a/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb +++ b/recipes-osmocom/libosmo-netif/libosmo-netif_git.bb @@ -1,7 +1,5 @@ require ${PN}.inc -DEPENDS += "libtalloc lksctp-tools" - S = "${WORKDIR}/git" SRCREV = "9d726d0e56665b4439bb4efe782be06be2e83ffb" SRC_URI = "git://git.osmocom.org/libosmo-netif.git;protocol=git" diff --git a/recipes-osmocom/libosmocore/libosmocore.inc b/recipes-osmocom/libosmocore/libosmocore.inc index 25ed5c3..a501c2a 100644 --- a/recipes-osmocom/libosmocore/libosmocore.inc +++ b/recipes-osmocom/libosmocore/libosmocore.inc @@ -6,5 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -inherit autotools pkgconfig +DEPENDS = "libtalloc gnutls" +inherit autotools pkgconfig diff --git a/recipes-osmocom/libosmocore/libosmocore_git.bb b/recipes-osmocom/libosmocore/libosmocore_git.bb index 98081bf..43a9426 100644 --- a/recipes-osmocom/libosmocore/libosmocore_git.bb +++ b/recipes-osmocom/libosmocore/libosmocore_git.bb @@ -6,8 +6,6 @@ PV = "0.10.2+gitr${SRCPV}" PR = "r0" -DEPENDS += "libtalloc gnutls" - PACKAGES =+ "libosmoctrl libosmocodec libosmogb libosmogsm libosmovty osmo-arfcn osmo-auc-gen" FILES_libosmoctrl = "${libdir}/libosmoctrl${SOLIBS}" FILES_libosmocodec = "${libdir}/libosmocodec${SOLIBS}" -- To view, visit https://gerrit.osmocom.org/8048 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I436e8c954e7c29c8e583507c048828e852704f4b Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 14:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:56:05 +0000 Subject: [MERGED] meta-telephony[201705]: recipes-osmocom: Remove manual recreation of tarball-version... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: recipes-osmocom: Remove manual recreation of tarball-version file ...................................................................... recipes-osmocom: Remove manual recreation of tarball-version file The reasoning behind this manual operation in configure_prepend doesn't apply anymore. In pyro it seems configure can properly set the version, and it was seen during latest releases in upstream that having those manually is counterproductive, because then outdated versions are used. Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c --- M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb M recipes-osmocom/openbsc/openbsc.inc 2 files changed, 0 insertions(+), 10 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb index 23ee6b7..b353acb 100644 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb +++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb @@ -14,11 +14,6 @@ SYSTEMD_PACKAGES = "osmo-stp" SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service" -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} - do_install_append() { install -d ${D}${systemd_system_unitdir}/ install -d ${D}${sysconfdir}/osmocom/ diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index ba0d75c..5e4b10d 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -18,11 +18,6 @@ inherit autotools update-rc.d pkgconfig -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} - do_install_append() { install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg -- To view, visit https://gerrit.osmocom.org/8047 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c1ad67224cde2f3a25c6fe945509586ec84de0c Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 14:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:56:05 +0000 Subject: [MERGED] meta-telephony[201705]: Remove libosmo-sccp_0.0.6.1.bb In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Remove libosmo-sccp_0.0.6.1.bb ...................................................................... Remove libosmo-sccp_0.0.6.1.bb This recipe is outdated as we use the _git ones nowadays. Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 --- D recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb deleted file mode 100644 index 7e8b92f..0000000 --- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_0.0.6.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc - -S = "${WORKDIR}/git" -SRCREV = "2d2d885bd124b8ae2d3a04f3583a756029820dc0" -SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git" -PR = "${INC_PR}.1" - -# because "${WORKDIR}/git" is not a git repo, it can't figure out the version -do_configure_prepend() { - echo "${PV}" > ${S}/.tarball-version -} -- To view, visit https://gerrit.osmocom.org/8046 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ccfd2a79955708fad8c37a86e0515bca1839ca6 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 14:57:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 7 May 2018 14:57:23 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: there has been some discussion today on IRC about the MGW configuration being actually global and not beloging to any specific MSC config node? Pau? -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:45 +0000 Subject: [PATCH] osmo-gsm-tester[master]: Check physical channel configs Message-ID: Review at https://gerrit.osmocom.org/8058 Check physical channel configs Change-Id: I5894678e0d6f306173cc550dd6806a7d6f8a4c11 --- M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/58/8058/1 diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 689f976..4b9e1ff 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -64,6 +64,7 @@ 'bts[].trx_list[].net_device': schema.STR, 'bts[].trx_list[].nominal_power': schema.UINT, 'bts[].trx_list[].max_power_red': schema.UINT, + 'bts[].trx_list[].timeslot_list[].phys_chan_config': schema.PHY_CHAN, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 487521a..1473ad7 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -99,6 +99,12 @@ return raise ValueError('Unknown Modem Feature: %r' % val) +def phy_channel_config(val): + if val in ('CCCH', 'CCCH+SDCCH4', 'TCH/F', 'TCH/H', 'SDCCH8', 'PDCH', + 'TCH/F_PDCH', 'CCCH+SDCCH4+CBCH', 'SDCCH8+CBCH','TCH/F_TCH/H_PDCH'): + return + raise ValueError('Unknown Physical channel config: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -113,6 +119,7 @@ TIMES='times' CIPHER = 'cipher' MODEM_FEATURE = 'modem_feature' +PHY_CHAN = 'chan' SCHEMA_TYPES = { INT: int, @@ -129,6 +136,7 @@ TIMES: times, CIPHER: cipher, MODEM_FEATURE: modem_feature, + PHY_CHAN: phy_channel_config, } def validate(config, schema): -- To view, visit https://gerrit.osmocom.org/8058 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5894678e0d6f306173cc550dd6806a7d6f8a4c11 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:45 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts: Refactor conf_for_bsc_osmo Message-ID: Review at https://gerrit.osmocom.org/8059 bts: Refactor conf_for_bsc_osmo Move duplicated code into a method in the superclass. Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb --- M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py 5 files changed, 21 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/59/8059/1 diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index 6350c56..a930442 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -56,21 +56,7 @@ ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('nanobts')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('nanobts') # Hack until we have proper ARFCN resource allocation support (OS#2230) band = values.get('band') trx_list = values.get('trx_list') diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index f48afcc..70deba3 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -112,21 +112,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_octphy')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_octphy') self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index be87b9d..d0ba557 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -35,6 +35,23 @@ if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) + def conf_for_bsc_osmo(self, bts_defaults_name): + values = config.get_defaults('bsc_bts') + config.overlay(values, config.get_defaults(bts_defaults_name)) + if self.lac is not None: + config.overlay(values, { 'location_area_code': self.lac }) + if self.rac is not None: + config.overlay(values, { 'routing_area_code': self.rac }) + if self.cellid is not None: + config.overlay(values, { 'cell_identity': self.cellid }) + if self.bvci is not None: + config.overlay(values, { 'bvci': self.bvci }) + config.overlay(values, self.conf) + + sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() + config.overlay(values, sgsn_conf) + return values + ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index bd8aedf..f1a9bdf 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -92,21 +92,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_trx')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_trx') self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index 7a41033..c9978e5 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -103,21 +103,7 @@ return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts') def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_sysmo')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_sysmo') self.dbg(conf=values) return values -- To view, visit https://gerrit.osmocom.org/8059 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:46 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts: Pass defaults config name at construct time Message-ID: Review at https://gerrit.osmocom.org/8060 bts: Pass defaults config name at construct time It will be needed later at construction time when resolving the num of trx. Change-Id: I2c6a46ead14010f714897ea178917327215823e7 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py 6 files changed, 17 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/60/8060/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 02e5df7..fac4fd2 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -32,15 +32,16 @@ rac = None cellid = None bvci = None + defaults_cfg_name = None ############## # PROTECTED ############## - def __init__(self, suite_run, conf, name): + def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(log.C_RUN, name) self.suite_run = suite_run self.conf = conf - + self.defaults_cfg_name = defaults_cfg_name ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index a930442..d631f1c 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -36,7 +36,7 @@ def __init__(self, suite_run, conf): if conf.get('addr') is None: raise log.Error('No attribute addr provided in conf!') - super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('addr')) + super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('addr'), 'nanobts') def _configure(self): if self.bsc is None: @@ -56,7 +56,7 @@ ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('nanobts') + values = self.conf_for_bsc_prepare() # Hack until we have proper ARFCN resource allocation support (OS#2230) band = values.get('band') trx_list = values.get('trx_list') diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 70deba3..1c4b4a0 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -36,7 +36,7 @@ CONF_BTS_OCTPHY = 'osmo-bts-octphy.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY) + super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY, 'osmo_bts_octphy') self.env = {} self.values = {} @@ -112,7 +112,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_octphy') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index d0ba557..8629b9b 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -30,14 +30,14 @@ ############## # PROTECTED ############## - def __init__(self, suite_run, conf, name): - super().__init__(suite_run, conf, name) + def __init__(self, suite_run, conf, name, defaults_cfg_name): + super().__init__(suite_run, conf, name, defaults_cfg_name) if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) - def conf_for_bsc_osmo(self, bts_defaults_name): + def conf_for_bsc_prepare(self): values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(bts_defaults_name)) + config.overlay(values, config.get_defaults(self.defaults_cfg_name)) if self.lac is not None: config.overlay(values, { 'location_area_code': self.lac }) if self.rac is not None: @@ -94,8 +94,8 @@ ############## pcu_sk_tmp_dir = None - def __init__(self, suite_run, conf, name): - super().__init__(suite_run, conf, name) + def __init__(self, suite_run, conf, name, defaults_cfg_name): + super().__init__(suite_run, conf, name, defaults_cfg_name) ######################## # PUBLIC - INTERNAL API diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index f1a9bdf..9f76194 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -38,7 +38,7 @@ CONF_BTS_TRX = 'osmo-bts-trx.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX) + super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX, 'osmo_bts_trx') self.env = {} def trx_remote_ip(self): @@ -92,7 +92,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_trx') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index c9978e5..d0f6ff3 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -35,7 +35,7 @@ BTS_SYSMO_CFG = 'osmo-bts-sysmo.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN) + super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN, 'osmo_bts_sysmo') self.remote_user = 'root' def _direct_pcu_enabled(self): @@ -103,7 +103,7 @@ return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts') def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_sysmo') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values -- To view, visit https://gerrit.osmocom.org/8060 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c6a46ead14010f714897ea178917327215823e7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:46 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts: Allow setting amounf of TRX and timeslot in cfg and fro... Message-ID: Review at https://gerrit.osmocom.org/8061 bts: Allow setting amounf of TRX and timeslot in cfg and from test at runtime The num_trx attribute for a given BTS states the number of TRX to be used by that BTS. If more than num_trx are configured in trx_list in the cfg file, then only up to num_trx are taken into account. If a num_trx value higher than max_trx is specified throuygh config file or at runtime by the test, an exception is raised explaining the issue. The num/max_trx attributes are overlayed along the config levels (generic -> bsc_bts -> specific bts-type -> specific resource object). This way we can specify a long list of trx+timeslot config in the generic config (bsc_bts), and tune for each model and specific BTS which is the desired default number of TRX, as well as the maximum supported per type. Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac --- M example/defaults.conf M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/resource.py 5 files changed, 98 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/61/8061/1 diff --git a/example/defaults.conf b/example/defaults.conf index c110dde..1e84200 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -28,6 +28,8 @@ base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts + num_trx: 1 + max_trx: 1 trx_list: - nominal_power: 23 max_power_red: 0 @@ -41,3 +43,18 @@ - phys_chan_config: TCH/F - phys_chan_config: PDCH - phys_chan_config: PDCH + - nominal_power: 23 + max_power_red: 0 + arfcn: 870 + timeslot_list: + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + +osmo_bts_octphy: + max_trx: 2 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index fac4fd2..fe27b34 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -21,7 +21,7 @@ import pprint import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcu_osmo +from . import log, config, util, template, process, schema, pcu_osmo class Bts(log.Origin, metaclass=ABCMeta): suite_run = None @@ -33,6 +33,9 @@ cellid = None bvci = None defaults_cfg_name = None + _num_trx = 1 + _max_trx = None + overlay_trx_list = [] ############## # PROTECTED @@ -42,6 +45,50 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + self._init_num_trx() + + def _resolve_bts_cfg(self, cfg_name): + res = None + val = config.get_defaults('bsc_bts').get(cfg_name) + if val is not None: + res = val + val = config.get_defaults(self.defaults_cfg_name).get(cfg_name) + if val is not None: + res = val + val = self.conf.get(cfg_name) + if val is not None: + res = val + return res + + def _init_num_trx(self): + self._num_trx = 1 + self._max_trx = None + val = self._resolve_bts_cfg('num_trx') + if val is not None: + self._num_trx = int(val) + val = self._resolve_bts_cfg('max_trx') + if val is not None: + self._max_trx = int(val) + self._validate_new_num_trx(self._num_trx) + self.overlay_trx_list = [Bts._new_default_trx_cfg() for trx in range(self._num_trx)] + + def _validate_new_num_trx(self, num_trx): + if self._max_trx is not None and num_trx > self._max_trx: + raise log.Error('Amount of TRX requested is too high for maximum allowed: %u > %u' %(num_trx, self._max_trx)) + + @staticmethod + def _new_default_trx_cfg(): + return {'timeslot_list':[{} for ts in range(8)]} + + @staticmethod + def _trx_list_recreate(trx_list, new_size): + curr_len = len(trx_list) + if new_size < curr_len: + trx_list = trx_list[0:new_size] + elif new_size > curr_len: + for i in range(new_size - curr_len): + trx_list.append(Bts._new_default_trx_cfg()) + return trx_list ######################## # PUBLIC - INTERNAL API ######################## @@ -93,4 +140,21 @@ def set_bvci(self, bvci): self.bvci = bvci + def set_num_trx(self, num_trx): + assert num_trx > 0 + self._validate_new_num_trx(num_trx) + if num_trx == self._num_trx: + return + self._num_trx = num_trx + self.overlay_trx_list = Bts._trx_list_recreate(self.overlay_trx_list, num_trx) + + def num_trx(self): + return self._num_trx + + def set_trx_phy_channel(self, trx_idx, ts_idx, config): + assert trx_idx < self._num_trx + assert ts_idx < 8 + schema.phy_channel_config(config) # validation + self.overlay_trx_list[trx_idx]['timeslot_list'][ts_idx]['phys_chan_config'] = config + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 1c4b4a0..318c30d 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -52,9 +52,6 @@ proc.launch() return proc - def num_trx(self): - return len(self.values['osmo_bts_octphy'].get('trx_list', [])) - def allocate_phy_instances(self, c): ''' Generate match trx Z <-> phy X inst Y to use in vty config diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 8629b9b..7d9e127 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -37,7 +37,18 @@ def conf_for_bsc_prepare(self): values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(self.defaults_cfg_name)) + # Make sure the trx_list is adapted to num of trx configured at runtime + # to avoid overlay issues. + trx_list = values.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + values['trx_list'] = bts.Bts._trx_list_recreate(trx_list, self.num_trx()) + + bts_defaults = config.get_defaults(self.defaults_cfg_name) + trx_list = bts_defaults.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + bts_defaults['trx_list'] = bts.Bts._trx_list_recreate(trx_list, self.num_trx()) + + config.overlay(values, bts_defaults) if self.lac is not None: config.overlay(values, { 'location_area_code': self.lac }) if self.rac is not None: @@ -50,6 +61,8 @@ sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() config.overlay(values, sgsn_conf) + + config.overlay(values, { 'trx_list': self.overlay_trx_list }) return values ######################## diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 4b9e1ff..70d6e8a 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -60,6 +60,8 @@ 'bts[].power_supply.device': schema.STR, 'bts[].power_supply.port': schema.STR, 'bts[].ciphers[]': schema.CIPHER, + 'bts[].num_trx': schema.UINT, + 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].hw_addr': schema.HWADDR, 'bts[].trx_list[].net_device': schema.STR, 'bts[].trx_list[].nominal_power': schema.UINT, -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:46 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Move logic to testlib.py Message-ID: Review at https://gerrit.osmocom.org/8062 tests: voice: Move logic to testlib.py This way we can have several tests sharing similar logic. Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f --- M src/osmo_gsm_tester/testenv.py A suites/voice/lib/testlib.py M suites/voice/mo_mt_call.py 3 files changed, 73 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/8062/1 diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index 26b492e..15ab7ba 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -52,4 +52,14 @@ Timeout = suite_module.Timeout Sms = sms_module.Sms +def add_subdir_to_import_path(subdir_name): + import os, sys, inspect + frame, filename, lineno, function, code_context, index = inspect.stack()[1] + print("filename=%s" %filename) + subdir = os.path.realpath(os.path.join(os.path.split(filename)[0], subdir_name)) + if subdir not in sys.path: + sys.path.insert(0, subdir) + #TODO: we may beed another API to remove the subdir at the end of the test? + #Maybe clean it automatically when returning from test in test.py. + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py new file mode 100755 index 0000000..f949809 --- /dev/null +++ b/suites/voice/lib/testlib.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def call_test_setup_run(bts_setup_cb=None): + hlr = suite.hlr() + bts = suite.bts() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + ms_mo = suite.modem() + ms_mt = suite.modem() + + if bts_setup_cb is not None: + bts_setup_cb(bts) + + hlr.start() + stp.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + + bsc.bts_add(bts) + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + + hlr.subscriber_add(ms_mo) + hlr.subscriber_add(ms_mt) + + ms_mo.connect(msc.mcc_mnc()) + ms_mt.connect(msc.mcc_mnc()) + + ms_mo.log_info() + ms_mt.log_info() + + print('waiting for modems to attach...') + wait(ms_mo.is_connected, msc.mcc_mnc()) + wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms_mo, ms_mt) + + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') + + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') + + sleep(5) # maintain the call active for 5 seconds + + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py index aeda80d..4021762 100755 --- a/suites/voice/mo_mt_call.py +++ b/suites/voice/mo_mt_call.py @@ -1,56 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -hlr = suite.hlr() -bts = suite.bts() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms_mo = suite.modem() -ms_mt = suite.modem() +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() -bsc.bts_add(bts) -bsc.start() - -bts.start() -wait(bsc.bts_is_connected, bts) - -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) - -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) - -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -mo_cid = ms_mo.call_dial(ms_mt) -mt_cid = ms_mt.call_wait_incoming(ms_mo) -print('dial success') - -assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) -ms_mt.call_answer(mt_cid) -wait(ms_mo.call_is_active, mo_cid) -wait(ms_mt.call_is_active, mt_cid) -print('answer success, call established and ongoing') - -sleep(5) # maintain the call active for 5 seconds - -assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) -ms_mt.call_hangup(mt_cid) -wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) -print('hangup success') +call_test_setup_run() -- To view, visit https://gerrit.osmocom.org/8062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:03:46 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... Message-ID: Review at https://gerrit.osmocom.org/8063 tests: voice: Add tests to verify dynamic timeslots during phone calls Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 --- A suites/voice/mo_mt_call_dyn_ipa.py A suites/voice/mo_mt_call_dyn_osmo.py 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/63/8063/1 diff --git a/suites/voice/mo_mt_call_dyn_ipa.py b/suites/voice/mo_mt_call_dyn_ipa.py new file mode 100755 index 0000000..1ae41b8 --- /dev/null +++ b/suites/voice/mo_mt_call_dyn_ipa.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +print("hey: name=%r package=%r" % (__name__, __package__)) + +import os, inspect, sys + +add_subdir_to_import_path("lib") + +#import testlib +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +call_test_setup_run(bts_setup_cb=my_bts_setup) diff --git a/suites/voice/mo_mt_call_dyn_osmo.py b/suites/voice/mo_mt_call_dyn_osmo.py new file mode 100755 index 0000000..9dadf16 --- /dev/null +++ b/suites/voice/mo_mt_call_dyn_osmo.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +print("hey: name=%r package=%r" % (__name__, __package__)) + +import os, inspect, sys + +add_subdir_to_import_path("lib") + +#import testlib +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From jenkins at lists.osmocom.org Mon May 7 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 7 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#115?= In-Reply-To: <1876621568.404.1525619406732.JavaMail.jenkins@jenkins.osmocom.org> References: <1876621568.404.1525619406732.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1702283598.427.1525705806758.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon May 7 15:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:19:11 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: https://osmocom.org/issues/3243 -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 15:20:33 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 7 May 2018 15:20:33 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: > there has been some discussion today on IRC about the MGW > configuration being actually global and not beloging to any > specific MSC config node? Pau? I think this is a separate issue. We need to store settings at least. -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 15:27:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:27:08 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... In-Reply-To: References: Message-ID: tests: voice: Add tests to verify dynamic timeslots during phone calls Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 --- A suites/voice/mo_mt_call_dyn_ipa.py A suites/voice/mo_mt_call_dyn_osmo.py 2 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/63/8063/2 diff --git a/suites/voice/mo_mt_call_dyn_ipa.py b/suites/voice/mo_mt_call_dyn_ipa.py new file mode 100755 index 0000000..0b56653 --- /dev/null +++ b/suites/voice/mo_mt_call_dyn_ipa.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +call_test_setup_run(bts_setup_cb=my_bts_setup) diff --git a/suites/voice/mo_mt_call_dyn_osmo.py b/suites/voice/mo_mt_call_dyn_osmo.py new file mode 100755 index 0000000..f9ea16b --- /dev/null +++ b/suites/voice/mo_mt_call_dyn_osmo.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:27:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:27:08 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Add tests to verify tch timeslots during phone... Message-ID: Review at https://gerrit.osmocom.org/8064 tests: voice: Add tests to verify tch timeslots during phone calls Change-Id: I897757a21fee516ce96808a180121b09f06a0fea --- A suites/voice/mo_mt_call_hr.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/64/8064/1 diff --git a/suites/voice/mo_mt_call_hr.py b/suites/voice/mo_mt_call_hr.py new file mode 100755 index 0000000..4d3f990 --- /dev/null +++ b/suites/voice/mo_mt_call_hr.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/H') + bts.set_trx_phy_channel(0, 3, 'TCH/H') + bts.set_trx_phy_channel(0, 4, 'TCH/H') + bts.set_trx_phy_channel(0, 5, 'TCH/H') + bts.set_trx_phy_channel(0, 6, 'TCH/H') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Mon May 7 15:27:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 15:27:56 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 16:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 7 May 2018 16:10:54 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review-1 Don't merge yet, these tests will fail due to issue in https://osmocom.org/issues/3244. We need to move the dyn tests to its own suite since they require gprs (sgsn, ggsn, etc.) We can keep the HR one in voice, and switch the default one to use FR perhaps. -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 20:42:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 20:42:59 +0000 Subject: osmo-gsm-tester[master]: bts: Refactor conf_for_bsc_osmo In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8059 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 20:44:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 20:44:23 +0000 Subject: osmo-gsm-tester[master]: bts: Pass defaults config name at construct time In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8060 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2c6a46ead14010f714897ea178917327215823e7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 20:51:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 20:51:05 +0000 Subject: osmo-gsm-tester[master]: bts: Allow setting amounf of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 (1 comment) I'm not sure I understand the max_trx. Which situation does it resolve? AFAIU a BTS simply has a given number of TRX by hardware, and a scenario may want to request a specific number of TRX (but I guess will generally not actually care how many there are). Who dictates a max there? If we have a max, why no min? Once we have a good explanation, that should go in the code somewhere and not be "hidden" in the commit log. https://gerrit.osmocom.org/#/c/8061/1//COMMIT_MSG Commit Message: Line 7: bts: Allow setting amounf of TRX and timeslot in cfg and from test at runtime amounf :) -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 21:03:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 21:03:22 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review-2 (1 comment) as much as I'd like the dyn TS tested automatically soon, I'm afraid this goes in the wrong direction... https://gerrit.osmocom.org/#/c/8063/2/suites/voice/mo_mt_call_dyn_ipa.py File suites/voice/mo_mt_call_dyn_ipa.py: Line 16: bts.set_trx_phy_channel(0, 7, 'PDCH') I actually would have expected this to be part of a scenarios/dyn-ts-foo.conf the same way we configure specific ciphers. Various BTS models will support or not support specific pchan types, e.g. osmo-bts-sysmo supports all, while ericsson RBS would support only TCH/F_TCH/H_PDCH, and ip.access would support only TCH/F_PDCH. I would then have expected to invoke the utterly unchanged 'voice' suite, just with a different scenario selection to have different pchan configured. So that instead of copying each and every voice call test and each and every GPRS test for each particular pchan selection, we just run the utterly unchanged suites for different scenario selections. I think it's fairly important to maintain the config parameters separately from the actual test scripts. -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 21:11:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 21:11:51 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... In-Reply-To: References: Message-ID: Patch Set 2: also note that some BTS kinds allow specific pchans only in specific timeslots, see verify_chan_comb() in osmo-bsc/src/libbsc/abis_nm.c. It may not be necessary to reflect these 1:1 in osmo-gsm-tester validation, just saying that semantically a BTS model needs to reflect what pchans it supports, and that that may depend on the timeslot number as well. -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Mon May 7 21:13:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 21:13:49 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify tch timeslots during phone... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-2 (3 comments) same, use a scenario.conf instead https://gerrit.osmocom.org/#/c/8064/1//COMMIT_MSG Commit Message: Line 7: tests: voice: Add tests to verify tch timeslots during phone calls "test voice calls on TCH timeslots" -- and what do you mean, all voice has to happen on TCH by definition https://gerrit.osmocom.org/#/c/8064/1/suites/voice/mo_mt_call_hr.py File suites/voice/mo_mt_call_hr.py: Line 15: bts.set_trx_phy_channel(0, 6, 'TCH/H') ah, TCH/*H*. Line 16: bts.set_trx_phy_channel(0, 7, 'PDCH') ok, interesting, why the PDCH -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Mon May 7 21:18:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 7 May 2018 21:18:41 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Move logic to testlib.py In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 erm, what? you want to manipulate the python path from a test script? You introduce a "lib" to contain common parts to be re-used in several tests, I think to prepare incorporating config in the test scripts in the upcoming patches, config which should be in a suite.conf instead. If we introduce common code snippets to be re-used across test scripts, let's just put them in the normal place where all the other files are, i.e. in src/osmo_gsm_tester/, and let's not manipulate the python path from test scripts. Next, the snippets should be modular, i.e. not establish a network and do a phone call in one, at least split off the phone call so that you could e.g. do two phone calls one after the other. (but I still think in this particular instance we don't need to repeat the voice call code just yet, if we configure pchans by scenarios) -- To view, visit https://gerrit.osmocom.org/8062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From jenkins at lists.osmocom.org Mon May 7 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 7 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#27?= In-Reply-To: <50418736.411.1525646480722.JavaMail.jenkins@jenkins.osmocom.org> References: <50418736.411.1525646480722.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1490254478.428.1525732880567.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20261/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-20261/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-20261/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-20261/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-20261/ libtool: install: (cd /tmp/am-dc-20261/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-20261/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-20261/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-20261/ libtool: install: chmod 644 /tmp/am-dc-20261/ libtool: install: ranlib /tmp/am-dc-20261/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-20261/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-20261/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-20261/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20261/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-20261/ /bin/mkdir -p '/tmp/am-dc-20261/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-20261/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-20261/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-20261/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-20261/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-20261/ libtool: uninstall: rm -f /tmp/am-dc-20261/ /tmp/am-dc-20261/ /tmp/am-dc-20261/ /tmp/am-dc-20261/ /tmp/am-dc-20261/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-20261/ && rm -f html.tar ) ( cd '/tmp/am-dc-20261/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-20261/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Tue May 8 06:16:51 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 8 May 2018 06:16:51 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2841?= Message-ID: <2005747272.435.1525760211382.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 8.71 KB...] checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... (cached) false checking whether SYS_getrandom is declared... no checking if gcc supports -fvisibility=hidden... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmocore.pc config.status: creating libosmocodec.pc config.status: creating libosmocoding.pc config.status: creating libosmovty.pc config.status: creating libosmogsm.pc config.status: creating libosmogb.pc config.status: creating libosmoctrl.pc config.status: creating libosmosim.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating src/vty/Makefile config.status: creating src/codec/Makefile config.status: creating src/coding/Makefile config.status: creating src/sim/Makefile config.status: creating src/gsm/Makefile config.status: creating src/gb/Makefile config.status: creating src/ctrl/Makefile config.status: creating src/pseudotalloc/Makefile config.status: creating tests/Makefile config.status: creating tests/atlocal config.status: creating utils/Makefile config.status: creating Doxyfile.core config.status: creating Doxyfile.gsm config.status: creating Doxyfile.vty config.status: creating Doxyfile.codec config.status: creating Doxyfile.coding config.status: creating Doxyfile.gb config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.11.0.4-dda1 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmocore' Making install in include make[2]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/gsm/gsm0503.h Generating header file... Generate 'xcch' declaration Generate 'rach' declaration Generate 'rach_ext' declaration Generate 'sch' declaration Generate 'cs2' declaration Generate 'cs3' declaration Generate 'cs2_np' declaration Generate 'cs3_np' declaration Generate 'tch_afs_12_2' declaration Generate 'tch_afs_10_2' declaration Generate 'tch_afs_7_95' declaration Generate 'tch_afs_7_4' declaration Generate 'tch_afs_6_7' declaration Generate 'tch_afs_5_9' declaration Generate 'tch_afs_5_15' declaration Generate 'tch_afs_4_75' declaration Generate 'tch_fr' declaration Generate 'tch_hr' declaration Generate 'tch_ahs_7_95' declaration Generate 'tch_ahs_7_4' declaration Generate 'tch_ahs_6_7' declaration Generate 'tch_ahs_5_9' declaration Generate 'tch_ahs_5_15' declaration Generate 'tch_ahs_4_75' declaration Generate 'mcs1_dl_hdr' declaration Generate 'mcs1_ul_hdr' declaration Generate 'mcs1' declaration Generate 'mcs2' declaration Generate 'mcs3' declaration Generate 'mcs4' declaration Generate 'mcs5_dl_hdr' declaration Generate 'mcs5_ul_hdr' declaration Generate 'mcs5' declaration Generate 'mcs6' declaration Generate 'mcs7_dl_hdr' declaration Generate 'mcs7_ul_hdr' declaration Generate 'mcs7' declaration Generate 'mcs8' declaration Generate 'mcs9' declaration Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/include' GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc32gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/bit16gen.h GEN osmocom/core/crc16gen.h GEN osmocom/core/bit32gen.h GEN osmocom/core/bit64gen.h GEN osmocom/core/crc8gen.h GEN osmocom/core/crc64gen.h GEN osmocom/core/crc32gen.h make[4]: Entering directory '/build/deps/libosmocore/include' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/include' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/application.h osmocom/core/backtrace.h osmocom/core/bit16gen.h osmocom/core/bit32gen.h osmocom/core/bit64gen.h osmocom/core/bits.h osmocom/core/bitvec.h osmocom/core/bitcomp.h osmocom/core/byteswap.h osmocom/core/conv.h osmocom/core/counter.h osmocom/core/crc16.h osmocom/core/crc16gen.h osmocom/core/crc32gen.h osmocom/core/crc64gen.h osmocom/core/crc8gen.h osmocom/core/crcgen.h osmocom/core/endian.h osmocom/core/defs.h osmocom/core/fsm.h osmocom/core/gsmtap.h osmocom/core/gsmtap_util.h osmocom/core/linuxlist.h osmocom/core/linuxrbtree.h osmocom/core/logging.h osmocom/core/loggingrb.h osmocom/core/stats.h osmocom/core/macaddr.h osmocom/core/msgb.h osmocom/core/panic.h osmocom/core/prbs.h osmocom/core/prim.h osmocom/core/process.h osmocom/core/rate_ctr.h osmocom/core/stat_item.h osmocom/core/select.h osmocom/core/sercomm.h osmocom/core/signal.h osmocom/core/socket.h osmocom/core/statistics.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/coding' /usr/bin/install -c -m 644 osmocom/coding/gsm0503_tables.h osmocom/coding/gsm0503_parity.h osmocom/coding/gsm0503_mapping.h osmocom/coding/gsm0503_interleaving.h osmocom/coding/gsm0503_coding.h '/build/deps/install/stow/libosmocore/include/osmocom/coding' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/core' /usr/bin/install -c -m 644 osmocom/core/strrb.h osmocom/core/talloc.h osmocom/core/timer.h osmocom/core/timer_compat.h osmocom/core/utils.h osmocom/core/write_queue.h osmocom/core/plugin.h osmocom/core/msgfile.h osmocom/core/serial.h '/build/deps/install/stow/libosmocore/include/osmocom/core' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/vty' /usr/bin/install -c -m 644 osmocom/vty/buffer.h osmocom/vty/command.h osmocom/vty/logging.h osmocom/vty/stats.h osmocom/vty/misc.h osmocom/vty/telnet_interface.h osmocom/vty/vector.h osmocom/vty/vty.h osmocom/vty/ports.h '/build/deps/install/stow/libosmocore/include/osmocom/vty' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /usr/bin/install -c -m 644 osmocom/gsm/protocol/gsm_03_40.h osmocom/gsm/protocol/gsm_03_41.h osmocom/gsm/protocol/gsm_04_08.h osmocom/gsm/protocol/gsm_04_08_gprs.h osmocom/gsm/protocol/gsm_04_11.h osmocom/gsm/protocol/gsm_04_12.h osmocom/gsm/protocol/gsm_04_14.h osmocom/gsm/protocol/gsm_04_80.h osmocom/gsm/protocol/gsm_08_08.h osmocom/gsm/protocol/gsm_08_58.h osmocom/gsm/protocol/gsm_09_02.h osmocom/gsm/protocol/gsm_12_21.h osmocom/gsm/protocol/gsm_23_003.h osmocom/gsm/protocol/gsm_44_318.h osmocom/gsm/protocol/ipaccess.h osmocom/gsm/protocol/smpp34_osmocom.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/sim' /usr/bin/install -c -m 644 osmocom/sim/class_tables.h osmocom/sim/sim.h '/build/deps/install/stow/libosmocore/include/osmocom/sim' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /usr/bin/install -c -m 644 osmocom/gprs/gprs_bssgp.h osmocom/gprs/gprs_bssgp_bss.h osmocom/gprs/gprs_msgb.h osmocom/gprs/gprs_ns.h osmocom/gprs/gprs_ns_frgre.h osmocom/gprs/gprs_rlc.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /usr/bin/install -c -m 644 osmocom/crypt/auth.h osmocom/crypt/gprs_cipher.h '/build/deps/install/stow/libosmocore/include/osmocom/crypt' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /usr/bin/install -c -m 644 osmocom/gsm/a5.h osmocom/gsm/abis_nm.h osmocom/gsm/apn.h osmocom/gsm/bts_features.h osmocom/gsm/comp128.h osmocom/gsm/comp128v23.h osmocom/gsm/bitvec_gsm.h osmocom/gsm/gan.h osmocom/gsm/gsm0341.h osmocom/gsm/gsm0411_smc.h osmocom/gsm/gsm0411_smr.h osmocom/gsm/gsm0411_utils.h osmocom/gsm/gsm0480.h osmocom/gsm/gsm0502.h osmocom/gsm/gsm0503.h osmocom/gsm/gsm0808.h osmocom/gsm/gsm0808_utils.h osmocom/gsm/gsm23003.h osmocom/gsm/gsm48.h osmocom/gsm/gsm48_ie.h osmocom/gsm/gsm_utils.h osmocom/gsm/gsup.h osmocom/gsm/ipa.h osmocom/gsm/lapd_core.h osmocom/gsm/lapdm.h osmocom/gsm/meas_rep.h osmocom/gsm/mncc.h osmocom/gsm/prim.h osmocom/gsm/l1sap.h osmocom/gsm/oap.h osmocom/gsm/rsl.h osmocom/gsm/rxlev_stat.h osmocom/gsm/sysinfo.h osmocom/gsm/tlv.h '/build/deps/install/stow/libosmocore/include/osmocom/gsm' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /usr/bin/install -c -m 644 osmocom/ctrl/control_cmd.h osmocom/ctrl/control_if.h osmocom/ctrl/ports.h osmocom/ctrl/control_vty.h '/build/deps/install/stow/libosmocore/include/osmocom/ctrl' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /usr/bin/install -c -m 644 osmocom/gprs/protocol/gsm_04_60.h osmocom/gprs/protocol/gsm_08_16.h osmocom/gprs/protocol/gsm_08_18.h '/build/deps/install/stow/libosmocore/include/osmocom/gprs/protocol' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include/osmocom/codec' /usr/bin/install -c -m 644 osmocom/codec/ecu.h osmocom/codec/codec.h osmocom/codec/gsm610_bits.h '/build/deps/install/stow/libosmocore/include/osmocom/codec' make[4]: Leaving directory '/build/deps/libosmocore/include' make[3]: Leaving directory '/build/deps/libosmocore/include' make[2]: Leaving directory '/build/deps/libosmocore/include' Making install in src make[2]: Entering directory '/build/deps/libosmocore/src' GEN crc8gen.c GEN crc16gen.c GEN crc32gen.c GEN crc64gen.c make install-am make[3]: Entering directory '/build/deps/libosmocore/src' CC timer_gettimeofday.lo CC timer.lo CC select.lo CC timer_clockgettime.lo CC signal.lo CC bitvec.lo CC bits.lo CC msgb.lo CC bitcomp.lo CC counter.lo CC fsm.lo CC write_queue.lo CC utils.lo CC socket.lo CC logging.lo CC logging_syslog.lo CC logging_gsmtap.lo CC rate_ctr.lo CC gsmtap_util.lo CC crc16.lo CC panic.lo CC backtrace.lo CC conv.lo CC application.lo CC rbtree.lo CC strrb.lo CC loggingrb.lo CC crc8gen.lo CC crc16gen.lo CC crc32gen.lo CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo /bin/bash: line 2: 4794 Segmentation fault (core dumped) /bin/bash ../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -mssse3 -msse4.1 -g -O2 -DBUILDING_LIBOSMOCORE -Wall -MT conv_acc_sse.lo -MD -MP -MF $depbase.Tpo -c -o conv_acc_sse.lo conv_acc_sse.c Makefile:535: recipe for target 'conv_acc_sse.lo' failed make[3]: *** [conv_acc_sse.lo] Error 139 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory '/build/deps/libosmocore/src' Makefile:639: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory '/build/deps/libosmocore/src' Makefile:589: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' make[1]: *** [install-recursive] Error 1 Makefile:888: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue May 8 06:23:55 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 8 May 2018 06:23:55 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2842?= In-Reply-To: <2005747272.435.1525760211382.JavaMail.jenkins@jenkins.osmocom.org> References: <2005747272.435.1525760211382.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <46812739.437.1525760635043.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue May 8 08:09:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 08:09:43 +0000 Subject: osmo-gsm-tester[master]: Check physical channel configs In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8058 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5894678e0d6f306173cc550dd6806a7d6f8a4c11 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 08:09:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 08:09:44 +0000 Subject: [MERGED] osmo-gsm-tester[master]: Check physical channel configs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Check physical channel configs ...................................................................... Check physical channel configs Change-Id: I5894678e0d6f306173cc550dd6806a7d6f8a4c11 --- M src/osmo_gsm_tester/resource.py M src/osmo_gsm_tester/schema.py 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 689f976..4b9e1ff 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -64,6 +64,7 @@ 'bts[].trx_list[].net_device': schema.STR, 'bts[].trx_list[].nominal_power': schema.UINT, 'bts[].trx_list[].max_power_red': schema.UINT, + 'bts[].trx_list[].timeslot_list[].phys_chan_config': schema.PHY_CHAN, 'arfcn[].arfcn': schema.INT, 'arfcn[].band': schema.BAND, 'modem[].label': schema.STR, diff --git a/src/osmo_gsm_tester/schema.py b/src/osmo_gsm_tester/schema.py index 487521a..1473ad7 100644 --- a/src/osmo_gsm_tester/schema.py +++ b/src/osmo_gsm_tester/schema.py @@ -99,6 +99,12 @@ return raise ValueError('Unknown Modem Feature: %r' % val) +def phy_channel_config(val): + if val in ('CCCH', 'CCCH+SDCCH4', 'TCH/F', 'TCH/H', 'SDCCH8', 'PDCH', + 'TCH/F_PDCH', 'CCCH+SDCCH4+CBCH', 'SDCCH8+CBCH','TCH/F_TCH/H_PDCH'): + return + raise ValueError('Unknown Physical channel config: %r' % val) + INT = 'int' STR = 'str' UINT = 'uint' @@ -113,6 +119,7 @@ TIMES='times' CIPHER = 'cipher' MODEM_FEATURE = 'modem_feature' +PHY_CHAN = 'chan' SCHEMA_TYPES = { INT: int, @@ -129,6 +136,7 @@ TIMES: times, CIPHER: cipher, MODEM_FEATURE: modem_feature, + PHY_CHAN: phy_channel_config, } def validate(config, schema): -- To view, visit https://gerrit.osmocom.org/8058 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5894678e0d6f306173cc550dd6806a7d6f8a4c11 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 08:09:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 08:09:46 +0000 Subject: [MERGED] osmo-gsm-tester[master]: bts: Refactor conf_for_bsc_osmo In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: bts: Refactor conf_for_bsc_osmo ...................................................................... bts: Refactor conf_for_bsc_osmo Move duplicated code into a method in the superclass. Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb --- M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py 5 files changed, 21 insertions(+), 60 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index 6350c56..a930442 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -56,21 +56,7 @@ ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('nanobts')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('nanobts') # Hack until we have proper ARFCN resource allocation support (OS#2230) band = values.get('band') trx_list = values.get('trx_list') diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index f48afcc..70deba3 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -112,21 +112,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_octphy')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_octphy') self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index be87b9d..d0ba557 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -35,6 +35,23 @@ if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) + def conf_for_bsc_osmo(self, bts_defaults_name): + values = config.get_defaults('bsc_bts') + config.overlay(values, config.get_defaults(bts_defaults_name)) + if self.lac is not None: + config.overlay(values, { 'location_area_code': self.lac }) + if self.rac is not None: + config.overlay(values, { 'routing_area_code': self.rac }) + if self.cellid is not None: + config.overlay(values, { 'cell_identity': self.cellid }) + if self.bvci is not None: + config.overlay(values, { 'bvci': self.bvci }) + config.overlay(values, self.conf) + + sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() + config.overlay(values, sgsn_conf) + return values + ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index bd8aedf..f1a9bdf 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -92,21 +92,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_trx')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_trx') self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index 7a41033..c9978e5 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -103,21 +103,7 @@ return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts') def conf_for_bsc(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults('osmo_bts_sysmo')) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - + values = self.conf_for_bsc_osmo('osmo_bts_sysmo') self.dbg(conf=values) return values -- To view, visit https://gerrit.osmocom.org/8059 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie27932f94142f667c3fb8c054b77e04afa0d5cbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 08:16:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 08:16:52 +0000 Subject: osmo-bts[master]: let osmo-bts log a special notice if OML connection is close... In-Reply-To: References: Message-ID: Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/8056/1/src/common/abis.c File src/common/abis.c: Line 153: if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && osmo_gettimeofday(&now, NULL) == 0 && > it's not super critical, I guess, but gettimeofday is not monotonic. So if Indeed, thanks for this tip. clock_gettime() is a much nicer API than the antiquated gettimeofday(). -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 8 08:17:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 08:17:46 +0000 Subject: [PATCH] osmo-bts[master]: let osmo-bts log a special notice if OML connection is close... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8056 to look at the new patch set (#2). let osmo-bts log a special notice if OML connection is closed early A frequent configuration file error is that the unit_id settings of osmo-bts and osmo-bsc don't match. The BSC already prints an error in this case. Let the BTS print an error as well. We use a heuristic for this purpose: If the OML link is dropped within 10 seconds after being established, log a special warning which alerts the user and recommend a manual configuration file check. Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Related: OS#3143 --- M include/osmo-bts/gsm_data_shared.h M src/common/abis.c 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/8056/2 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 812d086..81cac3e 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -514,6 +514,10 @@ uint8_t initial_mcs; }; +/* The amount of time within which a sudden disconnect of a newly established + * OML connection will cause a special warning to be logged. */ +#define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ + /* One BTS */ struct gsm_bts { /* list header in net->bts_list */ @@ -552,6 +556,7 @@ /* how do we talk OML with this TRX? */ uint8_t oml_tei; struct e1inp_sign_link *oml_link; + struct timespec oml_conn_established_timestamp; /* Abis network management O&M handle */ struct abis_nm_h *nmh; diff --git a/src/common/abis.c b/src/common/abis.c index 6aa2f1d..301be53 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,9 @@ sign_link = g_bts->oml_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1], E1INP_SIGN_OML, NULL, 255, 0); + if (clock_gettime(CLOCK_MONOTONIC, &g_bts->oml_conn_established_timestamp) != 0) + memset(&g_bts->oml_conn_established_timestamp, 0, + sizeof(g_bts->oml_conn_established_timestamp)); drain_oml_queue(g_bts); sign_link->trx = g_bts->c0; bts_link_estab(g_bts); @@ -140,9 +144,22 @@ LOGP(DABIS, LOGL_ERROR, "Signalling link down\n"); /* First remove the OML signalling link */ - if (g_bts->oml_link) + if (g_bts->oml_link) { + struct timespec now; + e1inp_sign_link_destroy(g_bts->oml_link); + + /* Log a special notice if the OML connection was dropped relatively quickly. */ + if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && clock_gettime(CLOCK_MONOTONIC, &now) == 0 && + g_bts->oml_conn_established_timestamp.tv_sec + OSMO_BTS_OML_CONN_EARLY_DISCONNECT >= now.tv_sec) { + LOGP(DABIS, LOGL_NOTICE, "OML link was closed early within %" PRIu64 " seconds. " + "If this situation persists, please check your BTS and BSC configuration files for errors. " + "A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n", + (uint64_t)(now.tv_sec - g_bts->oml_conn_established_timestamp.tv_sec)); + } + } g_bts->oml_link = NULL; + memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(g_bts->oml_conn_established_timestamp)); /* Then iterate over the RSL signalling links */ llist_for_each_entry(trx, &g_bts->trx_list, list) { -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Tue May 8 12:05:34 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 12:05:34 +0000 Subject: [MERGED] osmo-bts[master]: send a State Changed Event Report when rf is locked/unlocked In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. Change subject: send a State Changed Event Report when rf is locked/unlocked ...................................................................... send a State Changed Event Report when rf is locked/unlocked Make osmo-bts send a State Changed Event Report when RF is locked or unlocked. This behaviour isn't mentioned in the spec as far as we know, but an ipaccess nanobts also produces these messages. Change-Id: I37e44ef4881c41f8835428b610e7863f37397c9f Related: OS#3161 --- M src/common/oml.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index a1e7fda..89db9cf 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -322,6 +322,9 @@ /* 9.4.7 Availability Status */ msgb_tl16v_put(nmsg, NM_ATT_AVAIL_STATUS, 1, &mo->nm_state.availability); + /* 9.4.4 Administrative Status -- not in spec but also sent by nanobts */ + msgb_tv_put(nmsg, NM_ATT_ADM_STATE, mo->nm_state.administrative); + return oml_mo_send_msg(mo, nmsg, NM_MT_STATECHG_EVENT_REP); } @@ -383,6 +386,7 @@ int oml_mo_statechg_ack(struct gsm_abis_mo *mo) { struct msgb *msg; + int rc = 0; msg = oml_msgb_alloc(); if (!msg) @@ -390,7 +394,12 @@ msgb_tv_put(msg, NM_ATT_ADM_STATE, mo->nm_state.administrative); - return oml_mo_send_msg(mo, msg, NM_MT_CHG_ADM_STATE_ACK); + rc = oml_mo_send_msg(mo, msg, NM_MT_CHG_ADM_STATE_ACK); + if (rc != 0) + return rc; + + /* Emulate behaviour of ipaccess nanobts: Send a 'State Changed Event Report' as well. */ + return oml_tx_state_changed(mo); } int oml_mo_statechg_nack(struct gsm_abis_mo *mo, uint8_t nack_cause) -- To view, visit https://gerrit.osmocom.org/8057 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I37e44ef4881c41f8835428b610e7863f37397c9f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling From gerrit-no-reply at lists.osmocom.org Tue May 8 12:31:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 12:31:09 +0000 Subject: osmo-gsm-tester[master]: bts: Allow setting amounf of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Patch Set 1: > (1 comment) > > I'm not sure I understand the max_trx. Which situation does it > resolve? AFAIU a BTS simply has a given number of TRX by hardware, > and a scenario may want to request a specific number of TRX (but I > guess will generally not actually care how many there are). Who > dictates a max there? If we have a max, why no min? > > Once we have a good explanation, that should go in the code > somewhere and not be "hidden" in the commit log. It's not hidden in the commit log, it's explained: "If a num_trx value higher than max_trx is specified throuygh config file or at runtime by the test, an exception is raised explaining the issue." So it's mainly a catch-misconfigurations issue. With this easy knowledge (how many TRX suport at max that BTS) we can verify that the config is fine, or prevent some test to programatically use/configure more TRX than available for that specific BTS class/object. This avoids debugging why stuff is not working just to find out something went wrong when trying to configure the BTS with too many trx. -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 12:58:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 12:58:59 +0000 Subject: [PATCH] osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7992 to look at the new patch set (#3). move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 103 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/3 diff --git a/src/gsup_server.c b/src/gsup_server.c index 07d4feb..17285c9 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsup_server.h" @@ -357,3 +358,56 @@ return 0; } + +/** + * Populate a gsup message structure with an Insert Subscriber Data Message. + * All required memory buffers for data pointed to by pointers in struct omso_gsup_message + * must be allocated by the caller and should have the same lifetime as the gsup parameter. + * + * \param[in] gsup The gsup message to populate. + * \param[in] imsi The subscriber's IMSI. + * \param[in] msisdn The subscriber's MSISDN. + * \param[in] msisdn_enc A buffer large enough to store the MSISDN in encoded form. + * \param[in] msisdn_enc_size Size of the buffer (must be >= OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN). + * \param[in] apn_buf A buffer large enough to store an APN (required if cn_domain is OSMO_GSUP_CN_DOMAIN_PS). + * \param[in] apn_buf_size Size of APN buffer (must be >= APN_MAXLEN). + * \param[in] cn_domain The CN Domain of the subscriber connection. + * \returns 0 on success, and negative on error. + */ +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain) +{ + int len; + + OSMO_ASSERT(gsup); + + gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST; + osmo_strlcpy(gsup->imsi, imsi, GSM23003_IMSI_MAX_DIGITS + 1); + + if (msisdn_enc_size < OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN) + return -ENOSPC; + + OSMO_ASSERT(msisdn_enc); + len = gsm48_encode_bcd_number(msisdn_enc, msisdn_enc_size, 0, msisdn); + if (len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn); + return -ENOSPC; + } + gsup->msisdn_enc = msisdn_enc; + gsup->msisdn_enc_len = len; + + #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" + + gsup->cn_domain = cn_domain; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + OSMO_ASSERT(apn_buf_size >= APN_MAXLEN); + OSMO_ASSERT(apn_buf); + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(gsup, apn_buf, apn_buf_size); + } + + return 0; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 66c1a9c..a725521 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -6,6 +6,10 @@ #include #include +#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#endif + struct osmo_gsup_conn; /* Expects message in msg->l2h */ @@ -55,3 +59,7 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, uint8_t *apn_buf, size_t apn_buf_size); +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain); diff --git a/src/hlr.c b/src/hlr.c index 1c72f45..4da7b9b 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,51 +61,30 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct osmo_gsup_message gsup = { - .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST - }; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; + uint8_t apn[APN_MAXLEN]; + struct msgb *msg_out; uint8_t *peer; int peer_len; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - uint8_t apn[APN_MAXLEN]; - int len; - struct msgb *msg_out; + enum osmo_gsup_cn_domain cn_domain; - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { + if (co->supports_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else if (co->supports_cs) + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - - osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); - - len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); - if (len < 1) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", - subscr->imsi, subscr->msisdn); - continue; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = len; - - if (co->supports_ps) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - subscr->imsi); - continue; - } - } else if (co->supports_cs) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - } else { - /* We have not yet received a location update from this subscriber .*/ continue; } @@ -120,8 +98,17 @@ co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_gsup_encode(msg_out, &gsup); + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " diff --git a/src/luop.c b/src/luop.c index db7b3c9..aff4d81 100644 --- a/src/luop.c +++ b/src/luop.c @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -52,6 +51,7 @@ struct msgb *msg_out; msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP"); + OSMO_ASSERT(msg_out); osmo_gsup_encode(msg_out, gsup); osmo_gsup_addr_send(luop->gsup_server, luop->peer, @@ -215,39 +215,26 @@ /*! Transmit Insert Subscriber Data to new VLR/SGSN */ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { - struct osmo_gsup_message gsup; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + struct hlr_subscriber *subscr = &luop->subscr; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; uint8_t apn[APN_MAXLEN]; - int l; + enum osmo_gsup_cn_domain cn_domain; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || luop->state == LU_S_CANCEL_ACK_RECEIVED); - fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST); + if (luop->is_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, - luop->subscr.msisdn); - if (l < 1) { + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "%s: Error: cannot encode MSISDN '%s'\n", - luop->subscr.imsi, luop->subscr.msisdn); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " + "for %s\n", subscr->imsi, luop->peer); return; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = l; - - #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" - - if (luop->is_ps) { - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - luop->subscr.imsi); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); - return; - } } /* Send ISD to new VLR/SGSN */ diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index d9d272a..0aeae30 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -1,2 +1,2 @@ -DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 DMAIN LU OP state change: LU RECEIVED -> ISD SENT -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 3 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Tue May 8 13:00:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 13:00:02 +0000 Subject: osmo-bts[master]: let osmo-bts log a special notice if OML connection is close... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/8056/2/src/common/abis.c File src/common/abis.c: PS2, Line 155: LOGL_NOTICE I think we can go to ERROR or even FATAL here - at least as long as we're still terminating the entire osmo-bts process as part of this OML disconnect. -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 8 13:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 13:00:13 +0000 Subject: osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:00:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 13:00:23 +0000 Subject: [MERGED] osmo-bsc[master]: osmo_bsc_vty.c: fix: write MGW configuration In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo_bsc_vty.c: fix: write MGW configuration ...................................................................... osmo_bsc_vty.c: fix: write MGW configuration Previously the MGW configuration was ignored during writing of the MSC configuration. Let's fix this by calling the mgcp_client_config_write() function. Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d --- M src/osmo-bsc/osmo_bsc_vty.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index e6ae078..36c3223 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -181,6 +181,9 @@ vty_out(vty, " msc-addr %s%s", msc->a.msc_addr_name, VTY_NEWLINE); } + + /* write MGW configuration */ + mgcp_client_config_write(vty, " "); } static int config_write_msc(struct vty *vty) -- To view, visit https://gerrit.osmocom.org/8044 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d1eedb782a4f30bd089838969ce54f27cde060d Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Tue May 8 13:00:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 13:00:39 +0000 Subject: [PATCH] osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7992 to look at the new patch set (#4). move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 103 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/4 diff --git a/src/gsup_server.c b/src/gsup_server.c index 07d4feb..c525495 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsup_server.h" @@ -357,3 +358,56 @@ return 0; } + +/** + * Populate a gsup message structure with an Insert Subscriber Data Message. + * All required memory buffers for data pointed to by pointers in struct omso_gsup_message + * must be allocated by the caller and should have the same lifetime as the gsup parameter. + * + * \param[in] gsup The gsup message to populate. + * \param[in] imsi The subscriber's IMSI. + * \param[in] msisdn The subscriber's MSISDN. + * \param[in] msisdn_enc A buffer large enough to store the MSISDN in encoded form. + * \param[in] msisdn_enc_size Size of the buffer (must be >= OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN). + * \param[in] apn_buf A buffer large enough to store an APN (required if cn_domain is OSMO_GSUP_CN_DOMAIN_PS). + * \param[in] apn_buf_size Size of APN buffer (must be >= APN_MAXLEN). + * \param[in] cn_domain The CN Domain of the subscriber connection. + * \returns 0 on success, and negative on error. + */ +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain) +{ + int len; + + OSMO_ASSERT(gsup); + + gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST; + osmo_strlcpy(gsup->imsi, imsi, sizeof(gsup->imsi)); + + if (msisdn_enc_size < OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN) + return -ENOSPC; + + OSMO_ASSERT(msisdn_enc); + len = gsm48_encode_bcd_number(msisdn_enc, msisdn_enc_size, 0, msisdn); + if (len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn); + return -ENOSPC; + } + gsup->msisdn_enc = msisdn_enc; + gsup->msisdn_enc_len = len; + + #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" + + gsup->cn_domain = cn_domain; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + OSMO_ASSERT(apn_buf_size >= APN_MAXLEN); + OSMO_ASSERT(apn_buf); + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(gsup, apn_buf, apn_buf_size); + } + + return 0; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 66c1a9c..a725521 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -6,6 +6,10 @@ #include #include +#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#endif + struct osmo_gsup_conn; /* Expects message in msg->l2h */ @@ -55,3 +59,7 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, uint8_t *apn_buf, size_t apn_buf_size); +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain); diff --git a/src/hlr.c b/src/hlr.c index 1c72f45..4da7b9b 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,51 +61,30 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct osmo_gsup_message gsup = { - .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST - }; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; + uint8_t apn[APN_MAXLEN]; + struct msgb *msg_out; uint8_t *peer; int peer_len; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - uint8_t apn[APN_MAXLEN]; - int len; - struct msgb *msg_out; + enum osmo_gsup_cn_domain cn_domain; - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { + if (co->supports_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else if (co->supports_cs) + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); - continue; - } - - osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); - - len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); - if (len < 1) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", - subscr->imsi, subscr->msisdn); - continue; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = len; - - if (co->supports_ps) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - subscr->imsi); - continue; - } - } else if (co->supports_cs) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - } else { - /* We have not yet received a location update from this subscriber .*/ continue; } @@ -120,8 +98,17 @@ co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_gsup_encode(msg_out, &gsup); + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " diff --git a/src/luop.c b/src/luop.c index db7b3c9..aff4d81 100644 --- a/src/luop.c +++ b/src/luop.c @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -52,6 +51,7 @@ struct msgb *msg_out; msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP"); + OSMO_ASSERT(msg_out); osmo_gsup_encode(msg_out, gsup); osmo_gsup_addr_send(luop->gsup_server, luop->peer, @@ -215,39 +215,26 @@ /*! Transmit Insert Subscriber Data to new VLR/SGSN */ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { - struct osmo_gsup_message gsup; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + struct hlr_subscriber *subscr = &luop->subscr; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; uint8_t apn[APN_MAXLEN]; - int l; + enum osmo_gsup_cn_domain cn_domain; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || luop->state == LU_S_CANCEL_ACK_RECEIVED); - fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST); + if (luop->is_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, - luop->subscr.msisdn); - if (l < 1) { + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "%s: Error: cannot encode MSISDN '%s'\n", - luop->subscr.imsi, luop->subscr.msisdn); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " + "for %s\n", subscr->imsi, luop->peer); return; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = l; - - #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" - - if (luop->is_ps) { - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - luop->subscr.imsi); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); - return; - } } /* Send ISD to new VLR/SGSN */ diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index d9d272a..0aeae30 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -1,2 +1,2 @@ -DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 DMAIN LU OP state change: LU RECEIVED -> ISD SENT -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 4 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Tue May 8 13:01:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 13:01:04 +0000 Subject: libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:01:05 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 13:01:05 +0000 Subject: osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Patch Set 4: > Uploaded patch set 4. This patch set should address your comments. Does it? -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 4 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:12:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 13:12:25 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify dynamic timeslots during p... In-Reply-To: References: Message-ID: Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 13:12:34 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Add tests to verify tch timeslots during phone... In-Reply-To: References: Message-ID: Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 13:20:03 +0000 Subject: osmo-gsm-tester[master]: bts: Allow setting amounf of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Patch Set 1: -Code-Review sorry, I still don't get it. A practical example? BTS Foo has 2 trx. Its resources say it has 2 trx. Done? If I configure a scenario to require two TRX, how would it ever pick by accident a BTS that has one TRX, if num_trx is 1 and I requested 2? What would be a situation where num_trx != max_trx? -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:49:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 13:49:01 +0000 Subject: osmo-gsm-tester[master]: bts: Allow setting amounf of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Patch Set 1: > sorry, I still don't get it. A practical example? > > BTS Foo has 2 trx. Its resources say it has 2 trx. Done? What do you mean by "has" in here? It can provide up to 2 TRX (max_trx=2) or it configures+enables 2 TRX (num_trx=2)? num_trx is the amount of TRX which are going to be configured+enabled. So by default it's 1. Any test willing to do stuff with more than 1 TRX can programatically request to configure+enable more. num_trx is not expected to be used by scenarios/suites. It's more like the default amount value to use if the test doesn't request a specific amount of TRX. > > If I configure a scenario to require two TRX, how would it ever > pick by accident a BTS that has one TRX, if num_trx is 1 and I > requested 2? For HW selection/filtering, what you'd actually want to match against max_trx, which is the maximum supported TRX (to make sure you can enable and use them). But anyway that's one of the problematics on trying to match using all these dictionaries, it's a bit limited. You cannot match for something lesser-equal or greater-equal to a value. I mean, if you require 2 TRX for a test, and you have a BTS with max_trx=3, asking for a BTS with max_trx=2 won't return the match. So probably the best here if you want to test stuff with more than 1 TRX is to simply use a scenario to match against a specific class of BTS which supports more than 1 TRX. Another solution would be to have a "supported_trx" attribute which would be a list with all the possible values that the num_trx could have, ie. for max_trx=3 -> supported_trx: [1,2,3]. Then we could match it. max_trx helps mostly at runtime to easily crosscheck that you aren't picking a wrong BTS (one which doesn't support that many TRX). It's also a way to easily remind how many TRX a BTS supports. > > What would be a situation where num_trx != max_trx? an octphy BTS supports 2 TRX (actually 4, but not in our current license/verified setup). That means it has max_trx=2, because it is known to work with up to 2 TRX. For most tests, we don't need 2 TRX, thus we don't need to require a specific num_trx, which means num_trx=1 will be used. That's fine, as octphy has max_trx=2. However, let's say we pick up a sysmo bts, which supports only 1 TRX (max_trx=1). Imagine I want to run a test which actually requires 2 TRX (programatically does: bts.set_num_trx(2)). osmo-gsm-tester will stop straighway giving you a clear message that you are doing something wrong, since you are trying to run a test which attempts to use 2 TRX with a BTS which only supports 1. -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 13:59:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 8 May 2018 13:59:19 +0000 Subject: [PATCH] libosmo-sccp[master]: free local variable 'prim' in lm_timer_cb() of lm_fsm Message-ID: Review at https://gerrit.osmocom.org/8065 free local variable 'prim' in lm_timer_cb() of lm_fsm The local variable 'prim', allocated via xua_xlm_prim_alloc(), was never freed. Free it like other callers of xua_xlm_prim_alloc() do. Found by code inspection. Also, assert that allocation suceeded like we do elsewhere. Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Related: OS#2449 --- M src/xua_default_lm_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/65/8065/1 diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index eba89c2..5a15533 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -175,6 +175,7 @@ * let's dynamically register */ osmo_fsm_inst_state_chg(fi, S_RKM_REG, 10, T_WAIT_RK_REG_RESP); prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); + OSMO_ASSERT(prim); as = find_first_as_in_asp(lmp->asp); if (!as) { LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); @@ -184,6 +185,7 @@ /* Fill in settings from first AS (TODO: multiple AS support) */ prim->u.rk_reg.key = as->cfg.routing_key; osmo_xlm_sap_down(lmp->asp, &prim->oph); + msgb_free(prim->oph.msg); break; case T_WAIT_NOTIFY_RKM: /* No AS has reported via NOTIFY even after dynamic RKM -- To view, visit https://gerrit.osmocom.org/8065 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Stefan Sperling From jenkins at lists.osmocom.org Tue May 8 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 8 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#116?= In-Reply-To: <1702283598.427.1525705806758.JavaMail.jenkins@jenkins.osmocom.org> References: <1702283598.427.1525705806758.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1996127116.446.1525792206822.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:41 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: test voice calls on TCH/H timeslots In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8064 to look at the new patch set (#2). tests: voice: test voice calls on TCH/H timeslots Change-Id: I897757a21fee516ce96808a180121b09f06a0fea --- A suites/voice/mo_mt_call_tchh.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/64/8064/2 diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py new file mode 100755 index 0000000..6b820d9 --- /dev/null +++ b/suites/voice/mo_mt_call_tchh.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/H') + bts.set_trx_phy_channel(0, 3, 'TCH/H') + bts.set_trx_phy_channel(0, 4, 'TCH/H') + bts.set_trx_phy_channel(0, 5, 'TCH/H') + bts.set_trx_phy_channel(0, 6, 'TCH/H') + bts.set_trx_phy_channel(0, 7, 'TCH/H') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:41 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts: Allow setting amount of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8061 to look at the new patch set (#2). bts: Allow setting amount of TRX and timeslot in cfg and from test at runtime The num_trx attribute for a given BTS states the number of TRX to be used by that BTS. If more than num_trx are configured in trx_list in the cfg file, then only up to num_trx are taken into account. If a num_trx value higher than max_trx is specified throuygh config file or at runtime by the test, an exception is raised explaining the issue. The num/max_trx attributes are overlayed along the config levels (generic -> bsc_bts -> specific bts-type -> specific resource object). This way we can specify a long list of trx+timeslot config in the generic config (bsc_bts), and tune for each model and specific BTS which is the desired default number of TRX, as well as the maximum supported per type. Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac --- M example/defaults.conf M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/resource.py 4 files changed, 98 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/61/8061/2 diff --git a/example/defaults.conf b/example/defaults.conf index c110dde..1e84200 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -28,6 +28,8 @@ base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts + num_trx: 1 + max_trx: 1 trx_list: - nominal_power: 23 max_power_red: 0 @@ -41,3 +43,18 @@ - phys_chan_config: TCH/F - phys_chan_config: PDCH - phys_chan_config: PDCH + - nominal_power: 23 + max_power_red: 0 + arfcn: 870 + timeslot_list: + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + +osmo_bts_octphy: + max_trx: 2 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 731f5a7..f59cff3 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -21,7 +21,7 @@ import pprint import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcu_osmo +from . import log, config, util, template, process, schema, pcu_osmo class Bts(log.Origin, metaclass=ABCMeta): suite_run = None @@ -33,6 +33,9 @@ cellid = None bvci = None defaults_cfg_name = None + _num_trx = 1 + _max_trx = None + overlay_trx_list = [] ############## # PROTECTED @@ -42,10 +45,65 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + self._init_num_trx() + + def _resolve_bts_cfg(self, cfg_name): + res = None + val = config.get_defaults('bsc_bts').get(cfg_name) + if val is not None: + res = val + val = config.get_defaults(self.defaults_cfg_name).get(cfg_name) + if val is not None: + res = val + val = self.conf.get(cfg_name) + if val is not None: + res = val + return res + + def _init_num_trx(self): + self._num_trx = 1 + self._max_trx = None + val = self._resolve_bts_cfg('num_trx') + if val is not None: + self._num_trx = int(val) + val = self._resolve_bts_cfg('max_trx') + if val is not None: + self._max_trx = int(val) + self._validate_new_num_trx(self._num_trx) + self.overlay_trx_list = [Bts._new_default_trx_cfg() for trx in range(self._num_trx)] + + def _validate_new_num_trx(self, num_trx): + if self._max_trx is not None and num_trx > self._max_trx: + raise log.Error('Amount of TRX requested is too high for maximum allowed: %u > %u' %(num_trx, self._max_trx)) + + @staticmethod + def _new_default_trx_cfg(): + return {'timeslot_list':[{} for ts in range(8)]} + + @staticmethod + def _trx_list_recreate(trx_list, new_size): + curr_len = len(trx_list) + if new_size < curr_len: + trx_list = trx_list[0:new_size] + elif new_size > curr_len: + for i in range(new_size - curr_len): + trx_list.append(Bts._new_default_trx_cfg()) + return trx_list def conf_for_bsc_prepare(self): values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(self.defaults_cfg_name)) + # Make sure the trx_list is adapted to num of trx configured at runtime + # to avoid overlay issues. + trx_list = values.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + values['trx_list'] = Bts._trx_list_recreate(trx_list, self.num_trx()) + + bts_defaults = config.get_defaults(self.defaults_cfg_name) + trx_list = bts_defaults.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + bts_defaults['trx_list'] = Bts._trx_list_recreate(trx_list, self.num_trx()) + + config.overlay(values, bts_defaults) if self.lac is not None: config.overlay(values, { 'location_area_code': self.lac }) if self.rac is not None: @@ -58,6 +116,8 @@ sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() config.overlay(values, sgsn_conf) + + config.overlay(values, { 'trx_list': self.overlay_trx_list }) return values ######################## @@ -111,4 +171,21 @@ def set_bvci(self, bvci): self.bvci = bvci + def set_num_trx(self, num_trx): + assert num_trx > 0 + self._validate_new_num_trx(num_trx) + if num_trx == self._num_trx: + return + self._num_trx = num_trx + self.overlay_trx_list = Bts._trx_list_recreate(self.overlay_trx_list, num_trx) + + def num_trx(self): + return self._num_trx + + def set_trx_phy_channel(self, trx_idx, ts_idx, config): + assert trx_idx < self._num_trx + assert ts_idx < 8 + schema.phy_channel_config(config) # validation + self.overlay_trx_list[trx_idx]['timeslot_list'][ts_idx]['phys_chan_config'] = config + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 1c4b4a0..318c30d 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -52,9 +52,6 @@ proc.launch() return proc - def num_trx(self): - return len(self.values['osmo_bts_octphy'].get('trx_list', [])) - def allocate_phy_instances(self, c): ''' Generate match trx Z <-> phy X inst Y to use in vty config diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 4b9e1ff..70d6e8a 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -60,6 +60,8 @@ 'bts[].power_supply.device': schema.STR, 'bts[].power_supply.port': schema.STR, 'bts[].ciphers[]': schema.CIPHER, + 'bts[].num_trx': schema.UINT, + 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].hw_addr': schema.HWADDR, 'bts[].trx_list[].net_device': schema.STR, 'bts[].trx_list[].nominal_power': schema.UINT, -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:41 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Move logic to lib/testlib.py In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8062 to look at the new patch set (#2). tests: voice: Move logic to lib/testlib.py This way we can have several tests sharing similar logic. Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f --- A suites/voice/lib/testlib.py M suites/voice/mo_mt_call.py 2 files changed, 62 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/62/8062/2 diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py new file mode 100755 index 0000000..f949809 --- /dev/null +++ b/suites/voice/lib/testlib.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def call_test_setup_run(bts_setup_cb=None): + hlr = suite.hlr() + bts = suite.bts() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + ms_mo = suite.modem() + ms_mt = suite.modem() + + if bts_setup_cb is not None: + bts_setup_cb(bts) + + hlr.start() + stp.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + + bsc.bts_add(bts) + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + + hlr.subscriber_add(ms_mo) + hlr.subscriber_add(ms_mt) + + ms_mo.connect(msc.mcc_mnc()) + ms_mt.connect(msc.mcc_mnc()) + + ms_mo.log_info() + ms_mt.log_info() + + print('waiting for modems to attach...') + wait(ms_mo.is_connected, msc.mcc_mnc()) + wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms_mo, ms_mt) + + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') + + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') + + sleep(5) # maintain the call active for 5 seconds + + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py index aeda80d..093d1e8 100755 --- a/suites/voice/mo_mt_call.py +++ b/suites/voice/mo_mt_call.py @@ -1,56 +1,5 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +from testlib import call_test_setup_run -hlr = suite.hlr() -bts = suite.bts() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms_mo = suite.modem() -ms_mt = suite.modem() - -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() - -bsc.bts_add(bts) -bsc.start() - -bts.start() -wait(bsc.bts_is_connected, bts) - -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) - -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) - -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -mo_cid = ms_mo.call_dial(ms_mt) -mt_cid = ms_mt.call_wait_incoming(ms_mo) -print('dial success') - -assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) -ms_mt.call_answer(mt_cid) -wait(ms_mo.call_is_active, mo_cid) -wait(ms_mt.call_is_active, mt_cid) -print('answer success, call established and ongoing') - -sleep(5) # maintain the call active for 5 seconds - -assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) -ms_mt.call_hangup(mt_cid) -wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) -print('hangup success') +call_test_setup_run() -- To view, visit https://gerrit.osmocom.org/8062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:41 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dynamic timeslots durin... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8063 to look at the new patch set (#3). tests: dyn_ts_*: Add tests to verify dynamic timeslots during phone calls Two different test suites are created since we want to run them with different HW, because some HW support one type of PDCH channels, and other HW supports the other one. Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 --- A suites/dyn_ts_ipa/lib/testlib.py A suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py A suites/dyn_ts_ipa/suite.conf A suites/dyn_ts_osmo/lib/testlib.py A suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py A suites/dyn_ts_osmo/suite.conf 6 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/63/8063/3 diff --git a/suites/dyn_ts_ipa/lib/testlib.py b/suites/dyn_ts_ipa/lib/testlib.py new file mode 100755 index 0000000..28a4975 --- /dev/null +++ b/suites/dyn_ts_ipa/lib/testlib.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def call_test_setup_run(bts_setup_cb=None, gprs_enable=True): + hlr = suite.hlr() + bts = suite.bts() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + ms_mo = suite.modem() + ms_mt = suite.modem() + + if bts_setup_cb is not None: + bts_setup_cb(bts) + + if gprs_enable: + ggsn = suite.ggsn() + sgsn = suite.sgsn(hlr, ggsn) + sgsn.bts_add(bts) + ggsn.start() + sgsn.start() + + hlr.start() + stp.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + + bsc.bts_add(bts) + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + + hlr.subscriber_add(ms_mo) + hlr.subscriber_add(ms_mt) + + ms_mo.connect(msc.mcc_mnc()) + ms_mt.connect(msc.mcc_mnc()) + + ms_mo.log_info() + ms_mt.log_info() + + print('waiting for modems to attach...') + wait(ms_mo.is_connected, msc.mcc_mnc()) + wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms_mo, ms_mt) + + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') + + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') + + sleep(5) # maintain the call active for 5 seconds + + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py new file mode 100755 index 0000000..1e7a5c0 --- /dev/null +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 +# Once Fixed, add a new test with following test: +#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/suite.conf b/suites/dyn_ts_ipa/suite.conf new file mode 100644 index 0000000..4ac2436 --- /dev/null +++ b/suites/dyn_ts_ipa/suite.conf @@ -0,0 +1,9 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - voice diff --git a/suites/dyn_ts_osmo/lib/testlib.py b/suites/dyn_ts_osmo/lib/testlib.py new file mode 120000 index 0000000..8f0bc5a --- /dev/null +++ b/suites/dyn_ts_osmo/lib/testlib.py @@ -0,0 +1 @@ +../../dyn_ts_ipa/lib/testlib.py \ No newline at end of file diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py new file mode 100755 index 0000000..3ba8045 --- /dev/null +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 +# Once Fixed, add a new test with following test: +#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/suite.conf b/suites/dyn_ts_osmo/suite.conf new file mode 100644 index 0000000..4ac2436 --- /dev/null +++ b/suites/dyn_ts_osmo/suite.conf @@ -0,0 +1,9 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - voice -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:43 +0000 Subject: [PATCH] osmo-gsm-tester[master]: bts: Move conf_for_bsc_prepare from bts_osmo to bts Message-ID: Review at https://gerrit.osmocom.org/8066 bts: Move conf_for_bsc_prepare from bts_osmo to bts nanobts inherits directly from bts.Bts, so we need to move conf_for_bsc_prepare there to make nanobts work again. Fixes: 530681fd86c4a4dab18e4575c9cdf339623ffa49 Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_osmo.py 2 files changed, 18 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/66/8066/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index fac4fd2..731f5a7 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -42,6 +42,24 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + + def conf_for_bsc_prepare(self): + values = config.get_defaults('bsc_bts') + config.overlay(values, config.get_defaults(self.defaults_cfg_name)) + if self.lac is not None: + config.overlay(values, { 'location_area_code': self.lac }) + if self.rac is not None: + config.overlay(values, { 'routing_area_code': self.rac }) + if self.cellid is not None: + config.overlay(values, { 'cell_identity': self.cellid }) + if self.bvci is not None: + config.overlay(values, { 'bvci': self.bvci }) + config.overlay(values, self.conf) + + sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() + config.overlay(values, sgsn_conf) + return values + ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 8629b9b..21ae135 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -35,23 +35,6 @@ if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) - def conf_for_bsc_prepare(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(self.defaults_cfg_name)) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - return values - ######################## # PUBLIC - INTERNAL API ######################## -- To view, visit https://gerrit.osmocom.org/8066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:44 +0000 Subject: [PATCH] osmo-gsm-tester[master]: suite: Set suite subdir lib part of syspath so tests can imp... Message-ID: Review at https://gerrit.osmocom.org/8067 suite: Set suite subdir lib part of syspath so tests can import their own modules Change-Id: I3307c3ab314bb7a88d3c22c7c270c9f05fe6e03e --- M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/util.py 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/8067/1 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index a7f91c5..44aabbd 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -148,9 +148,11 @@ self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements()) def run_tests(self, names=None): + suite_libdir = os.path.join(self.definition.suite_dir, 'lib') try: log.large_separator(self.trial.name(), self.name(), sublevel=2) self.mark_start() + util.import_path_prepend(suite_libdir) MainLoop.register_poll_func(self.poll) if not self.reserved_resources: self.reserve_resources() @@ -177,6 +179,7 @@ self.objects_cleanup() self.free_resources() MainLoop.unregister_poll_func(self.poll) + util.import_path_remove(suite_libdir) self.duration = time.time() - self.start_timestamp passed, skipped, failed = self.count_test_results() diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/util.py index 8fe3029..c7efb77 100644 --- a/src/osmo_gsm_tester/util.py +++ b/src/osmo_gsm_tester/util.py @@ -112,6 +112,16 @@ if proc.result != 0: raise RuntimeError('%s finished with err code %d' % (SETCAP_NET_ADMIN_BIN, proc.result)) +def import_path_prepend(pathname): + dir = os.path.realpath(pathname) + if dir not in sys.path: + sys.path.insert(0, dir) + +def import_path_remove(pathname): + dir = os.path.realpath(pathname) + if dir not in sys.path: + sys.path.remove(dir) + class listdict(dict): 'a dict of lists { "a": [1, 2, 3], "b": [1, 2] }' -- To view, visit https://gerrit.osmocom.org/8067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3307c3ab314bb7a88d3c22c7c270c9f05fe6e03e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:44 +0000 Subject: [PATCH] osmo-gsm-tester[master]: tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py Message-ID: Review at https://gerrit.osmocom.org/8068 tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py Change-Id: I7306e62ad4c4294370690cf9006871f798a7b9ec --- D suites/voice/mo_mt_call.py A suites/voice/mo_mt_call_tchf.py 2 files changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/68/8068/1 diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py deleted file mode 100755 index 093d1e8..0000000 --- a/suites/voice/mo_mt_call.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * -from testlib import call_test_setup_run - -call_test_setup_run() diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py new file mode 100755 index 0000000..012ce52 --- /dev/null +++ b/suites/voice/mo_mt_call_tchf.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F') + bts.set_trx_phy_channel(0, 3, 'TCH/F') + bts.set_trx_phy_channel(0, 4, 'TCH/F') + bts.set_trx_phy_channel(0, 5, 'TCH/F') + bts.set_trx_phy_channel(0, 6, 'TCH/F') + bts.set_trx_phy_channel(0, 7, 'TCH/F') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7306e62ad4c4294370690cf9006871f798a7b9ec Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:14:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:14:44 +0000 Subject: [PATCH] osmo-gsm-tester[master]: default-suites.conf: Add dyn ts suites Message-ID: Review at https://gerrit.osmocom.org/8069 default-suites.conf: Add dyn ts suites Change-Id: Iec7c8d8c3617f11a5ee12c02bd75ed6822d76aa9 --- M example/default-suites.conf 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/69/8069/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index 6e4f727..b631ef9 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -3,18 +3,24 @@ - ussd:sysmo - aoip_ussd:sysmo - voice:sysmo +- dyn_ts_ipa:sysmo +- dyn_ts_osmo:sysmo - gprs:sysmo - sms:trx-b200 - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 - voice:trx-b200 +- dyn_ts_ipa:trx-b200 +- dyn_ts_osmo:trx-b200 - gprs:trx-b200 - sms:trx-sysmocell5000 - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000 +- dyn_ts_ipa:sysmocell5000 +- dyn_ts_osmo:sysmocell5000 - gprs:trx-sysmocell5000 - sms:octphy - aoip_sms:octphy @@ -27,11 +33,13 @@ - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 - voice:nanobts+band-1900 +- dyn_ts_ipa:nanobts+band-1900 - gprs:nanobts+band-1900 - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 - voice:nanobts+band-900 +- dyn_ts_ipa:nanobts+band-900 - gprs:nanobts+band-900 - smpp - aoip_smpp -- To view, visit https://gerrit.osmocom.org/8069 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec7c8d8c3617f11a5ee12c02bd75ed6822d76aa9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:18:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:18:31 +0000 Subject: [MERGED] osmo-gsm-tester[master]: bts: Pass defaults config name at construct time In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: bts: Pass defaults config name at construct time ...................................................................... bts: Pass defaults config name at construct time It will be needed later at construction time when resolving the num of trx. Change-Id: I2c6a46ead14010f714897ea178917327215823e7 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py 6 files changed, 17 insertions(+), 16 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 02e5df7..fac4fd2 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -32,15 +32,16 @@ rac = None cellid = None bvci = None + defaults_cfg_name = None ############## # PROTECTED ############## - def __init__(self, suite_run, conf, name): + def __init__(self, suite_run, conf, name, defaults_cfg_name): super().__init__(log.C_RUN, name) self.suite_run = suite_run self.conf = conf - + self.defaults_cfg_name = defaults_cfg_name ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index a930442..d631f1c 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -36,7 +36,7 @@ def __init__(self, suite_run, conf): if conf.get('addr') is None: raise log.Error('No attribute addr provided in conf!') - super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('addr')) + super().__init__(suite_run, conf, 'nanobts_%s' % conf.get('addr'), 'nanobts') def _configure(self): if self.bsc is None: @@ -56,7 +56,7 @@ ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('nanobts') + values = self.conf_for_bsc_prepare() # Hack until we have proper ARFCN resource allocation support (OS#2230) band = values.get('band') trx_list = values.get('trx_list') diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 70deba3..1c4b4a0 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -36,7 +36,7 @@ CONF_BTS_OCTPHY = 'osmo-bts-octphy.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY) + super().__init__(suite_run, conf, OsmoBtsOctphy.BIN_BTS_OCTPHY, 'osmo_bts_octphy') self.env = {} self.values = {} @@ -112,7 +112,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_octphy') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index d0ba557..8629b9b 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -30,14 +30,14 @@ ############## # PROTECTED ############## - def __init__(self, suite_run, conf, name): - super().__init__(suite_run, conf, name) + def __init__(self, suite_run, conf, name, defaults_cfg_name): + super().__init__(suite_run, conf, name, defaults_cfg_name) if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) - def conf_for_bsc_osmo(self, bts_defaults_name): + def conf_for_bsc_prepare(self): values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(bts_defaults_name)) + config.overlay(values, config.get_defaults(self.defaults_cfg_name)) if self.lac is not None: config.overlay(values, { 'location_area_code': self.lac }) if self.rac is not None: @@ -94,8 +94,8 @@ ############## pcu_sk_tmp_dir = None - def __init__(self, suite_run, conf, name): - super().__init__(suite_run, conf, name) + def __init__(self, suite_run, conf, name, defaults_cfg_name): + super().__init__(suite_run, conf, name, defaults_cfg_name) ######################## # PUBLIC - INTERNAL API diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index f1a9bdf..9f76194 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -38,7 +38,7 @@ CONF_BTS_TRX = 'osmo-bts-trx.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX) + super().__init__(suite_run, conf, OsmoBtsTrx.BIN_BTS_TRX, 'osmo_bts_trx') self.env = {} def trx_remote_ip(self): @@ -92,7 +92,7 @@ # PUBLIC - INTERNAL API ######################## def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_trx') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index c9978e5..d0f6ff3 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -35,7 +35,7 @@ BTS_SYSMO_CFG = 'osmo-bts-sysmo.cfg' def __init__(self, suite_run, conf): - super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN) + super().__init__(suite_run, conf, SysmoBts.BTS_SYSMO_BIN, 'osmo_bts_sysmo') self.remote_user = 'root' def _direct_pcu_enabled(self): @@ -103,7 +103,7 @@ return os.path.join(SysmoBts.REMOTE_DIR, 'pcu_bts') def conf_for_bsc(self): - values = self.conf_for_bsc_osmo('osmo_bts_sysmo') + values = self.conf_for_bsc_prepare() self.dbg(conf=values) return values -- To view, visit https://gerrit.osmocom.org/8060 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c6a46ead14010f714897ea178917327215823e7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:18:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:18:58 +0000 Subject: osmo-gsm-tester[master]: bts: Move conf_for_bsc_prepare from bts_osmo to bts In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 15:19:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:19:11 +0000 Subject: [MERGED] osmo-gsm-tester[master]: bts: Move conf_for_bsc_prepare from bts_osmo to bts In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: bts: Move conf_for_bsc_prepare from bts_osmo to bts ...................................................................... bts: Move conf_for_bsc_prepare from bts_osmo to bts nanobts inherits directly from bts.Bts, so we need to move conf_for_bsc_prepare there to make nanobts work again. Fixes: 530681fd86c4a4dab18e4575c9cdf339623ffa49 Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_osmo.py 2 files changed, 18 insertions(+), 17 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index fac4fd2..731f5a7 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -42,6 +42,24 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + + def conf_for_bsc_prepare(self): + values = config.get_defaults('bsc_bts') + config.overlay(values, config.get_defaults(self.defaults_cfg_name)) + if self.lac is not None: + config.overlay(values, { 'location_area_code': self.lac }) + if self.rac is not None: + config.overlay(values, { 'routing_area_code': self.rac }) + if self.cellid is not None: + config.overlay(values, { 'cell_identity': self.cellid }) + if self.bvci is not None: + config.overlay(values, { 'bvci': self.bvci }) + config.overlay(values, self.conf) + + sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() + config.overlay(values, sgsn_conf) + return values + ######################## # PUBLIC - INTERNAL API ######################## diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 8629b9b..21ae135 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -35,23 +35,6 @@ if len(self.pcu_socket_path().encode()) > 107: raise log.Error('Path for pcu socket is longer than max allowed len for unix socket path (107):', self.pcu_socket_path()) - def conf_for_bsc_prepare(self): - values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(self.defaults_cfg_name)) - if self.lac is not None: - config.overlay(values, { 'location_area_code': self.lac }) - if self.rac is not None: - config.overlay(values, { 'routing_area_code': self.rac }) - if self.cellid is not None: - config.overlay(values, { 'cell_identity': self.cellid }) - if self.bvci is not None: - config.overlay(values, { 'bvci': self.bvci }) - config.overlay(values, self.conf) - - sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() - config.overlay(values, sgsn_conf) - return values - ######################## # PUBLIC - INTERNAL API ######################## -- To view, visit https://gerrit.osmocom.org/8066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4305eefb4056ed7614118532e271efe780f4a87f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 15:39:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 15:39:33 +0000 Subject: [PATCH] libosmo-sccp[master]: debian/control: match build dependency versions with configu... Message-ID: Review at https://gerrit.osmocom.org/8070 debian/control: match build dependency versions with configure.ac So far, 'debian/control' didn't express the minimum version numbers of the libosmocore + libosmo-netif build dependencies. This resulted in build failures against older libosmocore/libosmo-netif versions, so let's make sure the minimum veresion requirements are expressed also in debian/control. Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e --- M debian/control 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/8070/1 diff --git a/debian/control b/debian/control index 1782051..aab5737 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev, + libosmocore-dev (>= 0.10.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev, + libosmo-netif-dev (>= 0.1.0), libsctp-dev Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Tue May 8 15:40:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 15:40:21 +0000 Subject: [PATCH] libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: debian/control: match build dependency versions with configure.ac So far, 'debian/control' didn't express the minimum version numbers of the libosmocore + libosmo-netif build dependencies. This resulted in build failures against older libosmocore/libosmo-netif versions, so let's make sure the minimum veresion requirements are expressed also in debian/control. Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e --- M debian/control 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/8070/2 diff --git a/debian/control b/debian/control index 1782051..b1949cd 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev, + libosmocore-dev (>= 0.11.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev, + libosmo-netif-dev (>= 0.2.0), libsctp-dev Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Tue May 8 15:41:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 15:41:47 +0000 Subject: libosmo-sccp[master]: free local variable 'prim' in lm_timer_cb() of lm_fsm In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/8065/1/src/xua_default_lm_fsm.c File src/xua_default_lm_fsm.c: Line 188: msgb_free(prim->oph.msg); Actually, this is wrong as per the general convention on how osmo_prim based SAPs behave. The primitive ownership is passed from the SAP provider (which we are here) to the SAP consumer. It's the responsibility of the XLM (xUA layer manager) to process / consume / release the primitive. -- To view, visit https://gerrit.osmocom.org/8065 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 8 15:42:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 15:42:48 +0000 Subject: libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/8070/2/debian/control File debian/control: Line 16: libosmo-netif-dev (>= 0.2.0), Is this really needed? it should be catched at configure time anyway. And having those here mean having to bump more stuff every time we want to release. -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 8 15:43:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 15:43:13 +0000 Subject: osmo-hlr[master]: move creation of insert subscriber data messages to a common... In-Reply-To: References: Message-ID: Patch Set 4: (1 comment) https://gerrit.osmocom.org/#/c/7992/4/src/gsup_server.h File src/gsup_server.h: Line 62: int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, Are those (imsi, msisdn, ...)input parameters? If yes, then we typically mark them "const" to indicate the function really only reads the data -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-PatchSet: 4 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Tue May 8 16:08:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 16:08:00 +0000 Subject: libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: Patch Set 2: is it needed? Well, Debian has a libosmocore version as part of the official repository. This fulfills the build dependency, so you easily end up trying to build a package that will not build. And that failure should be detected even before the dpkg build starts, rather than somewhere during the build process. This is particularly relevant if you have multiple apt feeds that all can provide different libosmocore versions, such as the distribution one, and one of our OBS feeds. Or you have feeds for stable/unstable/testing all active in your system. -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 16:12:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 16:12:00 +0000 Subject: libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:45 +0000 Subject: osmo-gsm-tester[master]: bts: Allow setting amount of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:47 +0000 Subject: osmo-gsm-tester[master]: suite: Set suite subdir lib part of syspath so tests can imp... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3307c3ab314bb7a88d3c22c7c270c9f05fe6e03e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:50 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Move logic to lib/testlib.py In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:51 +0000 Subject: osmo-gsm-tester[master]: tests: voice: test voice calls on TCH/H timeslots In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:53 +0000 Subject: osmo-gsm-tester[master]: tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7306e62ad4c4294370690cf9006871f798a7b9ec Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:55 +0000 Subject: osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dynamic timeslots durin... In-Reply-To: References: Message-ID: Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:40:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:40:57 +0000 Subject: osmo-gsm-tester[master]: default-suites.conf: Add dyn ts suites In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8069 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iec7c8d8c3617f11a5ee12c02bd75ed6822d76aa9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:01 +0000 Subject: [MERGED] osmo-gsm-tester[master]: default-suites.conf: Add dyn ts suites In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: default-suites.conf: Add dyn ts suites ...................................................................... default-suites.conf: Add dyn ts suites Change-Id: Iec7c8d8c3617f11a5ee12c02bd75ed6822d76aa9 --- M example/default-suites.conf 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index 6e4f727..b631ef9 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -3,18 +3,24 @@ - ussd:sysmo - aoip_ussd:sysmo - voice:sysmo +- dyn_ts_ipa:sysmo +- dyn_ts_osmo:sysmo - gprs:sysmo - sms:trx-b200 - aoip_sms:trx-b200 - ussd:trx-b200 - aoip_ussd:trx-b200 - voice:trx-b200 +- dyn_ts_ipa:trx-b200 +- dyn_ts_osmo:trx-b200 - gprs:trx-b200 - sms:trx-sysmocell5000 - aoip_sms:trx-sysmocell5000 - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000 +- dyn_ts_ipa:sysmocell5000 +- dyn_ts_osmo:sysmocell5000 - gprs:trx-sysmocell5000 - sms:octphy - aoip_sms:octphy @@ -27,11 +33,13 @@ - ussd:nanobts+band-1900 - aoip_ussd:nanobts+band-1900 - voice:nanobts+band-1900 +- dyn_ts_ipa:nanobts+band-1900 - gprs:nanobts+band-1900 - aoip_sms:nanobts+band-900 - ussd:nanobts+band-900 - aoip_ussd:nanobts+band-900 - voice:nanobts+band-900 +- dyn_ts_ipa:nanobts+band-900 - gprs:nanobts+band-900 - smpp - aoip_smpp -- To view, visit https://gerrit.osmocom.org/8069 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec7c8d8c3617f11a5ee12c02bd75ed6822d76aa9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:01 +0000 Subject: [MERGED] osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dynamic timeslots durin... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: tests: dyn_ts_*: Add tests to verify dynamic timeslots during phone calls ...................................................................... tests: dyn_ts_*: Add tests to verify dynamic timeslots during phone calls Two different test suites are created since we want to run them with different HW, because some HW support one type of PDCH channels, and other HW supports the other one. Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 --- A suites/dyn_ts_ipa/lib/testlib.py A suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py A suites/dyn_ts_ipa/suite.conf A suites/dyn_ts_osmo/lib/testlib.py A suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py A suites/dyn_ts_osmo/suite.conf 6 files changed, 130 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/dyn_ts_ipa/lib/testlib.py b/suites/dyn_ts_ipa/lib/testlib.py new file mode 100755 index 0000000..28a4975 --- /dev/null +++ b/suites/dyn_ts_ipa/lib/testlib.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def call_test_setup_run(bts_setup_cb=None, gprs_enable=True): + hlr = suite.hlr() + bts = suite.bts() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + ms_mo = suite.modem() + ms_mt = suite.modem() + + if bts_setup_cb is not None: + bts_setup_cb(bts) + + if gprs_enable: + ggsn = suite.ggsn() + sgsn = suite.sgsn(hlr, ggsn) + sgsn.bts_add(bts) + ggsn.start() + sgsn.start() + + hlr.start() + stp.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + + bsc.bts_add(bts) + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + + hlr.subscriber_add(ms_mo) + hlr.subscriber_add(ms_mt) + + ms_mo.connect(msc.mcc_mnc()) + ms_mt.connect(msc.mcc_mnc()) + + ms_mo.log_info() + ms_mt.log_info() + + print('waiting for modems to attach...') + wait(ms_mo.is_connected, msc.mcc_mnc()) + wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms_mo, ms_mt) + + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') + + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') + + sleep(5) # maintain the call active for 5 seconds + + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py new file mode 100755 index 0000000..1e7a5c0 --- /dev/null +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 +# Once Fixed, add a new test with following test: +#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/suite.conf b/suites/dyn_ts_ipa/suite.conf new file mode 100644 index 0000000..4ac2436 --- /dev/null +++ b/suites/dyn_ts_ipa/suite.conf @@ -0,0 +1,9 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - voice diff --git a/suites/dyn_ts_osmo/lib/testlib.py b/suites/dyn_ts_osmo/lib/testlib.py new file mode 120000 index 0000000..8f0bc5a --- /dev/null +++ b/suites/dyn_ts_osmo/lib/testlib.py @@ -0,0 +1 @@ +../../dyn_ts_ipa/lib/testlib.py \ No newline at end of file diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py new file mode 100755 index 0000000..3ba8045 --- /dev/null +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'PDCH') + +#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 +# Once Fixed, add a new test with following test: +#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/suite.conf b/suites/dyn_ts_osmo/suite.conf new file mode 100644 index 0000000..4ac2436 --- /dev/null +++ b/suites/dyn_ts_osmo/suite.conf @@ -0,0 +1,9 @@ +resources: + ip_address: + - times: 8 # msc, bsc, hlr, stp, mgw*2, sgsn, ggsn + bts: + - times: 1 + modem: + - times: 2 + features: + - voice -- To view, visit https://gerrit.osmocom.org/8063 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5e61eaff39ac7a6585dc7de2aeb2469dd2ce726 Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:02 +0000 Subject: [MERGED] osmo-gsm-tester[master]: tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py ...................................................................... tests: voice: Move mo_mt_call.py to mo_mt_call_tchf.py Change-Id: I7306e62ad4c4294370690cf9006871f798a7b9ec --- D suites/voice/mo_mt_call.py A suites/voice/mo_mt_call_tchf.py 2 files changed, 18 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py deleted file mode 100755 index 093d1e8..0000000 --- a/suites/voice/mo_mt_call.py +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 -from osmo_gsm_tester.testenv import * -from testlib import call_test_setup_run - -call_test_setup_run() diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py new file mode 100755 index 0000000..012ce52 --- /dev/null +++ b/suites/voice/mo_mt_call_tchf.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F') + bts.set_trx_phy_channel(0, 3, 'TCH/F') + bts.set_trx_phy_channel(0, 4, 'TCH/F') + bts.set_trx_phy_channel(0, 5, 'TCH/F') + bts.set_trx_phy_channel(0, 6, 'TCH/F') + bts.set_trx_phy_channel(0, 7, 'TCH/F') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7306e62ad4c4294370690cf9006871f798a7b9ec Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:02 +0000 Subject: [MERGED] osmo-gsm-tester[master]: tests: voice: test voice calls on TCH/H timeslots In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: tests: voice: test voice calls on TCH/H timeslots ...................................................................... tests: voice: test voice calls on TCH/H timeslots Change-Id: I897757a21fee516ce96808a180121b09f06a0fea --- A suites/voice/mo_mt_call_tchh.py 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py new file mode 100755 index 0000000..6b820d9 --- /dev/null +++ b/suites/voice/mo_mt_call_tchh.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +add_subdir_to_import_path("lib") +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/H') + bts.set_trx_phy_channel(0, 3, 'TCH/H') + bts.set_trx_phy_channel(0, 4, 'TCH/H') + bts.set_trx_phy_channel(0, 5, 'TCH/H') + bts.set_trx_phy_channel(0, 6, 'TCH/H') + bts.set_trx_phy_channel(0, 7, 'TCH/H') + +call_test_setup_run(bts_setup_cb=my_bts_setup) -- To view, visit https://gerrit.osmocom.org/8064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I897757a21fee516ce96808a180121b09f06a0fea Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:02 +0000 Subject: [MERGED] osmo-gsm-tester[master]: tests: voice: Move logic to lib/testlib.py In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: tests: voice: Move logic to lib/testlib.py ...................................................................... tests: voice: Move logic to lib/testlib.py This way we can have several tests sharing similar logic. Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f --- A suites/voice/lib/testlib.py M suites/voice/mo_mt_call.py 2 files changed, 62 insertions(+), 53 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py new file mode 100755 index 0000000..f949809 --- /dev/null +++ b/suites/voice/lib/testlib.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +def call_test_setup_run(bts_setup_cb=None): + hlr = suite.hlr() + bts = suite.bts() + mgw_msc = suite.mgw() + mgw_bsc = suite.mgw() + stp = suite.stp() + msc = suite.msc(hlr, mgw_msc, stp) + bsc = suite.bsc(msc, mgw_bsc, stp) + ms_mo = suite.modem() + ms_mt = suite.modem() + + if bts_setup_cb is not None: + bts_setup_cb(bts) + + hlr.start() + stp.start() + msc.start() + mgw_msc.start() + mgw_bsc.start() + + bsc.bts_add(bts) + bsc.start() + + bts.start() + wait(bsc.bts_is_connected, bts) + + hlr.subscriber_add(ms_mo) + hlr.subscriber_add(ms_mt) + + ms_mo.connect(msc.mcc_mnc()) + ms_mt.connect(msc.mcc_mnc()) + + ms_mo.log_info() + ms_mt.log_info() + + print('waiting for modems to attach...') + wait(ms_mo.is_connected, msc.mcc_mnc()) + wait(ms_mt.is_connected, msc.mcc_mnc()) + wait(msc.subscriber_attached, ms_mo, ms_mt) + + assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 + mo_cid = ms_mo.call_dial(ms_mt) + mt_cid = ms_mt.call_wait_incoming(ms_mo) + print('dial success') + + assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) + ms_mt.call_answer(mt_cid) + wait(ms_mo.call_is_active, mo_cid) + wait(ms_mt.call_is_active, mt_cid) + print('answer success, call established and ongoing') + + sleep(5) # maintain the call active for 5 seconds + + assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) + ms_mt.call_hangup(mt_cid) + wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) + print('hangup success') diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py index aeda80d..093d1e8 100755 --- a/suites/voice/mo_mt_call.py +++ b/suites/voice/mo_mt_call.py @@ -1,56 +1,5 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +from testlib import call_test_setup_run -hlr = suite.hlr() -bts = suite.bts() -mgw_msc = suite.mgw() -mgw_bsc = suite.mgw() -stp = suite.stp() -msc = suite.msc(hlr, mgw_msc, stp) -bsc = suite.bsc(msc, mgw_bsc, stp) -ms_mo = suite.modem() -ms_mt = suite.modem() - -hlr.start() -stp.start() -msc.start() -mgw_msc.start() -mgw_bsc.start() - -bsc.bts_add(bts) -bsc.start() - -bts.start() -wait(bsc.bts_is_connected, bts) - -hlr.subscriber_add(ms_mo) -hlr.subscriber_add(ms_mt) - -ms_mo.connect(msc.mcc_mnc()) -ms_mt.connect(msc.mcc_mnc()) - -ms_mo.log_info() -ms_mt.log_info() - -print('waiting for modems to attach...') -wait(ms_mo.is_connected, msc.mcc_mnc()) -wait(ms_mt.is_connected, msc.mcc_mnc()) -wait(msc.subscriber_attached, ms_mo, ms_mt) - -assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0 -mo_cid = ms_mo.call_dial(ms_mt) -mt_cid = ms_mt.call_wait_incoming(ms_mo) -print('dial success') - -assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid) -ms_mt.call_answer(mt_cid) -wait(ms_mo.call_is_active, mo_cid) -wait(ms_mt.call_is_active, mt_cid) -print('answer success, call established and ongoing') - -sleep(5) # maintain the call active for 5 seconds - -assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid) -ms_mt.call_hangup(mt_cid) -wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0) -print('hangup success') +call_test_setup_run() -- To view, visit https://gerrit.osmocom.org/8062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cfcc56970380a7c5400186fac5f504263d63c5f Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:03 +0000 Subject: [MERGED] osmo-gsm-tester[master]: suite: Set suite subdir lib part of syspath so tests can imp... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: suite: Set suite subdir lib part of syspath so tests can import their own modules ...................................................................... suite: Set suite subdir lib part of syspath so tests can import their own modules Change-Id: I3307c3ab314bb7a88d3c22c7c270c9f05fe6e03e --- M src/osmo_gsm_tester/suite.py M src/osmo_gsm_tester/util.py 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index a7f91c5..44aabbd 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -148,9 +148,11 @@ self.reserved_resources = self.resources_pool.reserve(self, self.resource_requirements()) def run_tests(self, names=None): + suite_libdir = os.path.join(self.definition.suite_dir, 'lib') try: log.large_separator(self.trial.name(), self.name(), sublevel=2) self.mark_start() + util.import_path_prepend(suite_libdir) MainLoop.register_poll_func(self.poll) if not self.reserved_resources: self.reserve_resources() @@ -177,6 +179,7 @@ self.objects_cleanup() self.free_resources() MainLoop.unregister_poll_func(self.poll) + util.import_path_remove(suite_libdir) self.duration = time.time() - self.start_timestamp passed, skipped, failed = self.count_test_results() diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/util.py index 8fe3029..c7efb77 100644 --- a/src/osmo_gsm_tester/util.py +++ b/src/osmo_gsm_tester/util.py @@ -112,6 +112,16 @@ if proc.result != 0: raise RuntimeError('%s finished with err code %d' % (SETCAP_NET_ADMIN_BIN, proc.result)) +def import_path_prepend(pathname): + dir = os.path.realpath(pathname) + if dir not in sys.path: + sys.path.insert(0, dir) + +def import_path_remove(pathname): + dir = os.path.realpath(pathname) + if dir not in sys.path: + sys.path.remove(dir) + class listdict(dict): 'a dict of lists { "a": [1, 2, 3], "b": [1, 2] }' -- To view, visit https://gerrit.osmocom.org/8067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3307c3ab314bb7a88d3c22c7c270c9f05fe6e03e Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:41:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:41:04 +0000 Subject: [MERGED] osmo-gsm-tester[master]: bts: Allow setting amount of TRX and timeslot in cfg and fro... In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: bts: Allow setting amount of TRX and timeslot in cfg and from test at runtime ...................................................................... bts: Allow setting amount of TRX and timeslot in cfg and from test at runtime The num_trx attribute for a given BTS states the number of TRX to be used by that BTS. If more than num_trx are configured in trx_list in the cfg file, then only up to num_trx are taken into account. If a num_trx value higher than max_trx is specified throuygh config file or at runtime by the test, an exception is raised explaining the issue. The num/max_trx attributes are overlayed along the config levels (generic -> bsc_bts -> specific bts-type -> specific resource object). This way we can specify a long list of trx+timeslot config in the generic config (bsc_bts), and tune for each model and specific BTS which is the desired default number of TRX, as well as the maximum supported per type. Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac --- M example/defaults.conf M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_octphy.py M src/osmo_gsm_tester/resource.py 4 files changed, 98 insertions(+), 5 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/example/defaults.conf b/example/defaults.conf index c110dde..1e84200 100644 --- a/example/defaults.conf +++ b/example/defaults.conf @@ -28,6 +28,8 @@ base_station_id_code: 63 stream_id: 255 osmobsc_bts_type: sysmobts + num_trx: 1 + max_trx: 1 trx_list: - nominal_power: 23 max_power_red: 0 @@ -41,3 +43,18 @@ - phys_chan_config: TCH/F - phys_chan_config: PDCH - phys_chan_config: PDCH + - nominal_power: 23 + max_power_red: 0 + arfcn: 870 + timeslot_list: + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + - phys_chan_config: TCH/F + +osmo_bts_octphy: + max_trx: 2 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index 731f5a7..f59cff3 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -21,7 +21,7 @@ import pprint import tempfile from abc import ABCMeta, abstractmethod -from . import log, config, util, template, process, pcu_osmo +from . import log, config, util, template, process, schema, pcu_osmo class Bts(log.Origin, metaclass=ABCMeta): suite_run = None @@ -33,6 +33,9 @@ cellid = None bvci = None defaults_cfg_name = None + _num_trx = 1 + _max_trx = None + overlay_trx_list = [] ############## # PROTECTED @@ -42,10 +45,65 @@ self.suite_run = suite_run self.conf = conf self.defaults_cfg_name = defaults_cfg_name + self._init_num_trx() + + def _resolve_bts_cfg(self, cfg_name): + res = None + val = config.get_defaults('bsc_bts').get(cfg_name) + if val is not None: + res = val + val = config.get_defaults(self.defaults_cfg_name).get(cfg_name) + if val is not None: + res = val + val = self.conf.get(cfg_name) + if val is not None: + res = val + return res + + def _init_num_trx(self): + self._num_trx = 1 + self._max_trx = None + val = self._resolve_bts_cfg('num_trx') + if val is not None: + self._num_trx = int(val) + val = self._resolve_bts_cfg('max_trx') + if val is not None: + self._max_trx = int(val) + self._validate_new_num_trx(self._num_trx) + self.overlay_trx_list = [Bts._new_default_trx_cfg() for trx in range(self._num_trx)] + + def _validate_new_num_trx(self, num_trx): + if self._max_trx is not None and num_trx > self._max_trx: + raise log.Error('Amount of TRX requested is too high for maximum allowed: %u > %u' %(num_trx, self._max_trx)) + + @staticmethod + def _new_default_trx_cfg(): + return {'timeslot_list':[{} for ts in range(8)]} + + @staticmethod + def _trx_list_recreate(trx_list, new_size): + curr_len = len(trx_list) + if new_size < curr_len: + trx_list = trx_list[0:new_size] + elif new_size > curr_len: + for i in range(new_size - curr_len): + trx_list.append(Bts._new_default_trx_cfg()) + return trx_list def conf_for_bsc_prepare(self): values = config.get_defaults('bsc_bts') - config.overlay(values, config.get_defaults(self.defaults_cfg_name)) + # Make sure the trx_list is adapted to num of trx configured at runtime + # to avoid overlay issues. + trx_list = values.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + values['trx_list'] = Bts._trx_list_recreate(trx_list, self.num_trx()) + + bts_defaults = config.get_defaults(self.defaults_cfg_name) + trx_list = bts_defaults.get('trx_list') + if trx_list and len(trx_list) != self.num_trx(): + bts_defaults['trx_list'] = Bts._trx_list_recreate(trx_list, self.num_trx()) + + config.overlay(values, bts_defaults) if self.lac is not None: config.overlay(values, { 'location_area_code': self.lac }) if self.rac is not None: @@ -58,6 +116,8 @@ sgsn_conf = {} if self.sgsn is None else self.sgsn.conf_for_client() config.overlay(values, sgsn_conf) + + config.overlay(values, { 'trx_list': self.overlay_trx_list }) return values ######################## @@ -111,4 +171,21 @@ def set_bvci(self, bvci): self.bvci = bvci + def set_num_trx(self, num_trx): + assert num_trx > 0 + self._validate_new_num_trx(num_trx) + if num_trx == self._num_trx: + return + self._num_trx = num_trx + self.overlay_trx_list = Bts._trx_list_recreate(self.overlay_trx_list, num_trx) + + def num_trx(self): + return self._num_trx + + def set_trx_phy_channel(self, trx_idx, ts_idx, config): + assert trx_idx < self._num_trx + assert ts_idx < 8 + schema.phy_channel_config(config) # validation + self.overlay_trx_list[trx_idx]['timeslot_list'][ts_idx]['phys_chan_config'] = config + # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py index 1c4b4a0..318c30d 100644 --- a/src/osmo_gsm_tester/bts_octphy.py +++ b/src/osmo_gsm_tester/bts_octphy.py @@ -52,9 +52,6 @@ proc.launch() return proc - def num_trx(self): - return len(self.values['osmo_bts_octphy'].get('trx_list', [])) - def allocate_phy_instances(self, c): ''' Generate match trx Z <-> phy X inst Y to use in vty config diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/resource.py index 4b9e1ff..70d6e8a 100644 --- a/src/osmo_gsm_tester/resource.py +++ b/src/osmo_gsm_tester/resource.py @@ -60,6 +60,8 @@ 'bts[].power_supply.device': schema.STR, 'bts[].power_supply.port': schema.STR, 'bts[].ciphers[]': schema.CIPHER, + 'bts[].num_trx': schema.UINT, + 'bts[].max_trx': schema.UINT, 'bts[].trx_list[].hw_addr': schema.HWADDR, 'bts[].trx_list[].net_device': schema.STR, 'bts[].trx_list[].nominal_power': schema.UINT, -- To view, visit https://gerrit.osmocom.org/8061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f46eaf7a16f03268653299c93600c0443f691ac Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:49:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:49:32 +0000 Subject: [PATCH] osmo-trx[master]: UHDDevice: Fix setup failure with LimeSuite > 18.04.1 Message-ID: Review at https://gerrit.osmocom.org/8071 UHDDevice: Fix setup failure with LimeSuite > 18.04.1 Fixes: https://github.com/myriadrf/LimeSuite/issues/184 Change-Id: I48ead8b8996981263297b66c0c7d3d0972261316 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/71/8071/1 diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 0d59bfc..a0052c8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -732,8 +732,8 @@ } } else if (dev_type == LIMESDR) { for (size_t i = 0; i < chans; i++) { - usrp_dev->set_tx_bandwidth(5e6, i); - usrp_dev->set_rx_bandwidth(5e6, i); + usrp_dev->set_tx_bandwidth(5.2e6, i); + usrp_dev->set_rx_bandwidth(1.4001e6, i); } } -- To view, visit https://gerrit.osmocom.org/8071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48ead8b8996981263297b66c0c7d3d0972261316 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:53:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 18:53:30 +0000 Subject: libosmocore[master]: lapdm: Implement SABM related constraints In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:53:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 18:53:38 +0000 Subject: [MERGED] libosmocore[master]: lapdm: Implement SABM related constraints In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: lapdm: Implement SABM related constraints ...................................................................... lapdm: Implement SABM related constraints * MO SAPI0 establishment *must always* have L3 payload for contention resolution * SAPI3 establishment *must never* use contention resolution * MT establish must never use contention resolution Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Closes: OS#2370 --- M src/gsm/lapdm.c 1 file changed, 45 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index ae21ccd..1e81bff 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -48,6 +48,8 @@ #include #include +#define LAPD_U_SABM 0x7 + /* TS 04.06 Figure 4 / Section 3.2 */ #define LAPDm_LPD_NORMAL 0 #define LAPDm_LPD_SMSCB 1 @@ -537,6 +539,42 @@ return rc; } +/* determine if receiving a given LAPDm message is not permitted */ +static int lapdm_rx_not_permitted(const struct lapdm_entity *le, + const struct lapd_msg_ctx *lctx) +{ + /* we currently only implement SABM related checks here */ + if (lctx->format != LAPD_FORM_U || lctx->s_u != LAPD_U_SABM) + return 0; + + if (le->mode == LAPDM_MODE_BTS) { + if (le == &le->lapdm_ch->lapdm_acch) { + /* no contention resolution on SACCH */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + } else { + switch (lctx->sapi) { + case 0: + /* SAPI0 must use contention resolution, i.e. L3 payload must exist */ + if (lctx->length == 0) + return RLL_CAUSE_UFRM_INC_PARAM; + break; + case 3: + /* SAPI3 doesn't support contention resolution */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + break; + } + } + } else if (le->mode == LAPDM_MODE_MS) { + /* contention resolution (L3 present) is only sent by MS, but + * never received by it */ + if (lctx->length > 0) + return RLL_CAUSE_SABM_INFO_NOTALL; + } + return 0; +} + /* input into layer2 (from layer 1) */ static int l2_ph_data_ind(struct msgb *msg, struct lapdm_entity *le, uint8_t chan_nr, uint8_t link_id) @@ -674,6 +712,13 @@ } /* store context for messages from lapd */ memcpy(&mctx.dl->mctx, &mctx, sizeof(mctx.dl->mctx)); + rc =lapdm_rx_not_permitted(le, &lctx); + if (rc > 0) { + LOGP(DLLAPD, LOGL_NOTICE, "received message not permitted"); + msgb_free(msg); + rsl_rll_error(rc, &mctx); + return -EINVAL; + } /* send to LAPD */ rc = lapd_ph_data_ind(msg, &lctx); break; -- To view, visit https://gerrit.osmocom.org/7960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Tue May 8 18:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:53:58 +0000 Subject: [PATCH] osmo-gsm-tester[master]: default-suites.conf: Fix typo in previous commit Message-ID: Review at https://gerrit.osmocom.org/8072 default-suites.conf: Fix typo in previous commit Change-Id: Ib1903324df8eb9f506b62dc0b9d2aa4a4a5179d7 --- M example/default-suites.conf 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/72/8072/1 diff --git a/example/default-suites.conf b/example/default-suites.conf index b631ef9..fa95daa 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -19,8 +19,8 @@ - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000 -- dyn_ts_ipa:sysmocell5000 -- dyn_ts_osmo:sysmocell5000 +- dyn_ts_ipa:trx-sysmocell5000 +- dyn_ts_osmo:trx-sysmocell5000 - gprs:trx-sysmocell5000 - sms:octphy - aoip_sms:octphy -- To view, visit https://gerrit.osmocom.org/8072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1903324df8eb9f506b62dc0b9d2aa4a4a5179d7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:54:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 18:54:04 +0000 Subject: osmo-trx[master]: UHDDevice: Fix setup failure with LimeSuite > 18.04.1 In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I48ead8b8996981263297b66c0c7d3d0972261316 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:54:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:54:14 +0000 Subject: osmo-gsm-tester[master]: default-suites.conf: Fix typo in previous commit In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib1903324df8eb9f506b62dc0b9d2aa4a4a5179d7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:54:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 18:54:16 +0000 Subject: [MERGED] osmo-gsm-tester[master]: default-suites.conf: Fix typo in previous commit In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: default-suites.conf: Fix typo in previous commit ...................................................................... default-suites.conf: Fix typo in previous commit Change-Id: Ib1903324df8eb9f506b62dc0b9d2aa4a4a5179d7 --- M example/default-suites.conf 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/example/default-suites.conf b/example/default-suites.conf index b631ef9..fa95daa 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -19,8 +19,8 @@ - ussd:trx-sysmocell5000 - aoip_ussd:trx-sysmocell5000 - voice:trx-sysmocell5000 -- dyn_ts_ipa:sysmocell5000 -- dyn_ts_osmo:sysmocell5000 +- dyn_ts_ipa:trx-sysmocell5000 +- dyn_ts_osmo:trx-sysmocell5000 - gprs:trx-sysmocell5000 - sms:octphy - aoip_sms:octphy -- To view, visit https://gerrit.osmocom.org/8072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1903324df8eb9f506b62dc0b9d2aa4a4a5179d7 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 18:54:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 18:54:43 +0000 Subject: libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 18:54:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 18:54:48 +0000 Subject: [MERGED] libosmo-sccp[master]: debian/control: match build dependency versions with configu... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debian/control: match build dependency versions with configure.ac ...................................................................... debian/control: match build dependency versions with configure.ac So far, 'debian/control' didn't express the minimum version numbers of the libosmocore + libosmo-netif build dependencies. This resulted in build failures against older libosmocore/libosmo-netif versions, so let's make sure the minimum veresion requirements are expressed also in debian/control. Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e --- M debian/control 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 1782051..b1949cd 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, - libosmocore-dev, + libosmocore-dev (>= 0.11.0), autoconf, automake, libtool, @@ -13,7 +13,7 @@ git, doxygen, libdpkg-perl, - libosmo-netif-dev, + libosmo-netif-dev (>= 0.2.0), libsctp-dev Standards-Version: 3.9.7 Vcs-Git: git://git.osmocom.org/libosmo-sccp.git -- To view, visit https://gerrit.osmocom.org/8070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c874880d8b2569df7acc1af554f7a4dd30e649e Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 19:22:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 19:22:43 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: add bts/expected-results.xml Message-ID: Review at https://gerrit.osmocom.org/8073 add bts/expected-results.xml Change-Id: I677b65cbfd5762ff016b188a0f18ce1e5710f45d --- A bts/expected-results.xml 1 file changed, 91 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/8073/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml new file mode 100644 index 0000000..6ac0686 --- /dev/null +++ b/bts/expected-results.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 116, which has already terminated. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + no verdict + + + + + + + + + + RSL for unknown Dchan + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_unsol_deact testcase + + + + "Timeout expecting RSL CHAN ACT" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_double_act testcase + + + + + + + + Tguard timeout + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_tchf_act_pdch_act_nack testcase + + + + "Timeout expecting RSL CHAN ACT" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_act_tchf_act_nack testcase + + + -- To view, visit https://gerrit.osmocom.org/8073 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I677b65cbfd5762ff016b188a0f18ce1e5710f45d Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 19:22:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 19:22:43 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_unsol_deact Message-ID: Review at https://gerrit.osmocom.org/8074 bts: fix TC_dyn_osmo_pdch_unsol_deact TC_dyn_osmo_pdch_unsol_deact sends a release request on an already released lchan, which obviously would never trigger a change in the PCU configuration and hence it makes no sense to expect a PCU info ind to be sent. Instead of f_dyn_osmo_pdch_deact(), which expects a PCU info_ind, just send a CHAN_REL and expect a trivial REL_ACK. Drop some unused local vars. Change-Id: I6b790e866ce4e66d9385b286b727ae41a83d3e67 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/8074/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f820cf4..a930dd2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2713,14 +2713,13 @@ /* send a RF CHAN REL for PDCH on an osmocom dynamci PDCH that's already inactive */ function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; - var integer ts_nr := g_chan_nr.tn; - var integer trx_nr := 0; - var integer bts_nr := 0; var integer pcu_conn_id := -1; f_init_pcu(PCU, id, pcu_conn_id, first_info); - f_dyn_osmo_pdch_deact(pcu_conn_id, bts_nr, trx_nr); + RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); + /* since the lchan is already released, we don't expect any PCU changes, just a rel ack. */ + RSL.receive(tr_RSL_RF_CHAN_REL_ACK(g_chan_nr)); setverdict(pass); } testcase TC_dyn_osmo_pdch_unsol_deact() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/8074 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b790e866ce4e66d9385b286b727ae41a83d3e67 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:05:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:05:56 +0000 Subject: [PATCH] libosmocore[master]: lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() Message-ID: Review at https://gerrit.osmocom.org/8075 lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() This is a purely cosmetic clean-up to use the msgb_tv_push() API to pre-pend a Tag-Value IE to a msgb, rather than the existing open-coding approach. Change-Id: I19bbfa1e327a617685ed11d4182e533df33215cb --- M src/gsm/lapdm.c 1 file changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/8075/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 1e81bff..49c2a4b 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -385,20 +385,16 @@ static int send_rslms_rll_l3_ui(struct lapdm_msg_ctx *mctx, struct msgb *msg) { uint8_t l3_len = msg->tail - (uint8_t *)msgb_l3(msg); - struct abis_rsl_rll_hdr *rllh; /* Add the RSL + RLL header */ msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); - msgb_push(msg, 2 + 2); + + /* Add two IEs carrying MS power and TA values */ + msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); + msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + rsl_rll_push_hdr(msg, RSL_MT_UNIT_DATA_IND, mctx->chan_nr, mctx->link_id, 1); - rllh = (struct abis_rsl_rll_hdr *)msgb_l2(msg); - - rllh->data[0] = RSL_IE_TIMING_ADVANCE; - rllh->data[1] = mctx->ta_ind; - - rllh->data[2] = RSL_IE_MS_POWER; - rllh->data[3] = mctx->tx_power_ind; return rslms_sendmsg(msg, mctx->dl->entity); } -- To view, visit https://gerrit.osmocom.org/8075 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19bbfa1e327a617685ed11d4182e533df33215cb Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Tue May 8 20:05:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:05:57 +0000 Subject: [PATCH] libosmocore[master]: lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unl... Message-ID: Review at https://gerrit.osmocom.org/8076 lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unless needed The RSL_IE_MS_POWER / RSL_IE_TIMING_ADVANCE is how we communicate the SACCH L1 header values on the MS side between LAPDm and L3 (which is a non-standard use of RSL). However, those IEs only maek sense on the SACCH, where we have B4 frame format and where we actually have a L1 header containing related information. Let's make sure to skip those IEs on regular RLL UNIT DATA INDICATION happening on other channel types. Change-Id: I6f13e02192531479287f71de674d17ca2ceabdc6 Closes: OS#3249 --- M src/gsm/lapdm.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/8076/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 49c2a4b..b9e7304 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -389,9 +389,11 @@ /* Add the RSL + RLL header */ msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); - /* Add two IEs carrying MS power and TA values */ - msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); - msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + /* Add two non-standard IEs carrying MS power and TA values for B4 (SACCH) */ + if (mctx->lapdm_fmt == LAPDm_FMT_B4) { + msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); + msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + } rsl_rll_push_hdr(msg, RSL_MT_UNIT_DATA_IND, mctx->chan_nr, mctx->link_id, 1); -- To view, visit https://gerrit.osmocom.org/8076 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f13e02192531479287f71de674d17ca2ceabdc6 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Tue May 8 20:10:17 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:10:17 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_double_act Message-ID: Review at https://gerrit.osmocom.org/8077 bts: fix TC_dyn_osmo_pdch_double_act Do not expect success on second activation. Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/8077/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a930dd2..a0ea3b2 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2743,7 +2743,9 @@ f_init_pcu(PCU, id, pcu_conn_id, first_info); f_dyn_osmo_pdch_act(pcu_conn_id, bts_nr, trx_nr); - f_dyn_osmo_pdch_act(pcu_conn_id, bts_nr, trx_nr); + /* Send a second Chan Activ and expect it to be NACKed */ + f_rsl_transceive(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode), tr_RSL_CHAN_ACT_NACK(g_chan_nr), + "RSL CHAN ACT NACK"); setverdict(pass); } testcase TC_dyn_osmo_pdch_double_act() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/8077 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:12:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:12:51 +0000 Subject: osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_double_act In-Reply-To: References: Message-ID: Patch Set 1: Here is the question about this patch: the normal course of activating an lchan is that you can't activate it a second time (and thus you don't accidentally re-use someone else's lchan). However, for PDCH activation one could argue that when I want to enable PDCH on a TS that is already in PDCH, we could also ACK that activation, because yes, it is and remains in PDCH mode. This patch assumes that the BSC doesn't expect to activate PDCH twice. Let me know if the test was intended to just get an ACK for repeated PDCH activation. -- To view, visit https://gerrit.osmocom.org/8077 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:15:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:15:04 +0000 Subject: [PATCH] osmo-bts[master]: add/improve various logging around dyn ts In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8040 to look at the new patch set (#2). add/improve various logging around dyn ts This logging turned up while I was debugging dynamic timeslots: - OML Set Channel Attributes logging. - a specific dyn TS pchan error. - show pchan and lchan types on CHAN ACT ACK and REL ACK logging. - on RSL message Rx, log the current pchan kind in detail, using gsm_ts_and_pchan_name(). This logs the underlying pchan as well as the current pchan mode a dyn TS is in. - move 2 dyn TS logging from DL1C to DRSL, where all the other dyn ts logging is. Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea --- M src/common/oml.c M src/common/rsl.c 2 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/8040/2 diff --git a/src/common/oml.c b/src/common/oml.c index 89db9cf..41debc1 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -950,6 +950,7 @@ /* Call into BTS driver to check attribute values */ rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -965,6 +966,9 @@ ts->pchan = abis_nm_pchan4chcomb(comb); rc = conf_lchans(ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid Chan Comb 0x%x" + " (pchan=%s, conf_lchans()->%d)\n", + comb, gsm_pchan_name(ts->pchan), rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -980,8 +984,8 @@ /* If there is no TSC specified, use the BCC */ ts->tsc = BSIC2BCC(bts->bsic); } - LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC = %u)\n", - gsm_abis_mo_name(&ts->mo), ts->tsc); + LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC=%u pchan=%s)\n", + gsm_abis_mo_name(&ts->mo), ts->tsc, gsm_pchan_name(ts->pchan)); /* call into BTS driver to apply new attributes to hardware */ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts); diff --git a/src/common/rsl.c b/src/common/rsl.c index 902b68f..8a1a232 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -683,7 +683,9 @@ return 0; } - LOGP(DRSL, LOGL_NOTICE, "%s Tx RF CHAN REL ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN REL ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); /* * Free the LAPDm resources now that the BTS @@ -702,7 +704,9 @@ uint8_t chan_nr = gsm_lchan2chan_nr(lchan); uint8_t ie[2]; - LOGP(DRSL, LOGL_NOTICE, "%s Tx CHAN ACT ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN ACT ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); if (!msg) @@ -986,6 +990,9 @@ return 1; } } + + LOGP(DRSL, LOGL_DEBUG, "%s: rx Channel Activation in state: %s.\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); /* Initialize channel defaults */ lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); @@ -2106,7 +2113,7 @@ if (ts->flags & TS_F_PDCH_PENDING_MASK) { /* Only one of the pending flags should ever be set at the same * time, but just log both in case both should be set. */ - LOGP(DL1C, LOGL_ERROR, + LOGP(DRSL, LOGL_ERROR, "%s Request to PDCH %s, but PDCH%s%s is still pending\n", gsm_lchan_name(lchan), pdch_act? "ACT" : "DEACT", (ts->flags & TS_F_PDCH_ACT_PENDING)? " ACT" : "", @@ -2212,8 +2219,8 @@ break; default: LOGP(DRSL, LOGL_ERROR, - "%s Dyn TS disconnected, but invalid desired pchan", - gsm_ts_and_pchan_name(ts)); + "%s Dyn TS disconnected, but invalid desired pchan: %s\n", + gsm_ts_and_pchan_name(ts), gsm_pchan_name(ts->dyn.pchan_want)); ts->dyn.pchan_want = GSM_PCHAN_NONE; /* TODO: how would this recover? */ return; @@ -2351,7 +2358,7 @@ ts->flags |= TS_F_PDCH_ACTIVE; else ts->flags &= ~TS_F_PDCH_ACTIVE; - DEBUGP(DL1C, "%s %s switched to %s mode (ts->flags == %x)\n", + DEBUGP(DRSL, "%s %s switched to %s mode (ts->flags == %x)\n", gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan), pdch_act? "PDCH" : "TCH/F", ts->flags); @@ -2697,8 +2704,9 @@ return rsl_reject_unknown_lchan(msg); } - LOGP(DRSL, LOGL_INFO, "%s Rx RSL %s\n", gsm_lchan_name(msg->lchan), - rsl_or_ipac_msg_name(dch->c.msg_type)); + LOGP(DRSL, LOGL_INFO, "%s ss=%d Rx RSL %s\n", + gsm_ts_and_pchan_name(msg->lchan->ts), msg->lchan->nr, + rsl_or_ipac_msg_name(dch->c.msg_type)); switch (dch->c.msg_type) { case RSL_MT_CHAN_ACTIV: -- To view, visit https://gerrit.osmocom.org/8040 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Tue May 8 20:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:15:05 +0000 Subject: [PATCH] osmo-bts[master]: ignore RSL RF CHAN REL for inactive lchans Message-ID: Review at https://gerrit.osmocom.org/8078 ignore RSL RF CHAN REL for inactive lchans When an RF CHANnel RELease request is received on an already released lchan, there is no "REL NACK" message or similar, we just ACK the release. When ACKing the release, make sure to reflect the same chan_nr that the release was asked for, since the lchan state may actually reflect a different chan_nr. Factor the actual Rel Ack message sending out of rsl_tx_rf_rel_ack(), which makes all sorts of decisions around normal Rel Ack: add static tx_rf_rel_ack(), with chan_nr argument instead of deriving chan_nr from the lchan. Use this to directly ACK an unusual Chan Rel with the chan_nr that came in with the request. Fixes: BTS_Tests.TC_dyn_osmo_pdch_unsol_deact (after I6b790e866ce4e66d9385b286b727ae41a83d3e67) Change-Id: Iceaa2e87874ced42d664a2a0b01a1c59e46a19b3 --- M src/common/rsl.c 1 file changed, 29 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/8078/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 52eb5f4..a09d3a2 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -613,10 +613,26 @@ * dedicated channel related messages */ +/* Send an RF CHANnel RELease ACKnowledge with the given chan_nr. This chan_nr may mismatch the current + * lchan state, if we received a CHANnel RELease for an already released channel, and we're just acking + * what we got without taking any action. */ +static int tx_rf_rel_ack(struct gsm_lchan *lchan, uint8_t chan_nr) +{ + struct msgb *msg; + + msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); + if (!msg) + return -ENOMEM; + + rsl_dch_push_hdr(msg, RSL_MT_RF_CHAN_REL_ACK, chan_nr); + msg->trx = lchan->ts->trx; + + return abis_bts_rsl_sendmsg(msg); +} + /* 8.4.19 sending RF CHANnel RELease ACKnowledge */ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan) { - struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr(lchan); bool send_rel_ack; @@ -675,14 +691,7 @@ */ lapdm_channel_exit(&lchan->lapdm_ch); - msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); - if (!msg) - return -ENOMEM; - - rsl_dch_push_hdr(msg, RSL_MT_RF_CHAN_REL_ACK, chan_nr); - msg->trx = lchan->ts->trx; - - return abis_bts_rsl_sendmsg(msg); + return tx_rf_rel_ack(lchan, chan_nr); } /* 8.4.2 sending CHANnel ACTIVation ACKnowledge */ @@ -1187,6 +1196,17 @@ { int rc; + if (lchan->state == LCHAN_S_NONE) { + LOGP(DRSL, LOGL_ERROR, + "%s ss=%d state=%s Rx RSL RF Channel Release, but is already inactive;" + " just ACKing the release\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchans_name(lchan->state)); + /* Just ack the release and ignore. Make sure to reflect the same chan_nr we received, + * not necessarily reflecting the current lchan state. */ + return tx_rf_rel_ack(lchan, chan_nr); + } + if (lchan->abis_ip.rtp_socket) { rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/8078 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iceaa2e87874ced42d664a2a0b01a1c59e46a19b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:15:05 +0000 Subject: [PATCH] osmo-bts[master]: fix RSL Chan Activ Nack messages Message-ID: Review at https://gerrit.osmocom.org/8079 fix RSL Chan Activ Nack messages In early rsl_rx_chan_activ(), do not use rsl_tx_chan_act_acknack() to trigger sending a NACK, instead use rsl_tx_chan_act_nack() directly. Rationale: the previously used rsl_tx_chan_act_acknack() may decide to omit the NACK, particularly based on the lchan->rel_act_kind. lchan->rel_act_kind indicates whether the Chan Release or Activation was explicitly requested via RSL, and thus whether an ACK/NACK should go back to RSL or not. This gets set only late in rsl_rx_chan_activ(). We cannot set it on top, because we need to first establish whether the Chan Activ is permitted or not. In case of early rejection of the Chan Activ, we do not want to modify the lchan state, but merely reply with a NACK, unconditionally. Before this patch, NACKs that rsl_rx_chan_activ() wants to trigger would possibly be not be sent out on RSL, because lchan->rel_act_kind is not explicitly initialized until later. Fixes: BTS_Tests.TC_dyn_ipa_pdch_act_tchf_act_nack Change-Id: Ic981f768cc024f0acd3d7ae55846cfbc7bc089ce --- M src/common/rsl.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/8079/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index a09d3a2..c3e9604 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -966,7 +966,7 @@ LOGP(DRSL, LOGL_ERROR, "%s: error: lchan is not available, but in state: %s.\n", gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); - return rsl_tx_chan_act_acknack(lchan, RSL_ERR_EQUIPMENT_FAIL); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { @@ -981,8 +981,7 @@ */ rc = dyn_ts_l1_reconnect(ts, msg); if (rc) - return rsl_tx_chan_act_acknack(lchan, - RSL_ERR_NORMAL_UNSPEC); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_NORMAL_UNSPEC); /* indicate that the msgb should not be freed. */ return 1; } @@ -998,7 +997,7 @@ /* 9.3.3 Activation Type */ if (!TLVP_PRESENT(&tp, RSL_IE_ACT_TYPE)) { LOGP(DRSL, LOGL_NOTICE, "missing Activation Type\n"); - return rsl_tx_chan_act_acknack(lchan, RSL_ERR_MAND_IE_ERROR); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); } type = *TLVP_VAL(&tp, RSL_IE_ACT_TYPE); @@ -1006,8 +1005,7 @@ if (type != RSL_ACT_OSMO_PDCH) { if (!TLVP_PRESENT(&tp, RSL_IE_CHAN_MODE)) { LOGP(DRSL, LOGL_NOTICE, "missing Channel Mode\n"); - return rsl_tx_chan_act_acknack(lchan, - RSL_ERR_MAND_IE_ERROR); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); } cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); lchan_tchmode_from_cmode(lchan, cm); -- To view, visit https://gerrit.osmocom.org/8079 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic981f768cc024f0acd3d7ae55846cfbc7bc089ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:15:05 +0000 Subject: [PATCH] osmo-bts[master]: ip.access dyn ts: properly NACK a PDCH ACT on a still active... Message-ID: Review at https://gerrit.osmocom.org/8080 ip.access dyn ts: properly NACK a PDCH ACT on a still active lchan Fixes: BTS_Tests.TC_dyn_ipa_pdch_tchf_act_pdch_act_nack Change-Id: I12816ef9953467decd9f745217135702a544c8fc --- M src/common/rsl.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/8080/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index c3e9604..902b68f 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2115,6 +2115,13 @@ return; } + if (lchan->state != LCHAN_S_NONE) { + LOGP(DRSL, LOGL_ERROR, + "%s Request to PDCH %s, but lchan is still active\n", + gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT"); + rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); + } + ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING : TS_F_PDCH_DEACT_PENDING; -- To view, visit https://gerrit.osmocom.org/8080 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12816ef9953467decd9f745217135702a544c8fc Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:18:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 8 May 2018 20:18:26 +0000 Subject: libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Patch Set 2: should I rather add symbols to libosmogsm.map instead of inlining? I don't mind, have not deeply reflected the advantages/disadvantages. This inline stuff "just happened"... -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:32:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:32:55 +0000 Subject: libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Patch Set 2: ah well, let's just keep it as is. -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:32:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:32:56 +0000 Subject: [MERGED] libosmocore[master]: add gsm0808 channel enum to IE val conversion functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: add gsm0808 channel enum to IE val conversion functions ...................................................................... add gsm0808 channel enum to IE val conversion functions Add: - gsm0808_current_channel_type_1() - gsm0808_permitted_speech() - gsm0808_chosen_channel() - gsm0808_channel_type_name() gsm0808_permitted_speech() is moved from osmo-bsc's bssap_speech_from_lchan(); gsm0808_chosen_channel() is moved from osmo-bsc's lchan_to_chosen_channel(); Rationale: will be re-used by inter-BSC handover, makes sense to keep with the other gsm0808 utils. Related: OS#2283 (inter-BSC handover, BSC side) Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 117 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 8cdb74b..24c139a 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -26,7 +26,9 @@ struct sockaddr_storage; #include +#include #include +#include /*! (225-1)/2 is the maximum number of elements in a cell identifier list. */ #define GSM0808_CELL_ID_LIST2_MAXLEN 127 @@ -102,4 +104,109 @@ int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); +/*! Return 3GPP TS 48.008 3.2.2.49 Current Channel Type 1 from enum gsm_chan_t. */ +static inline uint8_t gsm0808_current_channel_type_1(enum gsm_chan_t type) +{ + switch (type) { + default: + return 0; + case GSM_LCHAN_SDCCH: + return 0x01; + case GSM_LCHAN_TCH_F: + return 0x18; + case GSM_LCHAN_TCH_H: + return 0x19; + } +} + +/*! Return 3GPP TS 48.008 3.2.2.51 Speech Version aka permitted speech version indication in 3.2.2.11 + * Channel Type. */ +static inline enum gsm0808_permitted_speech gsm0808_permitted_speech(enum gsm_chan_t type, + enum gsm48_chan_mode mode) +{ + switch (mode) { + case GSM48_CMODE_SPEECH_V1: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_FR1; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR1; + default: + return 0; + } + case GSM48_CMODE_SPEECH_EFR: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_FR2; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR2; + default: + return 0; + } + case GSM48_CMODE_SPEECH_AMR: + switch (type) { + case GSM_LCHAN_TCH_F: + return GSM0808_PERM_HR3; + case GSM_LCHAN_TCH_H: + return GSM0808_PERM_HR3; + default: + return 0; + } + default: + return 0; + } +} + +/*! Return 3GPP TS 48.008 3.2.2.33 Chosen Channel. */ +static inline uint8_t gsm0808_chosen_channel(enum gsm_chan_t type, enum gsm48_chan_mode mode) +{ + uint8_t channel_mode = 0, channel = 0; + + switch (mode) { + case GSM48_CMODE_SPEECH_V1: + case GSM48_CMODE_SPEECH_EFR: + case GSM48_CMODE_SPEECH_AMR: + channel_mode = 0x9; + break; + case GSM48_CMODE_SIGN: + channel_mode = 0x8; + break; + case GSM48_CMODE_DATA_14k5: + channel_mode = 0xe; + break; + case GSM48_CMODE_DATA_12k0: + channel_mode = 0xb; + break; + case GSM48_CMODE_DATA_6k0: + channel_mode = 0xc; + break; + case GSM48_CMODE_DATA_3k6: + channel_mode = 0xd; + break; + default: + return 0; + } + + switch (type) { + case GSM_LCHAN_NONE: + channel = 0x0; + break; + case GSM_LCHAN_SDCCH: + channel = 0x1; + break; + case GSM_LCHAN_TCH_F: + channel = 0x8; + break; + case GSM_LCHAN_TCH_H: + channel = 0x9; + break; + default: + return 0; + } + + return channel_mode << 4 | channel; +} + +const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct); + /*! @} */ diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 8ef8e24..2c659bb 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -1273,4 +1273,13 @@ #undef APPEND_STR #undef APPEND_CELL_ID_U +const char *gsm0808_channel_type_name(const struct gsm0808_channel_type *ct) +{ + static char buf[128]; + snprintf(buf, sizeof(buf), "ch_indctr=0x%x ch_rate_type=0x%x perm_spch=%s", + ct->ch_indctr, ct->ch_rate_type, + osmo_hexdump(ct->perm_spch, ct->perm_spch_len)); + return buf; +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index f04fd58..8c64020 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -188,6 +188,7 @@ gsm0808_chan_type_to_speech_codec; gsm0808_speech_codec_from_chan_type; gsm0808_speech_codec_type_names; +gsm0808_channel_type_name; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/7844 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Tue May 8 20:33:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:33:23 +0000 Subject: osmo-ttcn3-hacks[master]: add bts/expected-results.xml In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8073 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I677b65cbfd5762ff016b188a0f18ce1e5710f45d Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:34:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:34:35 +0000 Subject: osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_double_act In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8077 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:34:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:34:42 +0000 Subject: osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_unsol_deact In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8074 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6b790e866ce4e66d9385b286b727ae41a83d3e67 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:35:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:35:01 +0000 Subject: libosmocore[master]: lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8075 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19bbfa1e327a617685ed11d4182e533df33215cb Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:35:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:35:06 +0000 Subject: libosmocore[master]: lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unl... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8076 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6f13e02192531479287f71de674d17ca2ceabdc6 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:35:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:35:11 +0000 Subject: [MERGED] libosmocore[master]: lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() ...................................................................... lapdm: cleanup: send_rslms_rll_l3_ui(): Use msgb_tv_push() This is a purely cosmetic clean-up to use the msgb_tv_push() API to pre-pend a Tag-Value IE to a msgb, rather than the existing open-coding approach. Change-Id: I19bbfa1e327a617685ed11d4182e533df33215cb --- M src/gsm/lapdm.c 1 file changed, 5 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 1e81bff..49c2a4b 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -385,20 +385,16 @@ static int send_rslms_rll_l3_ui(struct lapdm_msg_ctx *mctx, struct msgb *msg) { uint8_t l3_len = msg->tail - (uint8_t *)msgb_l3(msg); - struct abis_rsl_rll_hdr *rllh; /* Add the RSL + RLL header */ msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); - msgb_push(msg, 2 + 2); + + /* Add two IEs carrying MS power and TA values */ + msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); + msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + rsl_rll_push_hdr(msg, RSL_MT_UNIT_DATA_IND, mctx->chan_nr, mctx->link_id, 1); - rllh = (struct abis_rsl_rll_hdr *)msgb_l2(msg); - - rllh->data[0] = RSL_IE_TIMING_ADVANCE; - rllh->data[1] = mctx->ta_ind; - - rllh->data[2] = RSL_IE_MS_POWER; - rllh->data[3] = mctx->tx_power_ind; return rslms_sendmsg(msg, mctx->dl->entity); } -- To view, visit https://gerrit.osmocom.org/8075 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19bbfa1e327a617685ed11d4182e533df33215cb Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Tue May 8 20:35:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:35:38 +0000 Subject: [MERGED] osmo-trx[master]: UHDDevice: Fix setup failure with LimeSuite > 18.04.1 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: UHDDevice: Fix setup failure with LimeSuite > 18.04.1 ...................................................................... UHDDevice: Fix setup failure with LimeSuite > 18.04.1 Fixes: https://github.com/myriadrf/LimeSuite/issues/184 Change-Id: I48ead8b8996981263297b66c0c7d3d0972261316 --- M Transceiver52M/device/uhd/UHDDevice.cpp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index 0d59bfc..a0052c8 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -732,8 +732,8 @@ } } else if (dev_type == LIMESDR) { for (size_t i = 0; i < chans; i++) { - usrp_dev->set_tx_bandwidth(5e6, i); - usrp_dev->set_rx_bandwidth(5e6, i); + usrp_dev->set_tx_bandwidth(5.2e6, i); + usrp_dev->set_rx_bandwidth(1.4001e6, i); } } -- To view, visit https://gerrit.osmocom.org/8071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48ead8b8996981263297b66c0c7d3d0972261316 Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Tue May 8 20:36:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:36:34 +0000 Subject: osmo-bts[master]: ignore RSL RF CHAN REL for inactive lchans In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8078 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iceaa2e87874ced42d664a2a0b01a1c59e46a19b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:37:13 +0000 Subject: osmo-bts[master]: fix RSL Chan Activ Nack messages In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8079 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic981f768cc024f0acd3d7ae55846cfbc7bc089ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:37:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:37:26 +0000 Subject: osmo-bts[master]: ip.access dyn ts: properly NACK a PDCH ACT on a still active... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8080 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I12816ef9953467decd9f745217135702a544c8fc Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 20:37:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 20:37:38 +0000 Subject: osmo-bts[master]: add/improve various logging around dyn ts In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8040 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 21:41:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 21:41:31 +0000 Subject: [MERGED] libosmocore[master]: lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unl... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unless needed ...................................................................... lapdm: send_rslms_rll_l3_ui(): Don't include B4/SACCH IE unless needed The RSL_IE_MS_POWER / RSL_IE_TIMING_ADVANCE is how we communicate the SACCH L1 header values on the MS side between LAPDm and L3 (which is a non-standard use of RSL). However, those IEs only maek sense on the SACCH, where we have B4 frame format and where we actually have a L1 header containing related information. Let's make sure to skip those IEs on regular RLL UNIT DATA INDICATION happening on other channel types. Change-Id: I6f13e02192531479287f71de674d17ca2ceabdc6 Closes: OS#3249 --- M src/gsm/lapdm.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index 49c2a4b..b9e7304 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -389,9 +389,11 @@ /* Add the RSL + RLL header */ msgb_tv16_push(msg, RSL_IE_L3_INFO, l3_len); - /* Add two IEs carrying MS power and TA values */ - msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); - msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + /* Add two non-standard IEs carrying MS power and TA values for B4 (SACCH) */ + if (mctx->lapdm_fmt == LAPDm_FMT_B4) { + msgb_tv_push(msg, RSL_IE_MS_POWER, mctx->tx_power_ind); + msgb_tv_push(msg, RSL_IE_TIMING_ADVANCE, mctx->ta_ind); + } rsl_rll_push_hdr(msg, RSL_MT_UNIT_DATA_IND, mctx->chan_nr, mctx->link_id, 1); -- To view, visit https://gerrit.osmocom.org/8076 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f13e02192531479287f71de674d17ca2ceabdc6 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Tue May 8 21:42:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 8 May 2018 21:42:23 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: Add RLL tests Message-ID: Review at https://gerrit.osmocom.org/8081 bts: Add RLL tests This adds a series of test cases to BTS_Tests.ttcn implementing testing of the RLL sub-layr of RSL, i.e. the translation between LAPDm frames on the Um interface and the RLL frames on the Abis side (and vice vrsa). Related: OS#3174 Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 --- M bts/BTS_Tests.default M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_Types.ttcn M library/RSL_Emulation.ttcn M library/RSL_Types.ttcn 6 files changed, 610 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/8081/1 diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index 196d088..572d2ec 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -1,8 +1,8 @@ [LOGGING] -"BTS-Test-RSL-IPA".FileMask := ERROR | WARNING; -"BTS-Test-RSL".FileMask := ERROR | WARNING; +//"BTS-Test-RSL-IPA".FileMask := ERROR | WARNING; +//"BTS-Test-RSL".FileMask := ERROR | WARNING; "IPA0-CTRL-IPA".FileMask := ERROR | WARNING; -mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING; // | DEBUG_ENCDEC; [TESTPORT_PARAMETERS] *.BTSVTY.CTRL_MODE := "client" diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f820cf4..d4fefaf 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -105,6 +105,7 @@ /* all logical channels available on the BTS */ var ChannelNrs g_AllChannels; + var ChannelNrs g_AllChanTypes; } /* an individual call / channel */ @@ -141,7 +142,13 @@ RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, float t_guard, - ConnL1Pars l1_pars + ConnL1Pars l1_pars, + TestSpecUnion spec optional +} + +/* Test-specific parameters */ +type union TestSpecUnion { + RllTestCase rll } template (value) RachControlParameters ts_RachCtrl_default := { @@ -289,6 +296,16 @@ valueof(ts_RslChanNr_SDCCH8(6,2)), valueof(ts_RslChanNr_SDCCH8(6,3)), valueof(ts_RslChanNr_SDCCH8(6,4)), valueof(ts_RslChanNr_SDCCH8(6,5)), valueof(ts_RslChanNr_SDCCH8(6,6)), valueof(ts_RslChanNr_SDCCH8(6,7)) + }; + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + //valueof(ts_RslChanNr_Bm(1)), + /* TS 5: TCH/H */ + //valueof(ts_RslChanNr_Lm(5,1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) }; f_init_rsl(id); @@ -480,7 +497,8 @@ bs_power_level := 0, ms_power_level := 0, ms_actual_ta := 0 - } + }, + spec := omit } /*********************************************************************** @@ -1313,6 +1331,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); } + testcase TC_meas_res_sign_tchf() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; @@ -1372,7 +1391,7 @@ } -/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND */ +/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND (TS 48.058 4.10) */ private function f_TC_conn_fail_crit(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2993,6 +3012,422 @@ } +/*********************************************************************** + * LAPDm / RLL related + ***********************************************************************/ + +private function f_tx_lapdm(template (value) LapdmFrame l, + template (value) RslLinkId link_id) runs on ConnHdlr { + var octetstring l2 := enc_LapdmFrame(valueof(l)); + if (valueof(link_id.c) == SACCH) { + /* prepend dummy L1 header */ + l2 := '0000'O & l2; + } + log("encoding ", l, " to ", l2); + L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); +} + +type record RllTestCase { + uint3_t sapi, + RslLinkId link_id, + octetstring l3, + boolean exp +} +type record of RllTestCase RllTestCases; +template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, octetstring l3, boolean exp) := { + sapi := sapi, + link_id := id, + l3 := l3, + exp := exp +} + +/* execute the same callback function with a set of different parameters (tcs) on a + * variety of logical channels */ +private function f_rll_testmatrix(RllTestCases tcs, void_fn fn) runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(testcasename()); + + /* test on each of the channels we have */ + for (var integer i := 0; i < sizeof(g_AllChanTypes); i := i+1) { + pars := valueof(t_Pars(g_AllChanTypes[i], ts_RSL_ChanMode_SIGN)); + + /* test each of the test cases on the current channel */ + for (var integer j := 0; j < sizeof(tcs); j := j+1) { + pars.spec.rll := tcs[j]; + log(testcasename(), ": XXX Starting ", tcs[j] , " on ", g_AllChanTypes[i]); + vc_conn := f_start_handler(fn, pars); + vc_conn.done; + } + } + + f_shutdown(); +} + +/* test if SABM on Um triggers EST IND (TS 48.058 3.1) */ +private function f_TC_rll_est_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + f_sleep(0.5); + + f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id); + T.start; + alt { + [tc.l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, tc.link_id, tc.l3)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND with L3 in ", tc); + } + } + [tc.l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, tc.link_id)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND without L3 in ", tc); + } + } + [tc.exp] T.timeout { + setverdict(fail, "Timeout waiting for EST IND"); + } + [not tc.exp] T.timeout { + setverdict(pass); + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_ind() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI0 establishment */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + /* SAPI 0 requires contention resolution */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, false)), + /* SAPI 3 doesn't support contention resolution */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)), + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_ind)); +} + +/* test if RLL EST REQ trigeres SABM on Um; UA on Um triggers EST CONF (TS 48.058 3.2) */ +private function f_TC_rll_est_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + var L1ctlDlMessage dl; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* Send a RSL EST REQ for SAPI3 on main DCCH */ + RSL.send(ts_RSL_EST_REQ(g_chan_nr, tc.link_id)); + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + lapdm.ab := dec_LapdmFrameAB(l2); + if (match(lapdm, tr_LAPDm_SABM(tc.sapi, cr_MT_CMD, true, ''O))) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for SABM"); + self.stop; + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_req_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true))//, + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} +testcase TC_rll_est_req_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + } + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} + +/* altstep to receive a LAPDm frame matching the given template */ +private altstep as_l1_exp_lapdm(template LapdmFrame exp) runs on ConnHdlr { + var L1ctlDlMessage dl; + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + if (ischosen(exp.ab)) { + lapdm.ab := dec_LapdmFrameAB(l2); + } else if (ischosen(exp.b4)) { + lapdm.b4 := dec_LapdmFrameB4(l2); + } else if (ischosen(exp.bbis)) { + lapdm.bbis := dec_LapdmFrameBbis(l2); + } + log("Rx LAPDm ", lapdm); + if (match(lapdm, exp)) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } +} +private function f_l1_exp_lapdm(template LapdmFrame exp, float t := 3.0) runs on ConnHdlr { + timer T := t; + T.start; + alt { + [] T.timeout { + setverdict(fail, "Timeout waiting for LAPDm ", exp); + self.stop; + } + [] as_l1_exp_lapdm(exp); + } +} + +/* establish one Radio Link Layer via SABM -> UA. Use l3 for contention resolution */ +private function f_est_rll_mo(uint3_t sapi, RslLinkId link_id, octetstring l3) runs on ConnHdlr { + /* send SABM from MS -> BTS */ + f_tx_lapdm(ts_LAPDm_SABM(sapi, cr_MO_CMD, true, l3), link_id); + /* expect RLL EST IND on Abis */ + alt { + [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); + [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); + [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, ?)) { + setverdict(fail, "Failing due to RSL_ERROR_IND"); + self.stop; + } + [] RSL.receive { repeat; } + } + /* expect UA from BTS -> MS */ + f_l1_exp_lapdm(tr_LAPDm_UA(sapi, cr_MT_RSP, true, l3)); +} + +/* test if DISC on Um triggers RLL REL IND (TS 48.058 3.3) */ +private function f_TC_rll_rel_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the DISC */ + f_tx_lapdm(ts_LAPDm_DISC(tc.sapi, cr_MO_CMD, true), tc.link_id); + /* ... and expect the REL IND on the RSL side */ + alt { + [] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) { + setverdict(pass); + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_ind_DCCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +testcase TC_rll_rel_ind_ACCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +/* test if RLL REL REQ triggers DISC on Um; UA/DM triggers RLL REL CONF (TS 48.058 3.4) */ +private function f_TC_rll_rel_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the REL REQ via RSL */ + RSL.send(ts_RSL_REL_REQ(g_chan_nr, tc.link_id, RSL_REL_MODE_NORMAL)); + /* ... and expect the DISC on the Um side */ + alt { + [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MO_CMD, true)) { + /* FIXME: send a UA in resposne to the DISC */ + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_req() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req)); +} + +/* test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ +testcase TC_rll_data_req() runs on test_CT { +} + +/* test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ +testcase TC_rll_data_ind() runs on test_CT { +} + +/* test if RLL UNIT DATA REQ triggers UI-frame on Um (TS 48.058 3.7) */ +private function f_TC_rll_ud_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send UNITDATA REQ on RSL side */ + RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, tc.link_id, tc.l3)); + /* Expect it to arrive on the other side */ + if (tc.link_id.c == SACCH) { + f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } else { + f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_req_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} +testcase TC_rll_unit_data_req_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(19); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} + +/* test if UI-frames on Um trigger RLL UNIT DATA IND (TS 48.058 3.8) */ +private function f_TC_rll_ud_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send LAPDm UI frame. There is no B4 format in uplink! */ + f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, false, tc.l3), tc.link_id); + /* Expdct RLL UNITDATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tc.link_id, tc.l3)) { + setverdict(pass); + } + [] RSL.receive { repeat; } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_ind_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} +testcase TC_rll_unit_data_ind_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(18); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} + + +/* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ +/* protocol error as per 44.006 */ +/* link layer failure (repetition of I-frame N200 times without ACK */ +/* repetition of SABM or DISC N200 times without ACK */ +/* receptiom of SABM in multi-frame established state */ + + + + /* TODO Areas: @@ -3095,6 +3530,19 @@ execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); execute( TC_dyn_ipa_pdch_act_tchf_act_nack() ); + + execute( TC_rll_est_ind() ); + execute( TC_rll_est_req_DCCH_3() ); + execute( TC_rll_est_req_ACCH_3() ); + execute( TC_rll_rel_ind_DCCH_0() ); + execute( TC_rll_rel_ind_DCCH_3() ); + execute( TC_rll_rel_ind_ACCH_0() ); + execute( TC_rll_rel_ind_ACCH_3() ); + execute( TC_rll_rel_req() ); + execute( TC_rll_unit_data_req_DCCH() ); + execute( TC_rll_unit_data_req_ACCH() ); + execute( TC_rll_unit_data_ind_DCCH() ); + execute( TC_rll_unit_data_ind_ACCH() ); } diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 77b2494..f8bc670 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -97,7 +97,7 @@ alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl { rr := dec_GsmRrMessage(dl.payload.data_ind.payload); - log("PCH/AGCN DL RR: ", rr); + log("PCH/AGCH DL RR: ", rr); if (match(rr, t_RR_IMM_ASS(ra, rach_fn))) { log("Received IMM.ASS for our RACH!"); } else { diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 91f55fa..487748d 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -10,6 +10,12 @@ type BIT3 LapdmUBits; type BIT2 LapdmU2Bits; + /* 44.006 6.3.2 */ + const boolean cr_MO_CMD := false; + const boolean cr_MO_RSP := true; + const boolean cr_MT_CMD := true; + const boolean cr_MT_RSP := false; + /* TS 44.006 Figure 4 */ type record LapdmAddressField { BIT1 spare, @@ -193,4 +199,113 @@ /* automatic decoding to the generic LapdmFrame will not work, you have to call one of the * type-specific decoder routines above */ + /* SABM frame with L3 payload */ + template (value) LapdmFrame ts_LAPDm_SABM(LapdmSapi sapi, boolean c_r, boolean p, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlSABM(p), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_SABM(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlSABM(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template (value) LapdmFrame ts_LAPDm_UA(LapdmSapi sapi, boolean c_r, boolean f, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUA(f), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UA(template LapdmSapi sapi, template boolean c_r, + template boolean f, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUA(f), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_DISC(LapdmSapi sapi, boolean c_r, boolean p) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlDISC(p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + template LapdmFrame tr_LAPDm_DISC(template LapdmSapi sapi, template boolean c_r, + template boolean p) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlDISC(p), + len := ?, + m := false, + el := 1, + payload := ''O + } + } + + template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + len := 0, + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + b4 := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + payload := l3 + } + } + template LapdmFrame tr_LAPDm_B4_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + b4 := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + payload := l3 + } + } + + + } with { encode "RAW"; /*variant "FIELDORDER(msb)" */} diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 3ad062b..c5fb11d 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -421,7 +421,7 @@ if (cid != -1) { CLIENT_PT.send(rx_rsl.rsl) to ConnectionTable[cid].comp_ref; } else { - setverdict(fail, "RSL for unknown Dchan"); + //setverdict(fail, "RSL for unknown Dchan"); } } diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 246ea3f..2d9c92e 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -625,13 +625,19 @@ RSL_IPA_Codec codec } + /* 9.3.20 */ + type enumerated RSL_IE_ReleaseMode { + RSL_REL_MODE_NORMAL ('00'B), + REL_REL_MODE_LOCAL ('01'B) + } + /* union of all IE bodies */ type union RSL_IE_Body { RslChannelNr chan_nr, RslLinkId link_id, RSL_L16V l3_info, RSL_LV rlm_cause, - uint8_t release_mode, + RSL_IE_ReleaseMode release_mode, RSL_IE_ActivationType act_type, RSL_IE_ChannelMode chan_mode, uint8_t handover_ref, @@ -926,25 +932,38 @@ tr_RSL_IE(RSL_IE_Body:{l3_info := tr_RSL_L16V(l3_info)}) } } + template RSL_Message tr_RSL_EST_IND_NOL3(template RslChannelNr chan_nr, template RslLinkId link_id) := +{ + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), + msg_type := RSL_MT_EST_IND, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{link_id := link_id}) + } + } + /* 8.3.7 BSC -> BTS */ template (value) RSL_Message ts_RSL_REL_REQ(template (value) RslChannelNr chan_nr, - template (value) RslLinkId link_id) := { + template (value) RslLinkId link_id, + template (value) RSL_IE_ReleaseMode rel_mode := RSL_REL_MODE_NORMAL) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}) + t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}), + t_RSL_IE(RSL_IE_RELEASE_MODE, RSL_IE_Body:{release_mode := rel_mode}) } } template RSL_Message tr_RSL_REL_REQ(template RslChannelNr chan_nr, - template RslLinkId link_id) := { + template RslLinkId link_id, + template RSL_IE_ReleaseMode rel_mode := ?) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), tr_RSL_IE(RSL_IE_Body:{link_id := link_id}), - * + tr_RSL_IE(RSL_IE_Body:{release_mode := rel_mode}) } } @@ -993,6 +1012,13 @@ modifies ts_RSL_DATA_REQ := { msg_type := RSL_MT_UNIT_DATA_REQ } + template RSL_Message tr_RSL_UNITDATA_REQ(template RslChannelNr chan_nr, + template RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_REQ := { + msg_type := RSL_MT_UNIT_DATA_REQ + } + /* 8.3.11 BTS -> BSC */ template (value) RSL_Message ts_RSL_UNITDATA_IND(template (value) RslChannelNr chan_nr, @@ -1001,6 +1027,14 @@ modifies ts_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND } + template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, + template (value) RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_IND := { + msg_type := RSL_MT_UNIT_DATA_IND + } + + /* DEDICATED CANNEL MANAGEMENT MESSAGES */ -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Tue May 8 22:00:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 22:00:47 +0000 Subject: [PATCH] osmo-gsm-tester[master]: suites: Remove rebase artifacts from latest commits Message-ID: Review at https://gerrit.osmocom.org/8082 suites: Remove rebase artifacts from latest commits Change-Id: I8afc446d4291810c63bfaeabb7167113667dd8d1 --- M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py M suites/voice/mo_mt_call_tchf.py M suites/voice/mo_mt_call_tchh.py 4 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/82/8082/1 diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index 1e7a5c0..f1771b9 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index 3ba8045..c7fe0c3 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py index 012ce52..a640a97 100755 --- a/suites/voice/mo_mt_call_tchf.py +++ b/suites/voice/mo_mt_call_tchf.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py index 6b820d9..e6f6b98 100755 --- a/suites/voice/mo_mt_call_tchh.py +++ b/suites/voice/mo_mt_call_tchh.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): -- To view, visit https://gerrit.osmocom.org/8082 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8afc446d4291810c63bfaeabb7167113667dd8d1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Tue May 8 22:01:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 22:01:49 +0000 Subject: osmo-gsm-tester[master]: suites: Remove rebase artifacts from latest commits In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 Verified+1 -- To view, visit https://gerrit.osmocom.org/8082 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8afc446d4291810c63bfaeabb7167113667dd8d1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Tue May 8 22:01:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 8 May 2018 22:01:53 +0000 Subject: [MERGED] osmo-gsm-tester[master]: suites: Remove rebase artifacts from latest commits In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: suites: Remove rebase artifacts from latest commits ...................................................................... suites: Remove rebase artifacts from latest commits Change-Id: I8afc446d4291810c63bfaeabb7167113667dd8d1 --- M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py M suites/voice/mo_mt_call_tchf.py M suites/voice/mo_mt_call_tchh.py 4 files changed, 0 insertions(+), 4 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index 1e7a5c0..f1771b9 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index 3ba8045..c7fe0c3 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py index 012ce52..a640a97 100755 --- a/suites/voice/mo_mt_call_tchf.py +++ b/suites/voice/mo_mt_call_tchf.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py index 6b820d9..e6f6b98 100755 --- a/suites/voice/mo_mt_call_tchh.py +++ b/suites/voice/mo_mt_call_tchh.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * -add_subdir_to_import_path("lib") from testlib import call_test_setup_run def my_bts_setup(bts): -- To view, visit https://gerrit.osmocom.org/8082 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8afc446d4291810c63bfaeabb7167113667dd8d1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol From admin at opensuse.org Tue May 8 22:13:18 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 08 May 2018 22:13:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af22107c5673_5e843fa6883980ac@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 261s] [ 239.704042] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 262s] [ 240.324606] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 240.964006] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 241.594974] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 242.234659] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 242.241192] dracut-initqueue[469]: Warning: Could not boot. [ 264s] Starting Setup Virtual Console... [ 264s] [ OK ] Started Setup Virtual Console. [ 264s] Starting Dracut Emergency Shell... [ 264s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 264s] [ 264s] Generating "/run/initramfs/rdsosreport.txt" [ 264s] [ 264s] [ 264s] Entering emergency mode. Exit the shell to continue. [ 264s] Type "journalctl" to view system logs. [ 264s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 264s] after mounting them and attach it to a bug report. [ 264s] [ 264s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_9/root: 12541 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 15199 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (12534) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue May 8 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 8 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#28?= In-Reply-To: <1490254478.428.1525732880567.JavaMail.jenkins@jenkins.osmocom.org> References: <1490254478.428.1525732880567.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2070612033.450.1525819280650.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15909/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-15909/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-15909/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-15909/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-15909/ libtool: install: (cd /tmp/am-dc-15909/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-15909/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-15909/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-15909/ libtool: install: chmod 644 /tmp/am-dc-15909/ libtool: install: ranlib /tmp/am-dc-15909/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-15909/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-15909/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-15909/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15909/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-15909/ /bin/mkdir -p '/tmp/am-dc-15909/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-15909/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-15909/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-15909/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-15909/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-15909/ libtool: uninstall: rm -f /tmp/am-dc-15909/ /tmp/am-dc-15909/ /tmp/am-dc-15909/ /tmp/am-dc-15909/ /tmp/am-dc-15909/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-15909/ && rm -f html.tar ) ( cd '/tmp/am-dc-15909/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-15909/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Wed May 9 06:50:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 06:50:46 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 06:51:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 06:51:01 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 06:52:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 06:52:18 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/8081/1/bts/BTS_Tests.default File bts/BTS_Tests.default: Line 2: //"BTS-Test-RSL-IPA".FileMask := ERROR | WARNING; not acceptable https://gerrit.osmocom.org/#/c/8081/1/library/RSL_Emulation.ttcn File library/RSL_Emulation.ttcn: Line 424: //setverdict(fail, "RSL for unknown Dchan"); not acceptable -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 9 08:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 9 May 2018 08:58:52 +0000 Subject: [PATCH] osmo-trx[master]: trx_vty.c: fix: use CONFIG_NODE as parent by default Message-ID: Review at https://gerrit.osmocom.org/8083 trx_vty.c: fix: use CONFIG_NODE as parent by default There are some configuration nodes, which are handled by extenral libraries, such as libosmoctrl. So, when switching back to the parent node, this should be kept in mind. Instead of aborting, let's got to the CONFIG_NODE by default. Fixes: OS#3250 Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b --- M CommonLibs/trx_vty.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/83/8083/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 843d19f..e69df77 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -503,7 +503,9 @@ vty->index_sub = NULL; break; default: - OSMO_ASSERT(0); + vty->node = CONFIG_NODE; + vty->index = NULL; + vty->index_sub = NULL; } return vty->node; -- To view, visit https://gerrit.osmocom.org/8083 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Wed May 9 09:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:01:41 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8081 to look at the new patch set (#2). bts: Add RLL tests This adds a series of test cases to BTS_Tests.ttcn implementing testing of the RLL sub-layr of RSL, i.e. the translation between LAPDm frames on the Um interface and the RLL frames on the Abis side (and vice vrsa). Related: OS#3174 Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 --- M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_Types.ttcn M library/RSL_Types.ttcn 4 files changed, 605 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/8081/2 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f820cf4..5e93ba3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -105,6 +105,7 @@ /* all logical channels available on the BTS */ var ChannelNrs g_AllChannels; + var ChannelNrs g_AllChanTypes; } /* an individual call / channel */ @@ -141,7 +142,13 @@ RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, float t_guard, - ConnL1Pars l1_pars + ConnL1Pars l1_pars, + TestSpecUnion spec optional +} + +/* Test-specific parameters */ +type union TestSpecUnion { + RllTestCase rll } template (value) RachControlParameters ts_RachCtrl_default := { @@ -289,6 +296,16 @@ valueof(ts_RslChanNr_SDCCH8(6,2)), valueof(ts_RslChanNr_SDCCH8(6,3)), valueof(ts_RslChanNr_SDCCH8(6,4)), valueof(ts_RslChanNr_SDCCH8(6,5)), valueof(ts_RslChanNr_SDCCH8(6,6)), valueof(ts_RslChanNr_SDCCH8(6,7)) + }; + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + //valueof(ts_RslChanNr_Bm(1)), + /* TS 5: TCH/H */ + //valueof(ts_RslChanNr_Lm(5,1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) }; f_init_rsl(id); @@ -480,7 +497,8 @@ bs_power_level := 0, ms_power_level := 0, ms_actual_ta := 0 - } + }, + spec := omit } /*********************************************************************** @@ -1313,6 +1331,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); } + testcase TC_meas_res_sign_tchf() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; @@ -1372,7 +1391,7 @@ } -/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND */ +/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND (TS 48.058 4.10) */ private function f_TC_conn_fail_crit(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2993,6 +3012,421 @@ } +/*********************************************************************** + * LAPDm / RLL related + ***********************************************************************/ + +private function f_tx_lapdm(template (value) LapdmFrame l, + template (value) RslLinkId link_id) runs on ConnHdlr { + var octetstring l2 := enc_LapdmFrame(valueof(l)); + if (valueof(link_id.c) == SACCH) { + /* prepend dummy L1 header */ + l2 := '0000'O & l2; + } + log("encoding ", l, " to ", l2); + L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); +} + +type record RllTestCase { + uint3_t sapi, + RslLinkId link_id, + octetstring l3, + boolean exp +} +type record of RllTestCase RllTestCases; +template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, octetstring l3, boolean exp) := { + sapi := sapi, + link_id := id, + l3 := l3, + exp := exp +} + +/* execute the same callback function with a set of different parameters (tcs) on a + * variety of logical channels */ +private function f_rll_testmatrix(RllTestCases tcs, void_fn fn) runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(testcasename()); + + /* test on each of the channels we have */ + for (var integer i := 0; i < sizeof(g_AllChanTypes); i := i+1) { + pars := valueof(t_Pars(g_AllChanTypes[i], ts_RSL_ChanMode_SIGN)); + + /* test each of the test cases on the current channel */ + for (var integer j := 0; j < sizeof(tcs); j := j+1) { + pars.spec.rll := tcs[j]; + log(testcasename(), ": XXX Starting ", tcs[j] , " on ", g_AllChanTypes[i]); + vc_conn := f_start_handler(fn, pars); + vc_conn.done; + } + } + + f_shutdown(); +} + +/* test if SABM on Um triggers EST IND (TS 48.058 3.1) */ +private function f_TC_rll_est_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id); + T.start; + alt { + [tc.l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, tc.link_id, tc.l3)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND with L3 in ", tc); + } + } + [tc.l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, tc.link_id)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND without L3 in ", tc); + } + } + [tc.exp] T.timeout { + setverdict(fail, "Timeout waiting for EST IND"); + } + [not tc.exp] T.timeout { + setverdict(pass); + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_ind() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI0 establishment */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + /* SAPI 0 requires contention resolution */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, false)), + /* SAPI 3 doesn't support contention resolution */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)), + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_ind)); +} + +/* test if RLL EST REQ trigeres SABM on Um; UA on Um triggers EST CONF (TS 48.058 3.2) */ +private function f_TC_rll_est_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + var L1ctlDlMessage dl; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* Send a RSL EST REQ for SAPI3 on main DCCH */ + RSL.send(ts_RSL_EST_REQ(g_chan_nr, tc.link_id)); + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + lapdm.ab := dec_LapdmFrameAB(l2); + if (match(lapdm, tr_LAPDm_SABM(tc.sapi, cr_MT_CMD, true, ''O))) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for SABM"); + self.stop; + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_req_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true))//, + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} +testcase TC_rll_est_req_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + } + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} + +/* altstep to receive a LAPDm frame matching the given template */ +private altstep as_l1_exp_lapdm(template LapdmFrame exp) runs on ConnHdlr { + var L1ctlDlMessage dl; + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + if (ischosen(exp.ab)) { + lapdm.ab := dec_LapdmFrameAB(l2); + } else if (ischosen(exp.b4)) { + lapdm.b4 := dec_LapdmFrameB4(l2); + } else if (ischosen(exp.bbis)) { + lapdm.bbis := dec_LapdmFrameBbis(l2); + } + log("Rx LAPDm ", lapdm); + if (match(lapdm, exp)) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } +} +private function f_l1_exp_lapdm(template LapdmFrame exp, float t := 3.0) runs on ConnHdlr { + timer T := t; + T.start; + alt { + [] T.timeout { + setverdict(fail, "Timeout waiting for LAPDm ", exp); + self.stop; + } + [] as_l1_exp_lapdm(exp); + } +} + +/* establish one Radio Link Layer via SABM -> UA. Use l3 for contention resolution */ +private function f_est_rll_mo(uint3_t sapi, RslLinkId link_id, octetstring l3) runs on ConnHdlr { + /* send SABM from MS -> BTS */ + f_tx_lapdm(ts_LAPDm_SABM(sapi, cr_MO_CMD, true, l3), link_id); + /* expect RLL EST IND on Abis */ + alt { + [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); + [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); + [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, ?)) { + setverdict(fail, "Failing due to RSL_ERROR_IND"); + self.stop; + } + [] RSL.receive { repeat; } + } + /* expect UA from BTS -> MS */ + f_l1_exp_lapdm(tr_LAPDm_UA(sapi, cr_MT_RSP, true, l3)); +} + +/* test if DISC on Um triggers RLL REL IND (TS 48.058 3.3) */ +private function f_TC_rll_rel_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the DISC */ + f_tx_lapdm(ts_LAPDm_DISC(tc.sapi, cr_MO_CMD, true), tc.link_id); + /* ... and expect the REL IND on the RSL side */ + alt { + [] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) { + setverdict(pass); + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_ind_DCCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +testcase TC_rll_rel_ind_ACCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +/* test if RLL REL REQ triggers DISC on Um; UA/DM triggers RLL REL CONF (TS 48.058 3.4) */ +private function f_TC_rll_rel_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the REL REQ via RSL */ + RSL.send(ts_RSL_REL_REQ(g_chan_nr, tc.link_id, RSL_REL_MODE_NORMAL)); + /* ... and expect the DISC on the Um side */ + alt { + [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MO_CMD, true)) { + /* FIXME: send a UA in resposne to the DISC */ + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_req() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req)); +} + +/* test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ +testcase TC_rll_data_req() runs on test_CT { +} + +/* test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ +testcase TC_rll_data_ind() runs on test_CT { +} + +/* test if RLL UNIT DATA REQ triggers UI-frame on Um (TS 48.058 3.7) */ +private function f_TC_rll_ud_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send UNITDATA REQ on RSL side */ + RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, tc.link_id, tc.l3)); + /* Expect it to arrive on the other side */ + if (tc.link_id.c == SACCH) { + f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } else { + f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_req_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} +testcase TC_rll_unit_data_req_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(19); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} + +/* test if UI-frames on Um trigger RLL UNIT DATA IND (TS 48.058 3.8) */ +private function f_TC_rll_ud_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send LAPDm UI frame. There is no B4 format in uplink! */ + f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, false, tc.l3), tc.link_id); + /* Expdct RLL UNITDATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tc.link_id, tc.l3)) { + setverdict(pass); + } + [] RSL.receive { repeat; } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_ind_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} +testcase TC_rll_unit_data_ind_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(18); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} + + +/* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ +/* protocol error as per 44.006 */ +/* link layer failure (repetition of I-frame N200 times without ACK */ +/* repetition of SABM or DISC N200 times without ACK */ +/* receptiom of SABM in multi-frame established state */ + + + + /* TODO Areas: @@ -3095,6 +3529,19 @@ execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); execute( TC_dyn_ipa_pdch_act_tchf_act_nack() ); + + execute( TC_rll_est_ind() ); + execute( TC_rll_est_req_DCCH_3() ); + execute( TC_rll_est_req_ACCH_3() ); + execute( TC_rll_rel_ind_DCCH_0() ); + execute( TC_rll_rel_ind_DCCH_3() ); + execute( TC_rll_rel_ind_ACCH_0() ); + execute( TC_rll_rel_ind_ACCH_3() ); + execute( TC_rll_rel_req() ); + execute( TC_rll_unit_data_req_DCCH() ); + execute( TC_rll_unit_data_req_ACCH() ); + execute( TC_rll_unit_data_ind_DCCH() ); + execute( TC_rll_unit_data_ind_ACCH() ); } diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 77b2494..f8bc670 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -97,7 +97,7 @@ alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl { rr := dec_GsmRrMessage(dl.payload.data_ind.payload); - log("PCH/AGCN DL RR: ", rr); + log("PCH/AGCH DL RR: ", rr); if (match(rr, t_RR_IMM_ASS(ra, rach_fn))) { log("Received IMM.ASS for our RACH!"); } else { diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 91f55fa..487748d 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -10,6 +10,12 @@ type BIT3 LapdmUBits; type BIT2 LapdmU2Bits; + /* 44.006 6.3.2 */ + const boolean cr_MO_CMD := false; + const boolean cr_MO_RSP := true; + const boolean cr_MT_CMD := true; + const boolean cr_MT_RSP := false; + /* TS 44.006 Figure 4 */ type record LapdmAddressField { BIT1 spare, @@ -193,4 +199,113 @@ /* automatic decoding to the generic LapdmFrame will not work, you have to call one of the * type-specific decoder routines above */ + /* SABM frame with L3 payload */ + template (value) LapdmFrame ts_LAPDm_SABM(LapdmSapi sapi, boolean c_r, boolean p, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlSABM(p), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_SABM(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlSABM(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template (value) LapdmFrame ts_LAPDm_UA(LapdmSapi sapi, boolean c_r, boolean f, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUA(f), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UA(template LapdmSapi sapi, template boolean c_r, + template boolean f, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUA(f), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_DISC(LapdmSapi sapi, boolean c_r, boolean p) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlDISC(p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + template LapdmFrame tr_LAPDm_DISC(template LapdmSapi sapi, template boolean c_r, + template boolean p) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlDISC(p), + len := ?, + m := false, + el := 1, + payload := ''O + } + } + + template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + len := 0, + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + b4 := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + payload := l3 + } + } + template LapdmFrame tr_LAPDm_B4_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + b4 := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + payload := l3 + } + } + + + } with { encode "RAW"; /*variant "FIELDORDER(msb)" */} diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 246ea3f..2d9c92e 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -625,13 +625,19 @@ RSL_IPA_Codec codec } + /* 9.3.20 */ + type enumerated RSL_IE_ReleaseMode { + RSL_REL_MODE_NORMAL ('00'B), + REL_REL_MODE_LOCAL ('01'B) + } + /* union of all IE bodies */ type union RSL_IE_Body { RslChannelNr chan_nr, RslLinkId link_id, RSL_L16V l3_info, RSL_LV rlm_cause, - uint8_t release_mode, + RSL_IE_ReleaseMode release_mode, RSL_IE_ActivationType act_type, RSL_IE_ChannelMode chan_mode, uint8_t handover_ref, @@ -926,25 +932,38 @@ tr_RSL_IE(RSL_IE_Body:{l3_info := tr_RSL_L16V(l3_info)}) } } + template RSL_Message tr_RSL_EST_IND_NOL3(template RslChannelNr chan_nr, template RslLinkId link_id) := +{ + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), + msg_type := RSL_MT_EST_IND, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{link_id := link_id}) + } + } + /* 8.3.7 BSC -> BTS */ template (value) RSL_Message ts_RSL_REL_REQ(template (value) RslChannelNr chan_nr, - template (value) RslLinkId link_id) := { + template (value) RslLinkId link_id, + template (value) RSL_IE_ReleaseMode rel_mode := RSL_REL_MODE_NORMAL) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}) + t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}), + t_RSL_IE(RSL_IE_RELEASE_MODE, RSL_IE_Body:{release_mode := rel_mode}) } } template RSL_Message tr_RSL_REL_REQ(template RslChannelNr chan_nr, - template RslLinkId link_id) := { + template RslLinkId link_id, + template RSL_IE_ReleaseMode rel_mode := ?) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), tr_RSL_IE(RSL_IE_Body:{link_id := link_id}), - * + tr_RSL_IE(RSL_IE_Body:{release_mode := rel_mode}) } } @@ -993,6 +1012,13 @@ modifies ts_RSL_DATA_REQ := { msg_type := RSL_MT_UNIT_DATA_REQ } + template RSL_Message tr_RSL_UNITDATA_REQ(template RslChannelNr chan_nr, + template RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_REQ := { + msg_type := RSL_MT_UNIT_DATA_REQ + } + /* 8.3.11 BTS -> BSC */ template (value) RSL_Message ts_RSL_UNITDATA_IND(template (value) RslChannelNr chan_nr, @@ -1001,6 +1027,14 @@ modifies ts_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND } + template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, + template (value) RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_IND := { + msg_type := RSL_MT_UNIT_DATA_IND + } + + /* DEDICATED CANNEL MANAGEMENT MESSAGES */ -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 09:02:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:02:28 +0000 Subject: osmo-trx[master]: trx_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8083 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 09:03:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:03:04 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 09:28:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 9 May 2018 09:28:39 +0000 Subject: [PATCH] osmo-gsm-tester[master]: Unload suite local modules after suite exit to avoid collisions Message-ID: Review at https://gerrit.osmocom.org/8084 Unload suite local modules after suite exit to avoid collisions Since sys.path is modified idynamically to load modules from "lib" subdir of each suite, from python env point of view all those modules share a namespace. As a result, there can be name collisions. If a name collision appears (eg test1 loads "testlib.py" and test2 afterwards also loads its own "testlib.py"), then python interpreter thinks the testlib.py module is already loaded, so test2 ends up using "testlib.py" from test1. The way to solve this is to make suite local modules to live only through the scope of the suite, and unload the modules once the suite is finished. Change-Id: I4efe815f85bc4ec2ca91aa9c2d3a369048f21571 --- M src/osmo_gsm_tester/suite.py M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py M suites/voice/mo_mt_call_tchf.py M suites/voice/mo_mt_call_tchh.py 5 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/84/8084/1 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 44aabbd..76cd248 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -70,6 +70,7 @@ resources_pool = None reserved_resources = None objects_to_clean_up = None + test_import_modules_to_clean_up = [] _resource_requirements = None _config = None _processes = None @@ -99,6 +100,27 @@ obj = self.objects_to_clean_up.pop() try: obj.cleanup() + except Exception: + log.log_exn() + + def test_import_modules_register_for_cleanup(self, mod): + ''' + Tests are required to call this API for any module loaded from its own + lib subdir, because they are loaded in the global namespace. Otherwise + later tests importing modules with the same name will re-use an already + loaded module. + ''' + if mod not in self.test_import_modules_to_clean_up: + self.dbg('registering module %r for cleanup' % mod) + self.test_import_modules_to_clean_up.append(mod) + + def test_import_modules_cleanup(self): + while self.test_import_modules_to_clean_up: + mod = self.test_import_modules_to_clean_up.pop() + try: + self.dbg('Cleaning up module %r' % mod) + del sys.modules[mod.__name__] + del mod except Exception: log.log_exn() @@ -179,6 +201,7 @@ self.objects_cleanup() self.free_resources() MainLoop.unregister_poll_func(self.poll) + self.test_import_modules_cleanup() util.import_path_remove(suite_libdir) self.duration = time.time() - self.start_timestamp diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index f1771b9..82e357c 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index c7fe0c3..1424da8 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py index a640a97..af55dfd 100755 --- a/suites/voice/mo_mt_call_tchf.py +++ b/suites/voice/mo_mt_call_tchf.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py index e6f6b98..43d0760 100755 --- a/suites/voice/mo_mt_call_tchh.py +++ b/suites/voice/mo_mt_call_tchh.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): -- To view, visit https://gerrit.osmocom.org/8084 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4efe815f85bc4ec2ca91aa9c2d3a369048f21571 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 9 09:41:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:41:38 +0000 Subject: [PATCH] osmo-bts[master]: WIP: FIX REL_IND merge mismatch In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6966 to look at the new patch set (#4). WIP: FIX REL_IND merge mismatch During the merge of Change-Id: Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 the patch hunk was applied at a slightly wrong location. Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 --- M src/common/rsl.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/6966/4 diff --git a/src/common/rsl.c b/src/common/rsl.c index 9adb89a..fff2272 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2503,6 +2503,13 @@ LOGP(DRSL, LOGL_INFO, "%s Handing RLL msg %s from LAPDm to MEAS REP\n", gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); + rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le); + msgb_free(msg); + return rc; + } else { + LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n", + gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); + /* REL_IND handling */ if (rh->msg_type == RSL_MT_REL_IND && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { @@ -2518,13 +2525,6 @@ lchan->pending_rel_ind_msg = msg; return 0; } - - rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le); - msgb_free(msg); - return rc; - } else { - LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n", - gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); return abis_bts_rsl_sendmsg(msg); } -- To view, visit https://gerrit.osmocom.org/6966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 09:42:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:42:03 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 09:42:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:42:24 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts: Add RLL tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts: Add RLL tests ...................................................................... bts: Add RLL tests This adds a series of test cases to BTS_Tests.ttcn implementing testing of the RLL sub-layr of RSL, i.e. the translation between LAPDm frames on the Um interface and the RLL frames on the Abis side (and vice vrsa). Related: OS#3174 Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 --- M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_Types.ttcn M library/RSL_Types.ttcn 4 files changed, 605 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f820cf4..5e93ba3 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -105,6 +105,7 @@ /* all logical channels available on the BTS */ var ChannelNrs g_AllChannels; + var ChannelNrs g_AllChanTypes; } /* an individual call / channel */ @@ -141,7 +142,13 @@ RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, float t_guard, - ConnL1Pars l1_pars + ConnL1Pars l1_pars, + TestSpecUnion spec optional +} + +/* Test-specific parameters */ +type union TestSpecUnion { + RllTestCase rll } template (value) RachControlParameters ts_RachCtrl_default := { @@ -289,6 +296,16 @@ valueof(ts_RslChanNr_SDCCH8(6,2)), valueof(ts_RslChanNr_SDCCH8(6,3)), valueof(ts_RslChanNr_SDCCH8(6,4)), valueof(ts_RslChanNr_SDCCH8(6,5)), valueof(ts_RslChanNr_SDCCH8(6,6)), valueof(ts_RslChanNr_SDCCH8(6,7)) + }; + g_AllChanTypes := { + /* TS 1..4: TCH/F */ + //valueof(ts_RslChanNr_Bm(1)), + /* TS 5: TCH/H */ + //valueof(ts_RslChanNr_Lm(5,1)), + /* TS 0: SDCCH/4 */ + valueof(ts_RslChanNr_SDCCH4(0,2)), + /* TS 6: SDCCH/8 */ + valueof(ts_RslChanNr_SDCCH8(6,4)) }; f_init_rsl(id); @@ -480,7 +497,8 @@ bs_power_level := 0, ms_power_level := 0, ms_actual_ta := 0 - } + }, + spec := omit } /*********************************************************************** @@ -1313,6 +1331,7 @@ f_rsl_chan_deact(); f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); } + testcase TC_meas_res_sign_tchf() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; @@ -1372,7 +1391,7 @@ } -/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND */ +/* Test if a channel without valid uplink bursts generates RSL CONN FAIL IND (TS 48.058 4.10) */ private function f_TC_conn_fail_crit(charstring id) runs on ConnHdlr { f_l1_tune(L1CTL); RSL.clear; @@ -2993,6 +3012,421 @@ } +/*********************************************************************** + * LAPDm / RLL related + ***********************************************************************/ + +private function f_tx_lapdm(template (value) LapdmFrame l, + template (value) RslLinkId link_id) runs on ConnHdlr { + var octetstring l2 := enc_LapdmFrame(valueof(l)); + if (valueof(link_id.c) == SACCH) { + /* prepend dummy L1 header */ + l2 := '0000'O & l2; + } + log("encoding ", l, " to ", l2); + L1CTL.send(ts_L1CTL_DATA_REQ(g_chan_nr, link_id, l2)); +} + +type record RllTestCase { + uint3_t sapi, + RslLinkId link_id, + octetstring l3, + boolean exp +} +type record of RllTestCase RllTestCases; +template RllTestCase t_EITC(uint3_t sapi, RslLinkId id, octetstring l3, boolean exp) := { + sapi := sapi, + link_id := id, + l3 := l3, + exp := exp +} + +/* execute the same callback function with a set of different parameters (tcs) on a + * variety of logical channels */ +private function f_rll_testmatrix(RllTestCases tcs, void_fn fn) runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(testcasename()); + + /* test on each of the channels we have */ + for (var integer i := 0; i < sizeof(g_AllChanTypes); i := i+1) { + pars := valueof(t_Pars(g_AllChanTypes[i], ts_RSL_ChanMode_SIGN)); + + /* test each of the test cases on the current channel */ + for (var integer j := 0; j < sizeof(tcs); j := j+1) { + pars.spec.rll := tcs[j]; + log(testcasename(), ": XXX Starting ", tcs[j] , " on ", g_AllChanTypes[i]); + vc_conn := f_start_handler(fn, pars); + vc_conn.done; + } + } + + f_shutdown(); +} + +/* test if SABM on Um triggers EST IND (TS 48.058 3.1) */ +private function f_TC_rll_est_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + f_tx_lapdm(ts_LAPDm_SABM(tc.sapi, cr_MO_CMD, true, tc.l3), tc.link_id); + T.start; + alt { + [tc.l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, tc.link_id, tc.l3)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND with L3 in ", tc); + } + } + [tc.l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, tc.link_id)) { + if (tc.exp) { + setverdict(pass); + } else { + setverdict(fail, "Unexpected EST IND without L3 in ", tc); + } + } + [tc.exp] T.timeout { + setverdict(fail, "Timeout waiting for EST IND"); + } + [not tc.exp] T.timeout { + setverdict(pass); + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_ind() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI0 establishment */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + /* SAPI 0 requires contention resolution */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, false)), + /* SAPI 3 doesn't support contention resolution */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)), + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_ind)); +} + +/* test if RLL EST REQ trigeres SABM on Um; UA on Um triggers EST CONF (TS 48.058 3.2) */ +private function f_TC_rll_est_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + var L1ctlDlMessage dl; + timer T := 3.0; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* Send a RSL EST REQ for SAPI3 on main DCCH */ + RSL.send(ts_RSL_EST_REQ(g_chan_nr, tc.link_id)); + T.start; + alt { + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + lapdm.ab := dec_LapdmFrameAB(l2); + if (match(lapdm, tr_LAPDm_SABM(tc.sapi, cr_MT_CMD, true, ''O))) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for SABM"); + self.stop; + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_est_req_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on main DCCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true))//, + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} +testcase TC_rll_est_req_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + /* normal SAPI3 establishment on SACCH */ + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + } + f_rll_testmatrix(tcs, refers(f_TC_rll_est_req)); +} + +/* altstep to receive a LAPDm frame matching the given template */ +private altstep as_l1_exp_lapdm(template LapdmFrame exp) runs on ConnHdlr { + var L1ctlDlMessage dl; + [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, ?)) -> value dl { + var LapdmFrame lapdm; + var octetstring l2 := dl.payload.data_ind.payload; + if (dl.dl_info.link_id.c == SACCH) { + /* remove L1 header */ + l2 := substr(l2, 2, lengthof(l2)-2); + } + if (ischosen(exp.ab)) { + lapdm.ab := dec_LapdmFrameAB(l2); + } else if (ischosen(exp.b4)) { + lapdm.b4 := dec_LapdmFrameB4(l2); + } else if (ischosen(exp.bbis)) { + lapdm.bbis := dec_LapdmFrameBbis(l2); + } + log("Rx LAPDm ", lapdm); + if (match(lapdm, exp)) { + setverdict(pass); + } else { + repeat; + } + } + [] L1CTL.receive { repeat; } +} +private function f_l1_exp_lapdm(template LapdmFrame exp, float t := 3.0) runs on ConnHdlr { + timer T := t; + T.start; + alt { + [] T.timeout { + setverdict(fail, "Timeout waiting for LAPDm ", exp); + self.stop; + } + [] as_l1_exp_lapdm(exp); + } +} + +/* establish one Radio Link Layer via SABM -> UA. Use l3 for contention resolution */ +private function f_est_rll_mo(uint3_t sapi, RslLinkId link_id, octetstring l3) runs on ConnHdlr { + /* send SABM from MS -> BTS */ + f_tx_lapdm(ts_LAPDm_SABM(sapi, cr_MO_CMD, true, l3), link_id); + /* expect RLL EST IND on Abis */ + alt { + [l3 != ''O] RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3)); + [l3 == ''O] RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id)); + [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, ?)) { + setverdict(fail, "Failing due to RSL_ERROR_IND"); + self.stop; + } + [] RSL.receive { repeat; } + } + /* expect UA from BTS -> MS */ + f_l1_exp_lapdm(tr_LAPDm_UA(sapi, cr_MT_RSP, true, l3)); +} + +/* test if DISC on Um triggers RLL REL IND (TS 48.058 3.3) */ +private function f_TC_rll_rel_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the DISC */ + f_tx_lapdm(ts_LAPDm_DISC(tc.sapi, cr_MO_CMD, true), tc.link_id); + /* ... and expect the REL IND on the RSL side */ + alt { + [] RSL.receive(tr_RSL_REL_IND(g_chan_nr, tc.link_id)) { + setverdict(pass); + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_ind_DCCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +testcase TC_rll_rel_ind_ACCH_0() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_DCCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} +testcase TC_rll_rel_ind_ACCH_3() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind)); +} + +/* test if RLL REL REQ triggers DISC on Um; UA/DM triggers RLL REL CONF (TS 48.058 3.4) */ +private function f_TC_rll_rel_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + f_l1_tune(L1CTL); + RSL.clear; + + /* activate the logical channel */ + f_est_dchan(); + L1CTL.clear; + + /* first establish the link-layer */ + f_est_rll_mo(tc.sapi, tc.link_id, tc.l3); + + /* then send the REL REQ via RSL */ + RSL.send(ts_RSL_REL_REQ(g_chan_nr, tc.link_id, RSL_REL_MODE_NORMAL)); + /* ... and expect the DISC on the Um side */ + alt { + [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MO_CMD, true)) { + /* FIXME: send a UA in resposne to the DISC */ + } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_rel_req() runs on test_CT { + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req)); +} + +/* test if RLL DATA REQ triggers I-frames on Um (TS 48.058 3.5) */ +testcase TC_rll_data_req() runs on test_CT { +} + +/* test if I-frames on Um trigger RLL DATA IND (TS 48.058 3.6) */ +testcase TC_rll_data_ind() runs on test_CT { +} + +/* test if RLL UNIT DATA REQ triggers UI-frame on Um (TS 48.058 3.7) */ +private function f_TC_rll_ud_req(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send UNITDATA REQ on RSL side */ + RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, tc.link_id, tc.l3)); + /* Expect it to arrive on the other side */ + if (tc.link_id.c == SACCH) { + f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } else { + f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_req_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} +testcase TC_rll_unit_data_req_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(19); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req)); +} + +/* test if UI-frames on Um trigger RLL UNIT DATA IND (TS 48.058 3.8) */ +private function f_TC_rll_ud_ind(charstring id) runs on ConnHdlr { + var RllTestCase tc := g_pars.spec.rll; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Send LAPDm UI frame. There is no B4 format in uplink! */ + f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, false, tc.l3), tc.link_id); + /* Expdct RLL UNITDATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tc.link_id, tc.l3)) { + setverdict(pass); + } + [] RSL.receive { repeat; } + } + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_rll_unit_data_ind_DCCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(15); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} +testcase TC_rll_unit_data_ind_ACCH() runs on test_CT { + var octetstring l3 := f_rnd_octstring(18); + var RllTestCases tcs := { + valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)), + valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true)) + }; + f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); +} + + +/* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ +/* protocol error as per 44.006 */ +/* link layer failure (repetition of I-frame N200 times without ACK */ +/* repetition of SABM or DISC N200 times without ACK */ +/* receptiom of SABM in multi-frame established state */ + + + + /* TODO Areas: @@ -3095,6 +3529,19 @@ execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); execute( TC_dyn_ipa_pdch_act_tchf_act_nack() ); + + execute( TC_rll_est_ind() ); + execute( TC_rll_est_req_DCCH_3() ); + execute( TC_rll_est_req_ACCH_3() ); + execute( TC_rll_rel_ind_DCCH_0() ); + execute( TC_rll_rel_ind_DCCH_3() ); + execute( TC_rll_rel_ind_ACCH_0() ); + execute( TC_rll_rel_ind_ACCH_3() ); + execute( TC_rll_rel_req() ); + execute( TC_rll_unit_data_req_DCCH() ); + execute( TC_rll_unit_data_req_ACCH() ); + execute( TC_rll_unit_data_ind_DCCH() ); + execute( TC_rll_unit_data_ind_ACCH() ); } diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 77b2494..f8bc670 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -97,7 +97,7 @@ alt { [] pt.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0))) -> value dl { rr := dec_GsmRrMessage(dl.payload.data_ind.payload); - log("PCH/AGCN DL RR: ", rr); + log("PCH/AGCH DL RR: ", rr); if (match(rr, t_RR_IMM_ASS(ra, rach_fn))) { log("Received IMM.ASS for our RACH!"); } else { diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 91f55fa..487748d 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -10,6 +10,12 @@ type BIT3 LapdmUBits; type BIT2 LapdmU2Bits; + /* 44.006 6.3.2 */ + const boolean cr_MO_CMD := false; + const boolean cr_MO_RSP := true; + const boolean cr_MT_CMD := true; + const boolean cr_MT_RSP := false; + /* TS 44.006 Figure 4 */ type record LapdmAddressField { BIT1 spare, @@ -193,4 +199,113 @@ /* automatic decoding to the generic LapdmFrame will not work, you have to call one of the * type-specific decoder routines above */ + /* SABM frame with L3 payload */ + template (value) LapdmFrame ts_LAPDm_SABM(LapdmSapi sapi, boolean c_r, boolean p, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlSABM(p), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_SABM(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlSABM(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template (value) LapdmFrame ts_LAPDm_UA(LapdmSapi sapi, boolean c_r, boolean f, + octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUA(f), + len := 0, /* overwritten in encoder */ + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UA(template LapdmSapi sapi, template boolean c_r, + template boolean f, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUA(f), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_DISC(LapdmSapi sapi, boolean c_r, boolean p) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlDISC(p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + template LapdmFrame tr_LAPDm_DISC(template LapdmSapi sapi, template boolean c_r, + template boolean p) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlDISC(p), + len := ?, + m := false, + el := 1, + payload := ''O + } + } + + template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + len := 0, + m := false, + el := 1, + payload := l3 + } + } + template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + b4 := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlUI(p), + payload := l3 + } + } + template LapdmFrame tr_LAPDm_B4_UI(template LapdmSapi sapi, template boolean c_r, + template boolean p, template octetstring l3) := { + b4 := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlUI(p), + payload := l3 + } + } + + + } with { encode "RAW"; /*variant "FIELDORDER(msb)" */} diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 246ea3f..2d9c92e 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -625,13 +625,19 @@ RSL_IPA_Codec codec } + /* 9.3.20 */ + type enumerated RSL_IE_ReleaseMode { + RSL_REL_MODE_NORMAL ('00'B), + REL_REL_MODE_LOCAL ('01'B) + } + /* union of all IE bodies */ type union RSL_IE_Body { RslChannelNr chan_nr, RslLinkId link_id, RSL_L16V l3_info, RSL_LV rlm_cause, - uint8_t release_mode, + RSL_IE_ReleaseMode release_mode, RSL_IE_ActivationType act_type, RSL_IE_ChannelMode chan_mode, uint8_t handover_ref, @@ -926,25 +932,38 @@ tr_RSL_IE(RSL_IE_Body:{l3_info := tr_RSL_L16V(l3_info)}) } } + template RSL_Message tr_RSL_EST_IND_NOL3(template RslChannelNr chan_nr, template RslLinkId link_id) := +{ + msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), + msg_type := RSL_MT_EST_IND, + ies := { + tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), + tr_RSL_IE(RSL_IE_Body:{link_id := link_id}) + } + } + /* 8.3.7 BSC -> BTS */ template (value) RSL_Message ts_RSL_REL_REQ(template (value) RslChannelNr chan_nr, - template (value) RslLinkId link_id) := { + template (value) RslLinkId link_id, + template (value) RSL_IE_ReleaseMode rel_mode := RSL_REL_MODE_NORMAL) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}), - t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}) + t_RSL_IE(RSL_IE_LINK_IDENT, RSL_IE_Body:{link_id := link_id}), + t_RSL_IE(RSL_IE_RELEASE_MODE, RSL_IE_Body:{release_mode := rel_mode}) } } template RSL_Message tr_RSL_REL_REQ(template RslChannelNr chan_nr, - template RslLinkId link_id) := { + template RslLinkId link_id, + template RSL_IE_ReleaseMode rel_mode := ?) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_RLL, false), msg_type := RSL_MT_REL_REQ, ies :={ tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}), tr_RSL_IE(RSL_IE_Body:{link_id := link_id}), - * + tr_RSL_IE(RSL_IE_Body:{release_mode := rel_mode}) } } @@ -993,6 +1012,13 @@ modifies ts_RSL_DATA_REQ := { msg_type := RSL_MT_UNIT_DATA_REQ } + template RSL_Message tr_RSL_UNITDATA_REQ(template RslChannelNr chan_nr, + template RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_REQ := { + msg_type := RSL_MT_UNIT_DATA_REQ + } + /* 8.3.11 BTS -> BSC */ template (value) RSL_Message ts_RSL_UNITDATA_IND(template (value) RslChannelNr chan_nr, @@ -1001,6 +1027,14 @@ modifies ts_RSL_DATA_IND := { msg_type := RSL_MT_UNIT_DATA_IND } + template RSL_Message tr_RSL_UNITDATA_IND(template RslChannelNr chan_nr, + template (value) RslLinkId link_id, + template octetstring l3_info) + modifies tr_RSL_DATA_IND := { + msg_type := RSL_MT_UNIT_DATA_IND + } + + /* DEDICATED CANNEL MANAGEMENT MESSAGES */ -- To view, visit https://gerrit.osmocom.org/8081 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I336378de6106e5369600cbb49e0c47cc59864630 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 09:43:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 09:43:03 +0000 Subject: [PATCH] osmo-bts[master]: FIX REL_IND merge mismatch In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6966 to look at the new patch set (#5). FIX REL_IND merge mismatch During the merge of Change-Id: Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 the patch hunk was applied at a slightly wrong location. Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 --- M src/common/rsl.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/6966/5 diff --git a/src/common/rsl.c b/src/common/rsl.c index 9adb89a..fff2272 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2503,6 +2503,13 @@ LOGP(DRSL, LOGL_INFO, "%s Handing RLL msg %s from LAPDm to MEAS REP\n", gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); + rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le); + msgb_free(msg); + return rc; + } else { + LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n", + gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); + /* REL_IND handling */ if (rh->msg_type == RSL_MT_REL_IND && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { @@ -2518,13 +2525,6 @@ lchan->pending_rel_ind_msg = msg; return 0; } - - rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), le); - msgb_free(msg); - return rc; - } else { - LOGP(DRSL, LOGL_INFO, "%s Fwd RLL msg %s from LAPDm to A-bis\n", - gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); return abis_bts_rsl_sendmsg(msg); } -- To view, visit https://gerrit.osmocom.org/6966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-PatchSet: 5 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 09:48:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 9 May 2018 09:48:29 +0000 Subject: osmo-gsm-tester[master]: Unload suite local modules after suite exit to avoid collisions In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8084 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4efe815f85bc4ec2ca91aa9c2d3a369048f21571 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 09:48:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 9 May 2018 09:48:31 +0000 Subject: [MERGED] osmo-gsm-tester[master]: Unload suite local modules after suite exit to avoid collisions In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. Change subject: Unload suite local modules after suite exit to avoid collisions ...................................................................... Unload suite local modules after suite exit to avoid collisions Since sys.path is modified idynamically to load modules from "lib" subdir of each suite, from python env point of view all those modules share a namespace. As a result, there can be name collisions. If a name collision appears (eg test1 loads "testlib.py" and test2 afterwards also loads its own "testlib.py"), then python interpreter thinks the testlib.py module is already loaded, so test2 ends up using "testlib.py" from test1. The way to solve this is to make suite local modules to live only through the scope of the suite, and unload the modules once the suite is finished. Change-Id: I4efe815f85bc4ec2ca91aa9c2d3a369048f21571 --- M src/osmo_gsm_tester/suite.py M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py M suites/voice/mo_mt_call_tchf.py M suites/voice/mo_mt_call_tchh.py 5 files changed, 31 insertions(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 44aabbd..76cd248 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -70,6 +70,7 @@ resources_pool = None reserved_resources = None objects_to_clean_up = None + test_import_modules_to_clean_up = [] _resource_requirements = None _config = None _processes = None @@ -99,6 +100,27 @@ obj = self.objects_to_clean_up.pop() try: obj.cleanup() + except Exception: + log.log_exn() + + def test_import_modules_register_for_cleanup(self, mod): + ''' + Tests are required to call this API for any module loaded from its own + lib subdir, because they are loaded in the global namespace. Otherwise + later tests importing modules with the same name will re-use an already + loaded module. + ''' + if mod not in self.test_import_modules_to_clean_up: + self.dbg('registering module %r for cleanup' % mod) + self.test_import_modules_to_clean_up.append(mod) + + def test_import_modules_cleanup(self): + while self.test_import_modules_to_clean_up: + mod = self.test_import_modules_to_clean_up.pop() + try: + self.dbg('Cleaning up module %r' % mod) + del sys.modules[mod.__name__] + del mod except Exception: log.log_exn() @@ -179,6 +201,7 @@ self.objects_cleanup() self.free_resources() MainLoop.unregister_poll_func(self.poll) + self.test_import_modules_cleanup() util.import_path_remove(suite_libdir) self.duration = time.time() - self.start_timestamp diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index f1771b9..82e357c 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index c7fe0c3..1424da8 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchf.py b/suites/voice/mo_mt_call_tchf.py index a640a97..af55dfd 100755 --- a/suites/voice/mo_mt_call_tchf.py +++ b/suites/voice/mo_mt_call_tchf.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): diff --git a/suites/voice/mo_mt_call_tchh.py b/suites/voice/mo_mt_call_tchh.py index e6f6b98..43d0760 100755 --- a/suites/voice/mo_mt_call_tchh.py +++ b/suites/voice/mo_mt_call_tchh.py @@ -1,6 +1,8 @@ #!/usr/bin/env python3 from osmo_gsm_tester.testenv import * +import testlib +suite.test_import_modules_register_for_cleanup(testlib) from testlib import call_test_setup_run def my_bts_setup(bts): -- To view, visit https://gerrit.osmocom.org/8084 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4efe815f85bc4ec2ca91aa9c2d3a369048f21571 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol From gerrit-no-reply at lists.osmocom.org Wed May 9 10:22:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 10:22:51 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: Add TODO notes about extensions of PDCH tests Message-ID: Review at https://gerrit.osmocom.org/8085 bsc: Add TODO notes about extensions of PDCH tests Change-Id: I3c0d338a9b8affe7f77c1b0b392999b5af668c71 --- M bsc/BSC_Tests.ttcn 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/8085/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0299026..057906f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2389,7 +2389,13 @@ setverdict(pass); } - +/* Dyn PDCH todo: + * activate OSMO as TCH/F + * activate OSMO as TCH/H + * does the BSC-located PCU socket get the updated INFO? + * what if no PCU is connected at the time? + * is the info correct on delayed PCU (re)connect? + */ control { /* CTRL interface testing */ -- To view, visit https://gerrit.osmocom.org/8085 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c0d338a9b8affe7f77c1b0b392999b5af668c71 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 12:25:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 9 May 2018 12:25:48 +0000 Subject: osmo-trx[master]: trx_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+1 as explained in OS#3250, the go_parent action here can be a lot simpler, but this change would fix it as well. Now we need a +2 from Tom. -- To view, visit https://gerrit.osmocom.org/8083 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 12:49:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:49:33 +0000 Subject: osmo-trx[master]: trx_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8083 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 12:49:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:49:39 +0000 Subject: [MERGED] osmo-trx[master]: trx_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: trx_vty.c: fix: use CONFIG_NODE as parent by default ...................................................................... trx_vty.c: fix: use CONFIG_NODE as parent by default There are some configuration nodes, which are handled by extenral libraries, such as libosmoctrl. So, when switching back to the parent node, this should be kept in mind. Instead of aborting, let's got to the CONFIG_NODE by default. Fixes: OS#3250 Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b --- M CommonLibs/trx_vty.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 843d19f..e69df77 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -503,7 +503,9 @@ vty->index_sub = NULL; break; default: - OSMO_ASSERT(0); + vty->node = CONFIG_NODE; + vty->index = NULL; + vty->index_sub = NULL; } return vty->node; -- To view, visit https://gerrit.osmocom.org/8083 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0600a46d19825806e5aed9257b6c57c3907808b Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels From gerrit-no-reply at lists.osmocom.org Wed May 9 12:49:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:49:47 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: Add TODO notes about extensions of PDCH tests In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8085 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3c0d338a9b8affe7f77c1b0b392999b5af668c71 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 12:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:49:53 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: Add TODO notes about extensions of PDCH tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: Add TODO notes about extensions of PDCH tests ...................................................................... bsc: Add TODO notes about extensions of PDCH tests Change-Id: I3c0d338a9b8affe7f77c1b0b392999b5af668c71 --- M bsc/BSC_Tests.ttcn 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0299026..057906f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2389,7 +2389,13 @@ setverdict(pass); } - +/* Dyn PDCH todo: + * activate OSMO as TCH/F + * activate OSMO as TCH/H + * does the BSC-located PCU socket get the updated INFO? + * what if no PCU is connected at the time? + * is the info correct on delayed PCU (re)connect? + */ control { /* CTRL interface testing */ -- To view, visit https://gerrit.osmocom.org/8085 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c0d338a9b8affe7f77c1b0b392999b5af668c71 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:09 +0000 Subject: [MERGED] osmo-bts[master]: add/improve various logging around dyn ts In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: add/improve various logging around dyn ts ...................................................................... add/improve various logging around dyn ts This logging turned up while I was debugging dynamic timeslots: - OML Set Channel Attributes logging. - a specific dyn TS pchan error. - show pchan and lchan types on CHAN ACT ACK and REL ACK logging. - on RSL message Rx, log the current pchan kind in detail, using gsm_ts_and_pchan_name(). This logs the underlying pchan as well as the current pchan mode a dyn TS is in. - move 2 dyn TS logging from DL1C to DRSL, where all the other dyn ts logging is. Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea --- M src/common/oml.c M src/common/rsl.c 2 files changed, 22 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index 89db9cf..41debc1 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -950,6 +950,7 @@ /* Call into BTS driver to check attribute values */ rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -965,6 +966,9 @@ ts->pchan = abis_nm_pchan4chcomb(comb); rc = conf_lchans(ts); if (rc < 0) { + LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid Chan Comb 0x%x" + " (pchan=%s, conf_lchans()->%d)\n", + comb, gsm_pchan_name(ts->pchan), rc); talloc_free(tp_merged); /* Send NACK */ return oml_fom_ack_nack(msg, -rc); @@ -980,8 +984,8 @@ /* If there is no TSC specified, use the BCC */ ts->tsc = BSIC2BCC(bts->bsic); } - LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC = %u)\n", - gsm_abis_mo_name(&ts->mo), ts->tsc); + LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC=%u pchan=%s)\n", + gsm_abis_mo_name(&ts->mo), ts->tsc, gsm_pchan_name(ts->pchan)); /* call into BTS driver to apply new attributes to hardware */ return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts); diff --git a/src/common/rsl.c b/src/common/rsl.c index 902b68f..8a1a232 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -683,7 +683,9 @@ return 0; } - LOGP(DRSL, LOGL_NOTICE, "%s Tx RF CHAN REL ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN REL ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); /* * Free the LAPDm resources now that the BTS @@ -702,7 +704,9 @@ uint8_t chan_nr = gsm_lchan2chan_nr(lchan); uint8_t ie[2]; - LOGP(DRSL, LOGL_NOTICE, "%s Tx CHAN ACT ACK\n", gsm_lchan_name(lchan)); + LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN ACT ACK\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchant_name(lchan->type)); msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); if (!msg) @@ -986,6 +990,9 @@ return 1; } } + + LOGP(DRSL, LOGL_DEBUG, "%s: rx Channel Activation in state: %s.\n", + gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); /* Initialize channel defaults */ lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0); @@ -2106,7 +2113,7 @@ if (ts->flags & TS_F_PDCH_PENDING_MASK) { /* Only one of the pending flags should ever be set at the same * time, but just log both in case both should be set. */ - LOGP(DL1C, LOGL_ERROR, + LOGP(DRSL, LOGL_ERROR, "%s Request to PDCH %s, but PDCH%s%s is still pending\n", gsm_lchan_name(lchan), pdch_act? "ACT" : "DEACT", (ts->flags & TS_F_PDCH_ACT_PENDING)? " ACT" : "", @@ -2212,8 +2219,8 @@ break; default: LOGP(DRSL, LOGL_ERROR, - "%s Dyn TS disconnected, but invalid desired pchan", - gsm_ts_and_pchan_name(ts)); + "%s Dyn TS disconnected, but invalid desired pchan: %s\n", + gsm_ts_and_pchan_name(ts), gsm_pchan_name(ts->dyn.pchan_want)); ts->dyn.pchan_want = GSM_PCHAN_NONE; /* TODO: how would this recover? */ return; @@ -2351,7 +2358,7 @@ ts->flags |= TS_F_PDCH_ACTIVE; else ts->flags &= ~TS_F_PDCH_ACTIVE; - DEBUGP(DL1C, "%s %s switched to %s mode (ts->flags == %x)\n", + DEBUGP(DRSL, "%s %s switched to %s mode (ts->flags == %x)\n", gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan), pdch_act? "PDCH" : "TCH/F", ts->flags); @@ -2697,8 +2704,9 @@ return rsl_reject_unknown_lchan(msg); } - LOGP(DRSL, LOGL_INFO, "%s Rx RSL %s\n", gsm_lchan_name(msg->lchan), - rsl_or_ipac_msg_name(dch->c.msg_type)); + LOGP(DRSL, LOGL_INFO, "%s ss=%d Rx RSL %s\n", + gsm_ts_and_pchan_name(msg->lchan->ts), msg->lchan->nr, + rsl_or_ipac_msg_name(dch->c.msg_type)); switch (dch->c.msg_type) { case RSL_MT_CHAN_ACTIV: -- To view, visit https://gerrit.osmocom.org/8040 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:09 +0000 Subject: [MERGED] osmo-bts[master]: ip.access dyn ts: properly NACK a PDCH ACT on a still active... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: ip.access dyn ts: properly NACK a PDCH ACT on a still active lchan ...................................................................... ip.access dyn ts: properly NACK a PDCH ACT on a still active lchan Fixes: BTS_Tests.TC_dyn_ipa_pdch_tchf_act_pdch_act_nack Change-Id: I12816ef9953467decd9f745217135702a544c8fc --- M src/common/rsl.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index c3e9604..902b68f 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2115,6 +2115,13 @@ return; } + if (lchan->state != LCHAN_S_NONE) { + LOGP(DRSL, LOGL_ERROR, + "%s Request to PDCH %s, but lchan is still active\n", + gsm_ts_and_pchan_name(ts), pdch_act? "ACT" : "DEACT"); + rsl_tx_dyn_pdch_nack(lchan, pdch_act, RSL_ERR_NORMAL_UNSPEC); + } + ts->flags |= pdch_act? TS_F_PDCH_ACT_PENDING : TS_F_PDCH_DEACT_PENDING; -- To view, visit https://gerrit.osmocom.org/8080 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12816ef9953467decd9f745217135702a544c8fc Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:10 +0000 Subject: [MERGED] osmo-bts[master]: fix RSL Chan Activ Nack messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: fix RSL Chan Activ Nack messages ...................................................................... fix RSL Chan Activ Nack messages In early rsl_rx_chan_activ(), do not use rsl_tx_chan_act_acknack() to trigger sending a NACK, instead use rsl_tx_chan_act_nack() directly. Rationale: the previously used rsl_tx_chan_act_acknack() may decide to omit the NACK, particularly based on the lchan->rel_act_kind. lchan->rel_act_kind indicates whether the Chan Release or Activation was explicitly requested via RSL, and thus whether an ACK/NACK should go back to RSL or not. This gets set only late in rsl_rx_chan_activ(). We cannot set it on top, because we need to first establish whether the Chan Activ is permitted or not. In case of early rejection of the Chan Activ, we do not want to modify the lchan state, but merely reply with a NACK, unconditionally. Before this patch, NACKs that rsl_rx_chan_activ() wants to trigger would possibly be not be sent out on RSL, because lchan->rel_act_kind is not explicitly initialized until later. Fixes: BTS_Tests.TC_dyn_ipa_pdch_act_tchf_act_nack Change-Id: Ic981f768cc024f0acd3d7ae55846cfbc7bc089ce --- M src/common/rsl.c 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index a09d3a2..c3e9604 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -966,7 +966,7 @@ LOGP(DRSL, LOGL_ERROR, "%s: error: lchan is not available, but in state: %s.\n", gsm_lchan_name(lchan), gsm_lchans_name(lchan->state)); - return rsl_tx_chan_act_acknack(lchan, RSL_ERR_EQUIPMENT_FAIL); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { @@ -981,8 +981,7 @@ */ rc = dyn_ts_l1_reconnect(ts, msg); if (rc) - return rsl_tx_chan_act_acknack(lchan, - RSL_ERR_NORMAL_UNSPEC); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_NORMAL_UNSPEC); /* indicate that the msgb should not be freed. */ return 1; } @@ -998,7 +997,7 @@ /* 9.3.3 Activation Type */ if (!TLVP_PRESENT(&tp, RSL_IE_ACT_TYPE)) { LOGP(DRSL, LOGL_NOTICE, "missing Activation Type\n"); - return rsl_tx_chan_act_acknack(lchan, RSL_ERR_MAND_IE_ERROR); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); } type = *TLVP_VAL(&tp, RSL_IE_ACT_TYPE); @@ -1006,8 +1005,7 @@ if (type != RSL_ACT_OSMO_PDCH) { if (!TLVP_PRESENT(&tp, RSL_IE_CHAN_MODE)) { LOGP(DRSL, LOGL_NOTICE, "missing Channel Mode\n"); - return rsl_tx_chan_act_acknack(lchan, - RSL_ERR_MAND_IE_ERROR); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_MAND_IE_ERROR); } cm = (struct rsl_ie_chan_mode *) TLVP_VAL(&tp, RSL_IE_CHAN_MODE); lchan_tchmode_from_cmode(lchan, cm); -- To view, visit https://gerrit.osmocom.org/8079 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic981f768cc024f0acd3d7ae55846cfbc7bc089ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:10 +0000 Subject: [MERGED] osmo-bts[master]: ignore RSL RF CHAN REL for inactive lchans In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: ignore RSL RF CHAN REL for inactive lchans ...................................................................... ignore RSL RF CHAN REL for inactive lchans When an RF CHANnel RELease request is received on an already released lchan, there is no "REL NACK" message or similar, we just ACK the release. When ACKing the release, make sure to reflect the same chan_nr that the release was asked for, since the lchan state may actually reflect a different chan_nr. Factor the actual Rel Ack message sending out of rsl_tx_rf_rel_ack(), which makes all sorts of decisions around normal Rel Ack: add static tx_rf_rel_ack(), with chan_nr argument instead of deriving chan_nr from the lchan. Use this to directly ACK an unusual Chan Rel with the chan_nr that came in with the request. Fixes: BTS_Tests.TC_dyn_osmo_pdch_unsol_deact (after I6b790e866ce4e66d9385b286b727ae41a83d3e67) Change-Id: Iceaa2e87874ced42d664a2a0b01a1c59e46a19b3 --- M src/common/rsl.c 1 file changed, 29 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 52eb5f4..a09d3a2 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -613,10 +613,26 @@ * dedicated channel related messages */ +/* Send an RF CHANnel RELease ACKnowledge with the given chan_nr. This chan_nr may mismatch the current + * lchan state, if we received a CHANnel RELease for an already released channel, and we're just acking + * what we got without taking any action. */ +static int tx_rf_rel_ack(struct gsm_lchan *lchan, uint8_t chan_nr) +{ + struct msgb *msg; + + msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); + if (!msg) + return -ENOMEM; + + rsl_dch_push_hdr(msg, RSL_MT_RF_CHAN_REL_ACK, chan_nr); + msg->trx = lchan->ts->trx; + + return abis_bts_rsl_sendmsg(msg); +} + /* 8.4.19 sending RF CHANnel RELease ACKnowledge */ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan) { - struct msgb *msg; uint8_t chan_nr = gsm_lchan2chan_nr(lchan); bool send_rel_ack; @@ -675,14 +691,7 @@ */ lapdm_channel_exit(&lchan->lapdm_ch); - msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr)); - if (!msg) - return -ENOMEM; - - rsl_dch_push_hdr(msg, RSL_MT_RF_CHAN_REL_ACK, chan_nr); - msg->trx = lchan->ts->trx; - - return abis_bts_rsl_sendmsg(msg); + return tx_rf_rel_ack(lchan, chan_nr); } /* 8.4.2 sending CHANnel ACTIVation ACKnowledge */ @@ -1187,6 +1196,17 @@ { int rc; + if (lchan->state == LCHAN_S_NONE) { + LOGP(DRSL, LOGL_ERROR, + "%s ss=%d state=%s Rx RSL RF Channel Release, but is already inactive;" + " just ACKing the release\n", + gsm_ts_and_pchan_name(lchan->ts), lchan->nr, + gsm_lchans_name(lchan->state)); + /* Just ack the release and ignore. Make sure to reflect the same chan_nr we received, + * not necessarily reflecting the current lchan state. */ + return tx_rf_rel_ack(lchan, chan_nr); + } + if (lchan->abis_ip.rtp_socket) { rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/8078 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iceaa2e87874ced42d664a2a0b01a1c59e46a19b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:18 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_unsol_deact In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts: fix TC_dyn_osmo_pdch_unsol_deact ...................................................................... bts: fix TC_dyn_osmo_pdch_unsol_deact TC_dyn_osmo_pdch_unsol_deact sends a release request on an already released lchan, which obviously would never trigger a change in the PCU configuration and hence it makes no sense to expect a PCU info ind to be sent. Instead of f_dyn_osmo_pdch_deact(), which expects a PCU info_ind, just send a CHAN_REL and expect a trivial REL_ACK. Drop some unused local vars. Change-Id: I6b790e866ce4e66d9385b286b727ae41a83d3e67 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5e93ba3..8379fba 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2732,14 +2732,13 @@ /* send a RF CHAN REL for PDCH on an osmocom dynamci PDCH that's already inactive */ function f_TC_dyn_osmo_pdch_unsol_deact(charstring id) runs on ConnHdlr { var PCUIF_Message first_info; - var integer ts_nr := g_chan_nr.tn; - var integer trx_nr := 0; - var integer bts_nr := 0; var integer pcu_conn_id := -1; f_init_pcu(PCU, id, pcu_conn_id, first_info); - f_dyn_osmo_pdch_deact(pcu_conn_id, bts_nr, trx_nr); + RSL.send(ts_RSL_RF_CHAN_REL(g_chan_nr)); + /* since the lchan is already released, we don't expect any PCU changes, just a rel ack. */ + RSL.receive(tr_RSL_RF_CHAN_REL_ACK(g_chan_nr)); setverdict(pass); } testcase TC_dyn_osmo_pdch_unsol_deact() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/8074 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b790e866ce4e66d9385b286b727ae41a83d3e67 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:18 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts: fix TC_dyn_osmo_pdch_double_act In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts: fix TC_dyn_osmo_pdch_double_act ...................................................................... bts: fix TC_dyn_osmo_pdch_double_act Do not expect success on second activation. Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 8379fba..49e5fa1 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2762,7 +2762,9 @@ f_init_pcu(PCU, id, pcu_conn_id, first_info); f_dyn_osmo_pdch_act(pcu_conn_id, bts_nr, trx_nr); - f_dyn_osmo_pdch_act(pcu_conn_id, bts_nr, trx_nr); + /* Send a second Chan Activ and expect it to be NACKed */ + f_rsl_transceive(ts_RSL_CHAN_ACT(g_chan_nr, g_pars.chan_mode), tr_RSL_CHAN_ACT_NACK(g_chan_nr), + "RSL CHAN ACT NACK"); setverdict(pass); } testcase TC_dyn_osmo_pdch_double_act() runs on test_CT { -- To view, visit https://gerrit.osmocom.org/8077 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b1ef158e1fdb32b392aa15bff71d0fe30ce6f1f Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Wed May 9 12:50:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 12:50:18 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: add bts/expected-results.xml In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: add bts/expected-results.xml ...................................................................... add bts/expected-results.xml Change-Id: I677b65cbfd5762ff016b188a0f18ce1e5710f45d --- A bts/expected-results.xml 1 file changed, 91 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/expected-results.xml b/bts/expected-results.xml new file mode 100644 index 0000000..6ac0686 --- /dev/null +++ b/bts/expected-results.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 116, which has already terminated. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + no verdict + + + + + + + + + + RSL for unknown Dchan + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_unsol_deact testcase + + + + "Timeout expecting RSL CHAN ACT" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_double_act testcase + + + + + + + + Tguard timeout + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_tchf_act_pdch_act_nack testcase + + + + "Timeout expecting RSL CHAN ACT" + BTS_Tests.ttcn:MASKED BTS_Tests control part + BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_act_tchf_act_nack testcase + + + -- To view, visit https://gerrit.osmocom.org/8073 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I677b65cbfd5762ff016b188a0f18ce1e5710f45d Gerrit-PatchSet: 2 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 14:31:30 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 9 May 2018 14:31:30 +0000 Subject: [PATCH] osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts... Message-ID: Review at https://gerrit.osmocom.org/8086 stats: use libosmocore rate counter for in/out_stream.err_ts_counter The two counters: in_stream.err_ts_counter and out_stream.err_ts_counter are still handcoded. To make them better accessible they should be replaced with libosmocore rate counters. - replace state.in_stream.err_ts_counter with libosmocore rate counter - replace state.out_stream.err_ts_counter with libosmocore rate counter Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Related: OS#2517 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 6 files changed, 65 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/8086/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 0da2c56..ff02768 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -28,6 +28,7 @@ #include #include #include +#include #define CI_UNUSED 0 @@ -45,7 +46,7 @@ uint32_t ssrc; uint16_t last_seq; uint32_t last_timestamp; - uint32_t err_ts_counter; + struct rate_ctr *err_ts_ctr; int32_t last_tsdelta; uint32_t last_arrival_time; }; @@ -202,6 +203,8 @@ uint32_t octets; } stats; } osmux; + + struct rate_ctr_group *rate_ctr_group; }; /*! Connection type, specifies which member of the union "u" in mgcp_conn diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 998dbc5..0055049 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -26,7 +26,27 @@ #include #include #include +#include #include + +const static struct rate_ctr_desc rate_ctr_desc[] = { + { + .name = "in_stream_err_ts_ctr", + .description = "inbound rtp-stream timestamp errors", + },{ + .name = "out_stream_err_ts_ctr", + .description = "outbound rtp-stream timestamp errors", + } +}; + +const static struct rate_ctr_group_desc rate_ctr_group_desc = { + .group_name_prefix = "conn_rtp", + .group_description = "rtp connection statistics", + .class_id = 1, + .num_ctr = 2, + .ctr_desc = rate_ctr_desc +}; + /* Allocate a new connection identifier. According to RFC3435, they must * be unique only within the scope of the endpoint. (Caller must provide @@ -87,6 +107,10 @@ static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn) { struct mgcp_rtp_end *end = &conn_rtp->end; + /* FIXME: Each new rate counter group requires an unique index. At the + * moment we generate this index using this counter, but perhaps there + * is a more concious way to assign the indexes. */ + static unsigned int rate_ctr_index = 0; conn_rtp->type = MGCP_RTP_DEFAULT; conn_rtp->osmux.allocated_cid = -1; @@ -108,6 +132,15 @@ mgcp_rtp_codec_init(&end->codec); mgcp_rtp_codec_init(&end->alt_codec); + + conn_rtp->rate_ctr_group = + rate_ctr_group_alloc(conn, &rate_ctr_group_desc, + rate_ctr_index); + conn_rtp->state.in_stream.err_ts_ctr = + &conn_rtp->rate_ctr_group->ctr[0]; + conn_rtp->state.out_stream.err_ts_ctr = + &conn_rtp->rate_ctr_group->ctr[1]; + rate_ctr_index++; } /* Cleanup rtp connection struct */ @@ -116,6 +149,7 @@ osmux_disable_conn(conn_rtp); osmux_release_cid(conn_rtp); mgcp_free_rtp_port(&conn_rtp->end); + rate_ctr_group_free(conn_rtp->rate_ctr_group); } /*! allocate a new connection list entry. diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6923b97..c56e433 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -222,7 +222,7 @@ if (seq == sstate->last_seq) { if (timestamp != sstate->last_timestamp) { - sstate->err_ts_counter += 1; + rate_ctr_inc(sstate->err_ts_ctr); LOGP(DRTP, LOGL_ERROR, "The %s timestamp delta is != 0 but the sequence " "number %d is the same, " @@ -272,7 +272,7 @@ ts_alignment_error(sstate, state->packet_duration, timestamp); if (timestamp_error) { - sstate->err_ts_counter += 1; + rate_ctr_inc(sstate->err_ts_ctr); LOGP(DRTP, LOGL_NOTICE, "The %s timestamp has an alignment error of %d " "on 0x%x SSRC: %u " @@ -505,13 +505,16 @@ mgcp_rtp_annex_count(endp, state, seq, transit, ssrc); if (!state->initialized) { + /* FIXME: Move this initialization to mgcp.conn.c */ state->initialized = 1; state->in_stream.last_seq = seq - 1; state->in_stream.ssrc = state->patch.orig_ssrc = ssrc; state->in_stream.last_tsdelta = 0; state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); - state->out_stream = state->in_stream; + state->out_stream.last_seq = seq - 1; + state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ LOGP(DRTP, LOGL_INFO, diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c index 581130c..cc723bb 100644 --- a/src/libosmo-mgcp/mgcp_stat.c +++ b/src/libosmo-mgcp/mgcp_stat.c @@ -87,9 +87,9 @@ if (conn->conn->endp->cfg->osmux != OSMUX_USAGE_OFF) { /* Error Counter */ nchars = snprintf(str, str_len, - "\r\nX-Osmo-CP: EC TI=%u, TO=%u", - conn->state.in_stream.err_ts_counter, - conn->state.out_stream.err_ts_counter); + "\r\nX-Osmo-CP: EC TI=%lu, TO=%lu", + conn->state.in_stream.err_ts_ctr->current, + conn->state.out_stream.err_ts_ctr->current); if (nchars < 0 || nchars >= str_len) goto truncate; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 14ecd17..392a176 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -160,15 +160,16 @@ struct mgcp_rtp_codec *codec = &end->codec; vty_out(vty, - " Timestamp Errs: %d->%d%s" + " Timestamp Errs: %lu->%lu%s" " Dropped Packets: %d%s" " Payload Type: %d Rate: %u Channels: %d %s" " Frame Duration: %u Frame Denominator: %u%s" " FPP: %d Packet Duration: %u%s" " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", - state->in_stream.err_ts_counter, - state->out_stream.err_ts_counter, VTY_NEWLINE, + state->in_stream.err_ts_ctr->current, + state->out_stream.err_ts_ctr->current, + VTY_NEWLINE, end->stats.dropped_packets, VTY_NEWLINE, codec->payload_type, codec->rate, codec->channels, VTY_NEWLINE, codec->frame_duration_num, codec->frame_duration_den, diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index f6c421a..67c5f66 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1129,10 +1129,12 @@ uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; - int last_in_ts_err_cnt = 0; - int last_out_ts_err_cnt = 0; + uint64_t last_in_ts_err_cnt = 0; + uint64_t last_out_ts_err_cnt = 0; struct mgcp_conn_rtp *conn = NULL; struct mgcp_conn *_conn = NULL; + struct rate_ctr test_ctr_in; + struct rate_ctr test_ctr_out; printf("Testing packet error detection%s%s.\n", patch_ssrc ? ", patch SSRC" : "", @@ -1141,6 +1143,11 @@ memset(&trunk, 0, sizeof(trunk)); memset(&endp, 0, sizeof(endp)); memset(&state, 0, sizeof(state)); + + memset(&test_ctr_in, 0, sizeof(test_ctr_in)); + memset(&test_ctr_out, 0, sizeof(test_ctr_out)); + state.in_stream.err_ts_ctr = &test_ctr_in; + state.out_stream.err_ts_ctr = &test_ctr_out; endp.type = &ep_typeset.rtp; @@ -1186,18 +1193,18 @@ state.in_stream.last_tsdelta, state.in_stream.last_seq); printf("Out TS change: %d, dTS: %d, Seq change: %d, " - "TS Err change: in %+d, out %+d\n", + "TS Err change: in +%u, out +%u\n", state.out_stream.last_timestamp - last_timestamp, state.out_stream.last_tsdelta, state.out_stream.last_seq - last_seqno, - state.in_stream.err_ts_counter - last_in_ts_err_cnt, - state.out_stream.err_ts_counter - last_out_ts_err_cnt); + (unsigned int) (state.in_stream.err_ts_ctr->current - last_in_ts_err_cnt), + (unsigned int) (state.out_stream.err_ts_ctr->current - last_out_ts_err_cnt)); printf("Stats: Jitter = %u, Transit = %d\n", calc_jitter(&state), state.stats.transit); - last_in_ts_err_cnt = state.in_stream.err_ts_counter; - last_out_ts_err_cnt = state.out_stream.err_ts_counter; + last_in_ts_err_cnt = state.in_stream.err_ts_ctr->current; + last_out_ts_err_cnt = state.out_stream.err_ts_ctr->current; last_timestamp = state.out_stream.last_timestamp; last_seqno = state.out_stream.last_seq; } -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter From gerrit-no-reply at lists.osmocom.org Wed May 9 14:34:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 14:34:32 +0000 Subject: [PATCH] libosmocore[master]: lapdm: don't enforce contention resolution on SAPI0/DCCH Message-ID: Review at https://gerrit.osmocom.org/8087 lapdm: don't enforce contention resolution on SAPI0/DCCH In Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 we introduced a check to enforce contention resolution always being used in MS-originated LAPDm establishment on the main DCCH / SAPI0. This is only required after RACH request (IMM.ASS.) and not after a normal assignment command which was sent already via a dedicated channel. Hence, we cannot enforce a strict requirement for contention resolution in those cases. We *could* use the RSL Channel Activation type as a constraint on whether or not to enforce contention-resoluiton-only LAPDm establishment, but this is out of the scope of the LAPDm code but would have to be done inside OsmoBTS. Related: OS#3252 Change-Id: Id903492ee90809fe98defcf4abc0419b8150069f --- M src/gsm/lapdm.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/8087/1 diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index b9e7304..3a6fc5b 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -552,16 +552,13 @@ return RLL_CAUSE_SABM_INFO_NOTALL; } else { switch (lctx->sapi) { - case 0: - /* SAPI0 must use contention resolution, i.e. L3 payload must exist */ - if (lctx->length == 0) - return RLL_CAUSE_UFRM_INC_PARAM; - break; case 3: /* SAPI3 doesn't support contention resolution */ if (lctx->length > 0) return RLL_CAUSE_SABM_INFO_NOTALL; break; + default: + break; } } } else if (le->mode == LAPDM_MODE_MS) { -- To view, visit https://gerrit.osmocom.org/8087 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id903492ee90809fe98defcf4abc0419b8150069f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 14:51:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 14:51:52 +0000 Subject: osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts... In-Reply-To: References: Message-ID: Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_conn.c File src/libosmo-mgcp/mgcp_conn.c: Line 139: conn_rtp->state.in_stream.err_ts_ctr = no need to break those lines, we don't have 80 columns limits anymore https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: Line 517: state->out_stream.last_tsdelta = 0; this somehow doesn't look like counter related changes? -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes From gerrit-no-reply at lists.osmocom.org Wed May 9 14:52:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 14:52:24 +0000 Subject: libosmocore[master]: lapdm: don't enforce contention resolution on SAPI0/DCCH In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8087 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id903492ee90809fe98defcf4abc0419b8150069f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 14:52:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 14:52:25 +0000 Subject: [MERGED] libosmocore[master]: lapdm: don't enforce contention resolution on SAPI0/DCCH In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: lapdm: don't enforce contention resolution on SAPI0/DCCH ...................................................................... lapdm: don't enforce contention resolution on SAPI0/DCCH In Change-Id: I8c2c103cdc7f9a45d7b2080c572f559fc3db58e4 we introduced a check to enforce contention resolution always being used in MS-originated LAPDm establishment on the main DCCH / SAPI0. This is only required after RACH request (IMM.ASS.) and not after a normal assignment command which was sent already via a dedicated channel. Hence, we cannot enforce a strict requirement for contention resolution in those cases. We *could* use the RSL Channel Activation type as a constraint on whether or not to enforce contention-resoluiton-only LAPDm establishment, but this is out of the scope of the LAPDm code but would have to be done inside OsmoBTS. Related: OS#3252 Change-Id: Id903492ee90809fe98defcf4abc0419b8150069f --- M src/gsm/lapdm.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index b9e7304..3a6fc5b 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -552,16 +552,13 @@ return RLL_CAUSE_SABM_INFO_NOTALL; } else { switch (lctx->sapi) { - case 0: - /* SAPI0 must use contention resolution, i.e. L3 payload must exist */ - if (lctx->length == 0) - return RLL_CAUSE_UFRM_INC_PARAM; - break; case 3: /* SAPI3 doesn't support contention resolution */ if (lctx->length > 0) return RLL_CAUSE_SABM_INFO_NOTALL; break; + default: + break; } } } else if (le->mode == LAPDM_MODE_MS) { -- To view, visit https://gerrit.osmocom.org/8087 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id903492ee90809fe98defcf4abc0419b8150069f Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 14:58:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 14:58:58 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is... Message-ID: Review at https://gerrit.osmocom.org/8088 bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is legal The diffrence is whether we establish the LAPDm link * after RACH + IMM.ASS (we must include L3 payload for contention resolution required) * after assignment from one channel to another (we must not include L3 payload, i.e. no contention resolution) Change-Id: Ib67763856ffc5f5fd04a87f4192705777931c400 Related: OS#3252 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/8088/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 49e5fa1..c706437 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3108,10 +3108,10 @@ } testcase TC_rll_est_ind() runs on test_CT { var RllTestCases tcs := { - /* normal SAPI0 establishment */ + /* SAPI0 establishment (contention resolution) */ valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), - /* SAPI 0 requires contention resolution */ - valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, false)), + /* normal SAPI0 establishment */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, true)), /* SAPI 3 doesn't support contention resolution */ valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)), valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)), -- To view, visit https://gerrit.osmocom.org/8088 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib67763856ffc5f5fd04a87f4192705777931c400 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From jenkins at lists.osmocom.org Wed May 9 15:10:56 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 9 May 2018 15:10:56 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#117?= In-Reply-To: <1996127116.446.1525792206822.JavaMail.jenkins@jenkins.osmocom.org> References: <1996127116.446.1525792206822.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1124375570.466.1525878656882.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.66 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 4 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Wed May 9 16:13:37 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 9 May 2018 16:13:37 +0000 Subject: [PATCH] osmo-ggsn[master]: ggsn_vty.c: fix: use CONFIG_NODE as parent by default Message-ID: Review at https://gerrit.osmocom.org/8089 ggsn_vty.c: fix: use CONFIG_NODE as parent by default There are some configuration nodes, which are handled by extenral libraries, such as libosmoctrl. So, when switching back to the parent node, this should be kept in mind. Change-Id: I65be7910dc46166caa34a0984a6763e1477dec99 --- M ggsn/ggsn_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/89/8089/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 6ddfc0d..53f4ebf 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -948,6 +948,10 @@ vty->index_sub = &apn->ggsn->cfg.description; } break; + default: + vty->node = CONFIG_NODE; + vty->index = NULL; + vty->index_sub = NULL; } return vty->node; -- To view, visit https://gerrit.osmocom.org/8089 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65be7910dc46166caa34a0984a6763e1477dec99 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy From gerrit-no-reply at lists.osmocom.org Wed May 9 17:23:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 17:23:09 +0000 Subject: osmo-ttcn3-hacks[master]: bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8088 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib67763856ffc5f5fd04a87f4192705777931c400 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 17:23:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 17:23:10 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is legal ...................................................................... bts (RLL): DCCH/SAPI0 LAPDm without contention resolution is legal The diffrence is whether we establish the LAPDm link * after RACH + IMM.ASS (we must include L3 payload for contention resolution required) * after assignment from one channel to another (we must not include L3 payload, i.e. no contention resolution) Change-Id: Ib67763856ffc5f5fd04a87f4192705777931c400 Related: OS#3252 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 49e5fa1..c706437 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3108,10 +3108,10 @@ } testcase TC_rll_est_ind() runs on test_CT { var RllTestCases tcs := { - /* normal SAPI0 establishment */ + /* SAPI0 establishment (contention resolution) */ valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)), - /* SAPI 0 requires contention resolution */ - valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, false)), + /* normal SAPI0 establishment */ + valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, true)), /* SAPI 3 doesn't support contention resolution */ valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)), valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)), -- To view, visit https://gerrit.osmocom.org/8088 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib67763856ffc5f5fd04a87f4192705777931c400 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 17:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 17:23:23 +0000 Subject: osmo-ggsn[master]: ggsn_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8089 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I65be7910dc46166caa34a0984a6763e1477dec99 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 17:23:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 17:23:27 +0000 Subject: [MERGED] osmo-ggsn[master]: ggsn_vty.c: fix: use CONFIG_NODE as parent by default In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: ggsn_vty.c: fix: use CONFIG_NODE as parent by default ...................................................................... ggsn_vty.c: fix: use CONFIG_NODE as parent by default There are some configuration nodes, which are handled by extenral libraries, such as libosmoctrl. So, when switching back to the parent node, this should be kept in mind. Change-Id: I65be7910dc46166caa34a0984a6763e1477dec99 --- M ggsn/ggsn_vty.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index 6ddfc0d..53f4ebf 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -948,6 +948,10 @@ vty->index_sub = &apn->ggsn->cfg.description; } break; + default: + vty->node = CONFIG_NODE; + vty->index = NULL; + vty->index_sub = NULL; } return vty->node; -- To view, visit https://gerrit.osmocom.org/8089 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65be7910dc46166caa34a0984a6763e1477dec99 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 18:11:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:11:31 +0000 Subject: [PATCH] osmo-bts[master]: rsl: log errors when parsing of encryption information fails Message-ID: Review at https://gerrit.osmocom.org/8090 rsl: log errors when parsing of encryption information fails ... also log a DEBUG message whenever we change the lchan->encr Related: OS#3254 Change-Id: Icda7722eef319f343178b0bb8f79362026948199 --- M src/common/rsl.c 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/8090/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 9adb89a..f50c1d2 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -821,18 +821,26 @@ /* check if the encryption algorithm sent by BSC is supported! */ rc = bts_supports_cipher(bts, *val); - if (rc != 1) + if (rc != 1) { + LOGP(DRSL, LOGL_ERROR, "%s: BTS doesn't support cipher 0x%02x\n", + gsm_lchan_name(lchan), *val); return rc; + } /* length can be '1' in case of no ciphering */ - if (len < 1) + if (len < 1) { + LOGP(DRSL, LOGL_ERROR, "%s: Encryption Info cannot have len=%d\n", + gsm_lchan_name(lchan), len); return -EINVAL; + } lchan->encr.alg_id = *val++; lchan->encr.key_len = len -1; if (lchan->encr.key_len > sizeof(lchan->encr.key)) lchan->encr.key_len = sizeof(lchan->encr.key); memcpy(lchan->encr.key, val, lchan->encr.key_len); + DEBUGP(DRSL, "%s: Setting lchan cipher algorithm 0x%02x\n", + gsm_lchan_name(lchan), lchan->encr.alg_id); return 0; } -- To view, visit https://gerrit.osmocom.org/8090 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icda7722eef319f343178b0bb8f79362026948199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 18:11:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:11:31 +0000 Subject: [PATCH] osmo-bts[master]: rsl: Make channel activation fail if encryption algorithm no... Message-ID: Review at https://gerrit.osmocom.org/8091 rsl: Make channel activation fail if encryption algorithm not supported The code actually always *wanted* to make lchan activation fail in case we don't support the algorithm, but it failed ot do so. The problem is encr_info2lchan() which uses bts_supports_cipher() to determine if the cipher is supported. However, if bts_supports_cipher() returns 0 (not supported), it uses this value as return value of encr_info2lchan() where '0' means success (standard osmocom convention). This results in channel activation proceeding, which it shouldn't. Change-Id: I46275b8fc2a1a74f68b4cc60e0f64ba226b108cd Related: OS#3254 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/8091/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index f50c1d2..23778b7 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -824,7 +824,7 @@ if (rc != 1) { LOGP(DRSL, LOGL_ERROR, "%s: BTS doesn't support cipher 0x%02x\n", gsm_lchan_name(lchan), *val); - return rc; + return -EINVAL; } /* length can be '1' in case of no ciphering */ -- To view, visit https://gerrit.osmocom.org/8091 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46275b8fc2a1a74f68b4cc60e0f64ba226b108cd Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 18:11:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:11:32 +0000 Subject: [PATCH] osmo-bts[master]: rsl: If CHAN ACT or MODE MODIF fails, send respective NACK Message-ID: Review at https://gerrit.osmocom.org/8092 rsl: If CHAN ACT or MODE MODIF fails, send respective NACK The existign code only sent an ERROR REPORT, but it failed to actually send a proper NACK to the related request. This is confusing, as the operation should always be ACKed or NACKed, and not simply result in no response. Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83 Closes: OS#3254 --- M src/common/rsl.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/8092/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 23778b7..6fc3ac8 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -961,8 +961,8 @@ const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO); if (encr_info2lchan(lchan, val, len) < 0) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, - &dch->chan_nr, NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_ENCR_UNIMPL); } } else memset(&lchan->encr, 0, sizeof(lchan->encr)); @@ -1387,8 +1387,8 @@ const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO); if (encr_info2lchan(lchan, val, len) < 0) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_ENCR_UNIMPL); } } -- To view, visit https://gerrit.osmocom.org/8092 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 18:11:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:11:32 +0000 Subject: [PATCH] osmo-bts[master]: rsl: Properly NACK CHAN_ACKT / MODE_MODIFY Message-ID: Review at https://gerrit.osmocom.org/8093 rsl: Properly NACK CHAN_ACKT / MODE_MODIFY Whenever we encounter an error condition during processing of RSL CHAN ACT or RSL MODE MODIFY, it's insufficient to simply send an RSL ERROR INDICATION, but we also must send a proper NACK back to the BSC. Change-Id: I4dd7ff2fd2cdbc6e892cd329c826ac1bc3b16bb9 --- M src/common/rsl.c 1 file changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/8093/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 6fc3ac8..1a97c5d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1005,15 +1005,17 @@ uint8_t osmo_si; if (!OSMO_IN_ARRAY(rsl_si, rsl_sacch_sitypes)) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, - &dch->chan_nr, NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, + &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } osmo_si = osmo_rsl2sitype(rsl_si); if (osmo_si == SYSINFO_TYPE_NONE) { LOGP(DRSL, LOGL_NOTICE, " Rx SACCH SI 0x%02x not supported.\n", rsl_si); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, + NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } lapdm_ui_prefix_lchan(lchan, cur, osmo_si, si_len); @@ -1021,8 +1023,9 @@ cur += si_len; if (cur >= val + tot_len) { LOGP(DRSL, LOGL_ERROR, "Error parsing SACCH INFO IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, + NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } } } else { @@ -1033,8 +1036,8 @@ if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { LOGP(DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1, TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1); @@ -1090,9 +1093,10 @@ gsm_ts_and_pchan_name(ts)); rc = 0; } - if (rc) - return rsl_tx_error_report(msg->trx, RSL_ERR_NORMAL_UNSPEC, &dch->chan_nr, - NULL, msg); + if (rc) { + rsl_tx_error_report(msg->trx, RSL_ERR_NORMAL_UNSPEC, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_NORMAL_UNSPEC); + } return 0; } @@ -1398,8 +1402,8 @@ if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { LOGP(DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT);; } memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1, TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1); -- To view, visit https://gerrit.osmocom.org/8093 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4dd7ff2fd2cdbc6e892cd329c826ac1bc3b16bb9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 18:24:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:24:09 +0000 Subject: [PATCH] osmo-bts[master]: osmo-bts-trx: Enable A5/3 cipher support Message-ID: Review at https://gerrit.osmocom.org/8094 osmo-bts-trx: Enable A5/3 cipher support This actually should have been working since 2015, when the following patch was merged to libosmcore: commit f8699ca51eeb4f3d34336501abcaf071b4a95a47 Author: Max Date: Wed Mar 25 17:20:31 2015 +0100 gsm: Add A5/3-4 cipher support however, it seems nobody so far bothered to actually enable A5/3 for osmo-bts-trx! Change-Id: I8192d6d07cdb87783bce997456ead673c600f7c0 Closes: OS#3253 --- M src/osmo-bts-trx/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/8094/1 diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 6e5a4ca..3b82e42 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -98,7 +98,7 @@ int bts_model_init(struct gsm_bts *bts) { bts->variant = BTS_OSMO_TRX; - bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2); + bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); /* FIXME: this needs to be overridden with the real hardrware * value */ -- To view, visit https://gerrit.osmocom.org/8094 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8192d6d07cdb87783bce997456ead673c600f7c0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:01 +0000 Subject: osmo-bts[master]: osmo-bts-trx: Enable A5/3 cipher support In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8094 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8192d6d07cdb87783bce997456ead673c600f7c0 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:05 +0000 Subject: osmo-bts[master]: rsl: log errors when parsing of encryption information fails In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8090 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icda7722eef319f343178b0bb8f79362026948199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:09 +0000 Subject: osmo-bts[master]: rsl: Make channel activation fail if encryption algorithm no... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8091 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I46275b8fc2a1a74f68b4cc60e0f64ba226b108cd Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:13 +0000 Subject: osmo-bts[master]: rsl: If CHAN ACT or MODE MODIF fails, send respective NACK In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8092 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:16 +0000 Subject: osmo-bts[master]: rsl: Properly NACK CHAN_ACKT / MODE_MODIFY In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8093 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4dd7ff2fd2cdbc6e892cd329c826ac1bc3b16bb9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:37:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:37:19 +0000 Subject: osmo-bts[master]: FIX REL_IND merge mismatch In-Reply-To: References: Message-ID: Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6966 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-PatchSet: 6 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Wed May 9 18:42:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 18:42:10 +0000 Subject: [MERGED] osmo-bts[master]: rsl: log errors when parsing of encryption information fails In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: rsl: log errors when parsing of encryption information fails ...................................................................... rsl: log errors when parsing of encryption information fails ... also log a DEBUG message whenever we change the lchan->encr Related: OS#3254 Change-Id: Icda7722eef319f343178b0bb8f79362026948199 --- M src/common/rsl.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 8a1a232..229d960 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -868,18 +868,26 @@ /* check if the encryption algorithm sent by BSC is supported! */ rc = bts_supports_cipher(bts, *val); - if (rc != 1) + if (rc != 1) { + LOGP(DRSL, LOGL_ERROR, "%s: BTS doesn't support cipher 0x%02x\n", + gsm_lchan_name(lchan), *val); return rc; + } /* length can be '1' in case of no ciphering */ - if (len < 1) + if (len < 1) { + LOGP(DRSL, LOGL_ERROR, "%s: Encryption Info cannot have len=%d\n", + gsm_lchan_name(lchan), len); return -EINVAL; + } lchan->encr.alg_id = *val++; lchan->encr.key_len = len -1; if (lchan->encr.key_len > sizeof(lchan->encr.key)) lchan->encr.key_len = sizeof(lchan->encr.key); memcpy(lchan->encr.key, val, lchan->encr.key_len); + DEBUGP(DRSL, "%s: Setting lchan cipher algorithm 0x%02x\n", + gsm_lchan_name(lchan), lchan->encr.alg_id); return 0; } -- To view, visit https://gerrit.osmocom.org/8090 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icda7722eef319f343178b0bb8f79362026948199 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 19:15:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 19:15:51 +0000 Subject: [MERGED] osmo-bts[master]: rsl: Make channel activation fail if encryption algorithm no... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: rsl: Make channel activation fail if encryption algorithm not supported ...................................................................... rsl: Make channel activation fail if encryption algorithm not supported The code actually always *wanted* to make lchan activation fail in case we don't support the algorithm, but it failed ot do so. The problem is encr_info2lchan() which uses bts_supports_cipher() to determine if the cipher is supported. However, if bts_supports_cipher() returns 0 (not supported), it uses this value as return value of encr_info2lchan() where '0' means success (standard osmocom convention). This results in channel activation proceeding, which it shouldn't. Change-Id: I46275b8fc2a1a74f68b4cc60e0f64ba226b108cd Related: OS#3254 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 229d960..f5c153a 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -871,7 +871,7 @@ if (rc != 1) { LOGP(DRSL, LOGL_ERROR, "%s: BTS doesn't support cipher 0x%02x\n", gsm_lchan_name(lchan), *val); - return rc; + return -EINVAL; } /* length can be '1' in case of no ciphering */ -- To view, visit https://gerrit.osmocom.org/8091 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46275b8fc2a1a74f68b4cc60e0f64ba226b108cd Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 19:54:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 19:54:12 +0000 Subject: [MERGED] osmo-bts[master]: rsl: Properly NACK CHAN_ACKT / MODE_MODIFY In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: rsl: Properly NACK CHAN_ACKT / MODE_MODIFY ...................................................................... rsl: Properly NACK CHAN_ACKT / MODE_MODIFY Whenever we encounter an error condition during processing of RSL CHAN ACT or RSL MODE MODIFY, it's insufficient to simply send an RSL ERROR INDICATION, but we also must send a proper NACK back to the BSC. Change-Id: I4dd7ff2fd2cdbc6e892cd329c826ac1bc3b16bb9 --- M src/common/rsl.c 1 file changed, 17 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index f5c153a..4d8279c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1076,15 +1076,17 @@ uint8_t osmo_si; if (!OSMO_IN_ARRAY(rsl_si, rsl_sacch_sitypes)) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, - &dch->chan_nr, NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, + &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } osmo_si = osmo_rsl2sitype(rsl_si); if (osmo_si == SYSINFO_TYPE_NONE) { LOGP(DRSL, LOGL_NOTICE, " Rx SACCH SI 0x%02x not supported.\n", rsl_si); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, + NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } lapdm_ui_prefix_lchan(lchan, cur, osmo_si, si_len); @@ -1092,8 +1094,9 @@ cur += si_len; if (cur >= val + tot_len) { LOGP(DRSL, LOGL_ERROR, "Error parsing SACCH INFO IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, + NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } } } else { @@ -1104,8 +1107,8 @@ if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { LOGP(DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_IE_CONTENT); } memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1, TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1); @@ -1161,9 +1164,10 @@ gsm_ts_and_pchan_name(ts)); rc = 0; } - if (rc) - return rsl_tx_error_report(msg->trx, RSL_ERR_NORMAL_UNSPEC, &dch->chan_nr, - NULL, msg); + if (rc) { + rsl_tx_error_report(msg->trx, RSL_ERR_NORMAL_UNSPEC, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_NORMAL_UNSPEC); + } return 0; } @@ -1483,8 +1487,8 @@ if (TLVP_PRESENT(&tp, RSL_IE_MR_CONFIG)) { if (TLVP_LEN(&tp, RSL_IE_MR_CONFIG) > sizeof(lchan->mr_bts_lv) - 1) { LOGP(DRSL, LOGL_ERROR, "Error parsing MultiRate conf IE\n"); - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_IE_CONTENT);; } memcpy(lchan->mr_bts_lv, TLVP_VAL(&tp, RSL_IE_MR_CONFIG) - 1, TLVP_LEN(&tp, RSL_IE_MR_CONFIG) + 1); -- To view, visit https://gerrit.osmocom.org/8093 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dd7ff2fd2cdbc6e892cd329c826ac1bc3b16bb9 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 20:34:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 20:34:45 +0000 Subject: [MERGED] osmo-bts[master]: rsl: If CHAN ACT or MODE MODIF fails, send respective NACK In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: rsl: If CHAN ACT or MODE MODIF fails, send respective NACK ...................................................................... rsl: If CHAN ACT or MODE MODIF fails, send respective NACK The existign code only sent an ERROR REPORT, but it failed to actually send a proper NACK to the related request. This is confusing, as the operation should always be ACKed or NACKed, and not simply result in no response. Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83 Closes: OS#3254 --- M src/common/rsl.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 4d8279c..5dd2c59 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1032,8 +1032,8 @@ const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO); if (encr_info2lchan(lchan, val, len) < 0) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, - &dch->chan_nr, NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_chan_act_acknack(lchan, RSL_ERR_ENCR_UNIMPL); } } else memset(&lchan->encr, 0, sizeof(lchan->encr)); @@ -1476,8 +1476,8 @@ const uint8_t *val = TLVP_VAL(&tp, RSL_IE_ENCR_INFO); if (encr_info2lchan(lchan, val, len) < 0) { - return rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, - NULL, msg); + rsl_tx_error_report(msg->trx, RSL_ERR_IE_CONTENT, &dch->chan_nr, NULL, msg); + return rsl_tx_mode_modif_nack(lchan, RSL_ERR_ENCR_UNIMPL); } } -- To view, visit https://gerrit.osmocom.org/8092 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic374a8e5e239ffe37082a54cdb94cb6ac9723e83 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Wed May 9 20:34:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 9 May 2018 20:34:52 +0000 Subject: [MERGED] osmo-bts[master]: osmo-bts-trx: Enable A5/3 cipher support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: osmo-bts-trx: Enable A5/3 cipher support ...................................................................... osmo-bts-trx: Enable A5/3 cipher support This actually should have been working since 2015, when the following patch was merged to libosmcore: commit f8699ca51eeb4f3d34336501abcaf071b4a95a47 Author: Max Date: Wed Mar 25 17:20:31 2015 +0100 gsm: Add A5/3-4 cipher support however, it seems nobody so far bothered to actually enable A5/3 for osmo-bts-trx! Change-Id: I8192d6d07cdb87783bce997456ead673c600f7c0 Closes: OS#3253 --- M src/osmo-bts-trx/main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 6e5a4ca..3b82e42 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -98,7 +98,7 @@ int bts_model_init(struct gsm_bts *bts) { bts->variant = BTS_OSMO_TRX; - bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2); + bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); /* FIXME: this needs to be overridden with the real hardrware * value */ -- To view, visit https://gerrit.osmocom.org/8094 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8192d6d07cdb87783bce997456ead673c600f7c0 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From admin at opensuse.org Wed May 9 21:19:42 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 21:19:42 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af365fd3c6de_51bf3d868c263454@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 329s] [ 265.972907] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 266.704919] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 267.411708] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 268.176277] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 268.916897] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 268.950824] dracut-initqueue[455]: Warning: Could not boot. [ 332s] Starting Setup Virtual Console... [ 332s] [ OK ] Started Setup Virtual Console. [ 332s] Starting Dracut Emergency Shell... [ 332s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 332s] [ 332s] Generating "/run/initramfs/rdsosreport.txt" [ 333s] [ 333s] [ 333s] Entering emergency mode. Exit the shell to continue. [ 333s] Type "journalctl" to view system logs. [ 333s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 333s] after mounting them and attach it to a bug report. [ 333s] [ 333s] [ 367s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 369s] /var/cache/obs/worker/root_24/root: 32525 [ 369s] qemu-system-aarch64: terminating on signal 15 from pid 6657 () [ 369s] ### VM INTERACTION END ### [ 369s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (32516) - No such process [ 369s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 369s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 21:32:33 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 21:32:33 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3690a614c6_51bf3d868c26611c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 332s] [ 268.399406] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 269.093605] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 269.847551] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 270.622045] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 271.386153] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 271.394964] dracut-initqueue[485]: Warning: Could not boot. [ 335s] Starting Setup Virtual Console... [ 335s] [ OK ] Started Setup Virtual Console. [ 335s] Starting Dracut Emergency Shell... [ 335s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 335s] [ 335s] Generating "/run/initramfs/rdsosreport.txt" [ 336s] [ 336s] [ 336s] Entering emergency mode. Exit the shell to continue. [ 336s] Type "journalctl" to view system logs. [ 336s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 336s] after mounting them and attach it to a bug report. [ 336s] [ 336s] [ 368s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 370s] /var/cache/obs/worker/root_15/root: 44611 [ 370s] qemu-system-aarch64: terminating on signal 15 from pid 17612 (fuser) [ 370s] ### VM INTERACTION END ### [ 370s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (44596) - No such process [ 370s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 370s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 21:29:07 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 21:29:07 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af368375a29a_51bf3d868c26537@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 269s] [ 245.774908] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.425587] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.104955] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.735725] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 248.404882] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 248.411640] dracut-initqueue[458]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_16/root: 44466 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 10476 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (44459) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 22:16:42 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 22:16:42 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3735a34dc9_51bf3d868c282870@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 335s] [ 266.898583] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 267.656998] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 268.345881] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 268.985856] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 269.695803] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 269.722355] dracut-initqueue[485]: Warning: Could not boot. [ 338s] Starting Setup Virtual Console... [ 338s] [ OK ] Started Setup Virtual Console. [ 338s] Starting Dracut Emergency Shell... [ 338s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 338s] [ 338s] Generating "/run/initramfs/rdsosreport.txt" [ 338s] [ 338s] [ 338s] Entering emergency mode. Exit the shell to continue. [ 338s] Type "journalctl" to view system logs. [ 338s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 338s] after mounting them and attach it to a bug report. [ 338s] [ 338s] [ 372s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 373s] /var/cache/obs/worker/root_3/root: 44876 [ 373s] qemu-system-aarch64: terminating on signal 15 from pid 21417 () [ 373s] ### VM INTERACTION END ### [ 373s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (44868) - No such process [ 373s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 373s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Wed May 9 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 9 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#29?= In-Reply-To: <2070612033.450.1525819280650.JavaMail.jenkins@jenkins.osmocom.org> References: <2070612033.450.1525819280650.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <303867431.470.1525905680626.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-21720/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-21720/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-21720/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-21720/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-21720/ libtool: install: (cd /tmp/am-dc-21720/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-21720/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-21720/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-21720/ libtool: install: chmod 644 /tmp/am-dc-21720/ libtool: install: ranlib /tmp/am-dc-21720/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-21720/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-21720/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-21720/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-21720/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-21720/ /bin/mkdir -p '/tmp/am-dc-21720/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-21720/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-21720/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-21720/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-21720/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-21720/ libtool: uninstall: rm -f /tmp/am-dc-21720/ /tmp/am-dc-21720/ /tmp/am-dc-21720/ /tmp/am-dc-21720/ /tmp/am-dc-21720/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-21720/ && rm -f html.tar ) ( cd '/tmp/am-dc-21720/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-21720/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Wed May 9 23:00:07 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 23:00:07 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af37d8b6fb40_51bf3d868c2903a2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 319s] [ 269.610380] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 270.247706] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 271.014869] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 271.681245] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 272.376867] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 272.403541] dracut-initqueue[459]: Warning: Could not boot. [ 322s] Starting Setup Virtual Console... [ 322s] [ OK ] Started Setup Virtual Console. [ 322s] Starting Dracut Emergency Shell... [ 322s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 322s] [ 322s] Generating "/run/initramfs/rdsosreport.txt" [ 322s] [ 322s] [ 322s] Entering emergency mode. Exit the shell to continue. [ 322s] Type "journalctl" to view system logs. [ 322s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 322s] after mounting them and attach it to a bug report. [ 322s] [ 322s] [ 358s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 359s] /var/cache/obs/worker/root_8/root: 2198 [ 359s] qemu-system-aarch64: terminating on signal 15 from pid 24908 () [ 359s] ### VM INTERACTION END ### [ 359s] /var/run/obs/worker/8/build/build-vm: line 458: kill: (2183) - No such process [ 359s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 359s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 23:02:59 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 23:02:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af37e40a46f9_51bf3d868c29119a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 322s] [ 264.183107] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 264.875011] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 265.596644] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 266.487142] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 267.217708] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 267.224017] dracut-initqueue[479]: Warning: Could not boot. [ 325s] Starting Setup Virtual Console... [ 325s] [ OK ] Started Setup Virtual Console. [ 325s] Starting Dracut Emergency Shell... [ 326s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 326s] [ 326s] Generating "/run/initramfs/rdsosreport.txt" [ 326s] [ 326s] [ 326s] Entering emergency mode. Exit the shell to continue. [ 326s] Type "journalctl" to view system logs. [ 326s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 326s] after mounting them and attach it to a bug report. [ 326s] [ 326s] [ 363s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 364s] /var/cache/obs/worker/root_29/root: 26546 [ 364s] qemu-system-aarch64: terminating on signal 15 from pid 542 () [ 364s] ### VM INTERACTION END ### [ 364s] /var/run/obs/worker/29/build/build-vm: line 458: kill: (26539) - No such process [ 364s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 364s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 23:16:25 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 23:16:25 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3814b2e87d_51bf3d868c29489a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 324s] [ 267.684346] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 268.478254] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 269.303794] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 269.983236] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 270.641630] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 270.681803] dracut-initqueue[465]: Warning: Could not boot. [ 327s] Starting Setup Virtual Console... [ 327s] [ OK ] Started Setup Virtual Console. [ 328s] Starting Dracut Emergency Shell... [ 328s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 328s] [ 328s] Generating "/run/initramfs/rdsosreport.txt" [ 328s] [ 328s] [ 328s] Entering emergency mode. Exit the shell to continue. [ 328s] Type "journalctl" to view system logs. [ 328s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 328s] after mounting them and attach it to a bug report. [ 328s] [ 328s] [ 362s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 363s] /var/cache/obs/worker/root_26/root: 44500 [ 363s] qemu-system-aarch64: terminating on signal 15 from pid 14171 () [ 363s] ### VM INTERACTION END ### [ 363s] /var/run/obs/worker/26/build/build-vm: line 458: kill: (44488) - No such process [ 363s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 363s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 9 23:56:59 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 09 May 2018 23:56:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af38aea42090_51bf3d868c307515@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 287s] [ 255.533075] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 288s] [ 256.340462] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 288s] [ 256.981985] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 257.625105] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 258.463060] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 258.469300] dracut-initqueue[474]: Warning: Could not boot. [ 290s] Starting Setup Virtual Console... [ 290s] [ OK ] Started Setup Virtual Console. [ 290s] Starting Dracut Emergency Shell... [ 290s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 290s] [ 290s] Generating "/run/initramfs/rdsosreport.txt" [ 291s] [ 291s] [ 291s] Entering emergency mode. Exit the shell to continue. [ 291s] Type "journalctl" to view system logs. [ 291s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 291s] after mounting them and attach it to a bug report. [ 291s] [ 291s] [ 340s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 342s] /var/cache/obs/worker/root_18/root: 32805 [ 342s] qemu-system-aarch64: terminating on signal 15 from pid 13428 (fuser) [ 342s] ### VM INTERACTION END ### [ 342s] /var/run/obs/worker/18/build/build-vm: line 458: kill: (32796) - No such process [ 342s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 342s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu May 10 00:14:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 10 May 2018 00:14:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#456?= Message-ID: <405279701.472.1525911262411.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 111.86 KB...] checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... no checking whether to enable VTY tests... no CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory ' Making all in include make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in src make[2]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:975:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo CXX poll_controller.lo CXX encoding.lo CXX sba.lo CXX decoding.lo CXX llc.lo CXX rlc.lo CXX osmobts_sock.lo CC gprs_codel.lo CXX gprs_coding_scheme.lo CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## -------------------------- ## ## osmo-pcu 0.5.0 test suite. ## ## -------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1261: recipe for target 'check-local' failed make[3]: *** [check-local] Error 1 make[3]: Leaving directory ' Makefile:1095: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:461: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-10 00:14:20.963058683 +0000 +++ 2018-05-10 00:14:21.007058667 +0000 @@ -4805,6 +4805,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink (V(A)==0 .. V(S)==10) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Sending new block at BSN 10, CS=MCS-7 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Complete DL frame, len=512 +../../../src/gprs_rlcmac_meas.cpp:178:40: runtime error: left shift of negative value -999708 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Empty chunk, added LLC dummy command of size 46, drained_since=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Complete DL frame, len=46 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) data block (BSN 10, MCS-7): 10 5d 01 01 01 01 01 01 01 01 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b @@ -4817,6 +4818,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Final ACK received. +../../../src/gprs_rlcmac_meas.cpp:134:42: runtime error: left shift of negative value -999648 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to WAIT RELEASE TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) starting timer T3193 [release (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_WAIT_ACK to GPRS_RLCMAC_DL_ASS_NONE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From admin at opensuse.org Thu May 10 00:27:15 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 00:27:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af391ef81af7_51bf3d868c31599a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 334s] [ 288.635974] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 289.341341] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 290.013001] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 290.725797] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 291.469633] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 292.308498] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 293.053594] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 293.793698] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 294.520236] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 295.339046] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 295.965900] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 342s] [ 296.645742] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 297.425038] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 298.067127] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 344s] [ 298.729273] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 345s] [ 299.381340] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 345s] [ 299.997850] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 300.716520] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] [ 301.419016] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] [ 302.086701] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] /var/cache/obs/worker/root_23/root: 17469 [ 347s] qemu-system-aarch64: terminating on signal 15 from pid 38856 (fuser) [ 348s] ### VM INTERACTION END ### [ 348s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (17461) - No such process [ 348s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 348s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 00:29:50 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 00:29:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af39288b194f_51bf3d868c3167d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 326s] [ 288.665100] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 289.324650] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 290.003074] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 290.676055] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 291.429474] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 291.436030] dracut-initqueue[468]: Warning: Could not boot. [ 329s] Starting Setup Virtual Console... [ 329s] [ OK ] Started Setup Virtual Console. [ 329s] Starting Dracut Emergency Shell... [ 329s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 329s] [ 329s] Generating "/run/initramfs/rdsosreport.txt" [ 329s] [ 329s] [ 329s] Entering emergency mode. Exit the shell to continue. [ 329s] Type "journalctl" to view system logs. [ 329s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 329s] after mounting them and attach it to a bug report. [ 329s] [ 329s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 341s] /var/cache/obs/worker/root_15/root: 29927 [ 341s] qemu-system-aarch64: terminating on signal 15 from pid 46684 (fuser) [ 341s] ### VM INTERACTION END ### [ 341s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (29920) - No such process [ 341s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 341s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 00:34:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 00:34:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af393992e9eb_51bf3d868c317315@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 326s] [ 268.367557] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 269.051609] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 269.796728] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 270.647051] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 271.235551] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 271.242228] dracut-initqueue[475]: Warning: Could not boot. [ 329s] Starting Setup Virtual Console... [ 329s] [ OK ] Started Setup Virtual Console. [ 329s] Starting Dracut Emergency Shell... [ 329s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 329s] [ 329s] Generating "/run/initramfs/rdsosreport.txt" [ 330s] [ 330s] [ 330s] Entering emergency mode. Exit the shell to continue. [ 330s] Type "journalctl" to view system logs. [ 330s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 330s] after mounting them and attach it to a bug report. [ 330s] [ 330s] [ 362s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 363s] /var/cache/obs/worker/root_2/root: 41975 [ 363s] qemu-system-aarch64: terminating on signal 15 from pid 16751 (fuser) [ 363s] ### VM INTERACTION END ### [ 363s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (41946) - No such process [ 363s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 363s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 01:15:16 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 01:15:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af39d338ac80_51bf3d868c32167f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 324s] [ 263.146782] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 263.737183] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 264.341515] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 265.010589] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 265.686389] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 265.714508] dracut-initqueue[462]: Warning: Could not boot. [ 326s] Starting Setup Virtual Console... [ 326s] [ OK ] Started Setup Virtual Console. [ 326s] Starting Dracut Emergency Shell... [ 326s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 326s] [ 326s] Generating "/run/initramfs/rdsosreport.txt" [ 327s] [ 327s] [ 327s] Entering emergency mode. Exit the shell to continue. [ 327s] Type "journalctl" to view system logs. [ 327s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 327s] after mounting them and attach it to a bug report. [ 327s] [ 327s] [ 365s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 366s] /var/cache/obs/worker/root_20/root: 27904 [ 366s] qemu-system-aarch64: terminating on signal 15 from pid 4942 (fuser) [ 366s] ### VM INTERACTION END ### [ 366s] /var/run/obs/worker/20/build/build-vm: line 458: kill: (27891) - No such process [ 366s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 366s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 01:38:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 01:38:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3a2cf4268e_51bf3d868c3248f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 288s] [ 252.508226] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 288s] [ 253.133959] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 253.830477] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 254.520365] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 255.131042] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 255.137609] dracut-initqueue[493]: Warning: Could not boot. [ 290s] Starting Setup Virtual Console... [ 290s] [ OK ] Started Setup Virtual Console. [ 290s] Starting Dracut Emergency Shell... [ 290s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 290s] [ 290s] Generating "/run/initramfs/rdsosreport.txt" [ 291s] [ 291s] [ 291s] Entering emergency mode. Exit the shell to continue. [ 291s] Type "journalctl" to view system logs. [ 291s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 291s] after mounting them and attach it to a bug report. [ 291s] [ 291s] [ 341s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 342s] /var/cache/obs/worker/root_6/root: 16372 [ 342s] qemu-system-aarch64: terminating on signal 15 from pid 2275 () [ 342s] ### VM INTERACTION END ### [ 342s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (16362) - No such process [ 342s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 342s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 02:12:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 02:12:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3aac8a1ff3_51bf3d868c3296bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 310s] [ 271.307403] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 311s] [ 272.035066] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 312s] [ 272.723359] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 312s] [ 273.378441] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 274.077913] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 274.090871] dracut-initqueue[445]: Warning: Could not boot. [ 313s] Starting Setup Virtual Console... [ 313s] [ OK ] Started Setup Virtual Console. [ 313s] Starting Dracut Emergency Shell... [ 313s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 313s] [ 313s] Generating "/run/initramfs/rdsosreport.txt" [ 315s] [ 315s] [ 315s] Entering emergency mode. Exit the shell to continue. [ 315s] Type "journalctl" to view system logs. [ 315s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 315s] after mounting them and attach it to a bug report. [ 315s] [ 315s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_30/root: 27275 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 6246 (fuser) [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/30/build/build-vm: line 458: kill: (27268) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 10 02:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 02:54:27 +0000 Subject: [PATCH] osmo-bsc[master]: dyn TS: init only when both RSL and the Channel OM are estab... Message-ID: Review at https://gerrit.osmocom.org/8095 dyn TS: init only when both RSL and the Channel OM are established Recent Icf6e25ff068e8a2600562d52726ead65e864ec02 changed the dyn_ts_init() hook from bootstrap_rsl() to the Channel OPSTART ACK, but this is not sufficient. Now RBS2k never calls dyn_ts_init(), and we may need to wait for RSL: Dyn TS should actually be initialized only when *both* OML opstart and RSL link are established. To that end, introduce a generalized API to query OML and RSL status and to trigger a timeslot init at the appropriate time. Add gsm_ts_check_init() to be called both when RSL and OML opstart are established: trigger gsm_ts_init() only when both are given. Add gsm_bts_trx_ts->initialized flag to mark whether initialization has already taken place. Add gsm_bts_mark_all_ts_uninitialized() to conveniently clear this flag for all TS in a BTS. Add gsm_bts_model.oml_is_ts_ready() callback so that each BTS implementation can return the OML status of a timeslot in its own OML implementation. Actually, currently all BTS models that need this init mechanism store the TS' OML status in ts->mo.nm_state. While we would in practice correctly init dyn TS by just looking at ts->mo.nm_state, semantically, the decision whether the TS is ready is up to the BTS models' specific OML implementations. >From bootstrap_rsl(), call gsm_ts_check_init(), in case the TS OML Opstart has happened before RSL is established -- applies to all BTS models. For all BTS models: - call gsm_{bts,trx}_mark_all_ts_uninitialized() when OM is torn down, to make sure the TS init mechanism will work a second time. For all BTS models supporting dyn TS, i.e. osmo-bts, nanobts and RBS2k: - implement oml_is_ts_ready(). - call gsm_ts_check_init() when a Channel OM is taken into operation. Any BTS models that don't set oml_is_ts_ready() will see a ts init as soon as RSL is bootstrapped (incidentally, the old dyn TS behavior before recent Icf6e25ff068e8a2600562d52726ead65e864ec02). This firstly fixes dyn TS for RBS2k by re-adding the initial switch to PDCH, and furthermore does so only after both OML TS opstart and RSL are through. This fixes the ttcn3-bsc-tests around dyn TS, since for the osmo-bts-virtual, the RSL is established only after OML opstart on the TS, which was broken by Icf6e25ff068e8a2600562d52726ead65e864ec02. Nokia Site and Siemens BS11 practically do not require this init mechanism, since all that happens there so far is dyn TS init, and these BTS models do not support dyn TS of any kind. A future patch may add oml_is_ts_ready(). Related: OS#3205 Change-Id: I99f29d2ba079f6f4b77f0af12d9784588d2f56b3 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/abis_om2000.c M src/libbsc/abis_rsl.c M src/libbsc/bsc_init.c M src/libbsc/bts_ericsson_rbs2000.c M src/libbsc/bts_ipaccess_nanobts.c M src/libbsc/bts_nokia_site.c M src/libbsc/bts_siemens_bs11.c 8 files changed, 73 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/8095/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f113904..29b97f0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -459,6 +459,8 @@ /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { struct gsm_bts_trx *trx; + bool initialized; + /* number of this timeslot at the TRX */ uint8_t nr; @@ -605,6 +607,7 @@ int (*start)(struct gsm_network *net); int (*oml_rcvmsg)(struct msgb *msg); char * (*oml_status)(const struct gsm_bts *bts); + bool (*oml_is_ts_ready)(const struct gsm_bts_trx_ts *ts); void (*e1line_bind_ops)(struct e1inp_line *line); @@ -1387,4 +1390,8 @@ bool classmark_is_r99(struct gsm_classmark *cm); +void gsm_ts_check_init(struct gsm_bts_trx_ts *ts); +void gsm_trx_mark_all_ts_uninitialized(struct gsm_bts_trx *trx); +void gsm_bts_mark_all_ts_uninitialized(struct gsm_bts *bts); + #endif /* _GSM_DATA_H */ diff --git a/src/libbsc/abis_om2000.c b/src/libbsc/abis_om2000.c index 6057bc6..d533ea1 100644 --- a/src/libbsc/abis_om2000.c +++ b/src/libbsc/abis_om2000.c @@ -2737,8 +2737,10 @@ bts->nr, 255, trx->nr); for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - om2k_mo_init(&trx->ts[i].rbs2000.om2k_mo, OM2K_MO_CLS_TS, + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + om2k_mo_init(&ts->rbs2000.om2k_mo, OM2K_MO_CLS_TS, bts->nr, trx->nr, i); + gsm_ts_check_init(ts); } } diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index b36e496..e6d0cea 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -3017,3 +3017,40 @@ /* Now release it */ return rsl_rf_chan_release(lchan, 0, SACCH_NONE); } + +/* Initial timeslot actions when a timeslot first comes into operation. */ +static bool gsm_ts_init(struct gsm_bts_trx_ts *ts) +{ + dyn_ts_init(ts); + return true; +} + +/* Trigger initial timeslot actions iff both OML and RSL are setup. */ +void gsm_ts_check_init(struct gsm_bts_trx_ts *ts) +{ + struct gsm_bts *bts = ts->trx->bts; + if (bts->model->oml_is_ts_ready + && !bts->model->oml_is_ts_ready(ts)) + return; + if (!ts->trx->rsl_link) + return; + if (ts->initialized) + return; + ts->initialized = gsm_ts_init(ts); +} + +void gsm_trx_mark_all_ts_uninitialized(struct gsm_bts_trx *trx) +{ + int i; + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + ts->initialized = false; + } +} + +void gsm_bts_mark_all_ts_uninitialized(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) + gsm_trx_mark_all_ts_uninitialized(trx); +} diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 92b8c27..5b157c5 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -353,7 +353,9 @@ } for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - generate_ma_for_ts(&trx->ts[i]); + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + generate_ma_for_ts(ts); + gsm_ts_check_init(ts); } } diff --git a/src/libbsc/bts_ericsson_rbs2000.c b/src/libbsc/bts_ericsson_rbs2000.c index 20b498a..9c8b90e 100644 --- a/src/libbsc/bts_ericsson_rbs2000.c +++ b/src/libbsc/bts_ericsson_rbs2000.c @@ -52,6 +52,8 @@ static int shutdown_om(struct gsm_bts *bts) { + gsm_bts_mark_all_ts_uninitialized(bts); + /* FIXME */ return 0; } @@ -172,11 +174,17 @@ e1inp_line_bind_ops(line, &bts_isdn_e1inp_line_ops); } +static bool bts_model_rbs2k_is_ts_ready(const struct gsm_bts_trx_ts *ts) +{ + return ts && ts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + static struct gsm_bts_model model_rbs2k = { .type = GSM_BTS_TYPE_RBS2000, .name = "rbs2000", .start = bts_model_rbs2k_start, .oml_rcvmsg = &abis_om2k_rcvmsg, + .oml_is_ts_ready = bts_model_rbs2k_is_ts_ready, .config_write_bts = &config_write_bts, .e1line_bind_ops = &bts_model_rbs2k_e1line_bind_ops, }; diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index 3eb7e0e..d5b3b21 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -56,12 +56,18 @@ return "disconnected"; } +static bool oml_is_ts_ready(const struct gsm_bts_trx_ts *ts) +{ + return ts && ts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + struct gsm_bts_model bts_model_nanobts = { .type = GSM_BTS_TYPE_NANOBTS, .name = "nanobts", .start = bts_model_nanobts_start, .oml_rcvmsg = &abis_nm_rcvmsg, .oml_status = &get_oml_status, + .oml_is_ts_ready = oml_is_ts_ready, .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, .nm_att_tlvdef = { .def = { @@ -320,7 +326,7 @@ return; } - dyn_ts_init(ts); + gsm_ts_check_init(ts); } static void nm_rx_opstart_ack(struct abis_om_fom_hdr *foh) @@ -426,6 +432,8 @@ llist_for_each_entry(trx, &bts->trx_list, list) ipaccess_drop_rsl(trx); + gsm_bts_mark_all_ts_uninitialized(bts); + bts->ip_access.flags = 0; /* diff --git a/src/libbsc/bts_nokia_site.c b/src/libbsc/bts_nokia_site.c index 67281bb..4a24c39 100644 --- a/src/libbsc/bts_nokia_site.c +++ b/src/libbsc/bts_nokia_site.c @@ -55,6 +55,8 @@ { LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); + gsm_bts_mark_all_ts_uninitialized(bts); + if (!bts->nokia.skip_reset) { if (!bts->nokia.did_reset) abis_nm_reset(bts, 1); @@ -66,6 +68,8 @@ { LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for TRX %u/%u\n", trx->bts->nr, trx->nr); + + gsm_trx_mark_all_ts_uninitialized(trx); } static int shutdown_om(struct gsm_bts *bts) diff --git a/src/libbsc/bts_siemens_bs11.c b/src/libbsc/bts_siemens_bs11.c index 5701e47..2d23517 100644 --- a/src/libbsc/bts_siemens_bs11.c +++ b/src/libbsc/bts_siemens_bs11.c @@ -536,6 +536,8 @@ /* Reset BTS Site manager resource */ abis_nm_bs11_reset_resource(bts); + gsm_bts_mark_all_ts_uninitialized(bts); + return 0; } -- To view, visit https://gerrit.osmocom.org/8095 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99f29d2ba079f6f4b77f0af12d9784588d2f56b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 02:54:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 02:54:27 +0000 Subject: [PATCH] osmo-bsc[master]: dyn TS: allow any pchan type changes, fix for gprs mode none Message-ID: Review at https://gerrit.osmocom.org/8096 dyn TS: allow any pchan type changes, fix for gprs mode none In rsl_chan_activate_lchan(), remove a condition to also allow switching pchan modes when not in PDCH mode, which is actually not needed and would hinder switching from pchan=NONE or between TCH/F <-> TCH/H. Refactor the part where lchan_alloc() decides to switch a pchan mode into a separate function, ts_usable_as_pchan(), which transparently checks both dyn TS kinds for: - Already in switchover? (missing check for ip.access style dyn TS) - Is the lchan->state in error? (missing check for ip.access style dyn TS) - Switch from pchan=NONE? (missing feature for Osmocom style dyn TS, for proper handling with gprs mode none) - Switch between TCH/F <-> TCH/H when all subslots are unused? (missing feature for Osmocom style dyn TS, also useful for gprs mode none) Always pass the desired pchan in the dyn_as_pchan argument to the _lc_find_* functions to make switchover decisions transparent. Use the _lc_dyn_find_bts() function for ip.access style dyn TS for the same reason. Related: OS#3244 Change-Id: I72d5d833b186b1e1925d513885b405d8c19aa496 --- M src/libbsc/abis_rsl.c M src/libbsc/chan_alloc.c 2 files changed, 96 insertions(+), 68 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/8096/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index e6d0cea..167ef6b 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -569,7 +569,6 @@ * released. */ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH && lchan->ts->dyn.pchan_is == lchan->ts->dyn.pchan_want) { enum gsm_phys_chan_config pchan_want; pchan_want = pchan_for_lchant(lchan->type); diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 9668968..bdb9d9d 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -133,9 +133,86 @@ return count; } +static bool ts_usable_as_pchan(struct gsm_bts_trx_ts *ts, + enum gsm_phys_chan_config as_pchan) +{ + switch (ts->pchan) { + case GSM_PCHAN_TCH_F_PDCH: + if (ts->flags & TS_F_PDCH_PENDING_MASK) { + /* currently being switched over. Not usable. */ + return false; + } + switch (as_pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_PDCH: + /* continue to check below. */ + break; + default: + return false; + } + break; + + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + /* currently being switched over. Not usable. */ + return false; + } + switch (as_pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + case GSM_PCHAN_PDCH: + /* continue to check below. */ + break; + default: + return false; + } + break; + + default: + /* static timeslots never switch. */ + return ts->pchan == as_pchan; + } + + /* Dynamic timeslots -- Checks depending on the current actual pchan mode: */ + switch (ts_pchan(ts)) { + case GSM_PCHAN_NONE: + /* Not initialized, possibly because GPRS was disabled. We may switch. */ + return true; + + case GSM_PCHAN_PDCH: + /* This slot is in PDCH mode and available to switch pchan mode. But check for + * error states: */ + if (ts->lchan->state != LCHAN_S_NONE && ts->lchan->state != LCHAN_S_ACTIVE) + return false; + return true; + + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + /* No need to switch at all? */ + if (ts_pchan(ts) == as_pchan) + return true; + + /* If any lchan is in use, we can't change the pchan kind */ + { + int ss; + int subslots = ts_subslots(ts); + for (ss = 0; ss < subslots; ss++) { + struct gsm_lchan *lc = &ts->lchan[ss]; + if (lc->type != GSM_LCHAN_NONE || lc->state != LCHAN_S_NONE) + return false; + } + } + return true; + + default: + /* Not implemented. */ + return false; + } +} + static struct gsm_lchan * _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, - enum gsm_phys_chan_config dyn_as_pchan) + enum gsm_phys_chan_config as_pchan) { struct gsm_bts_trx_ts *ts; int j, start, stop, dir, ss; @@ -160,72 +237,21 @@ ts = &trx->ts[j]; if (!ts_is_usable(ts)) continue; + /* The caller first selects what kind of TS to search in, e.g. looking for exact + * GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_TCH_F_TCH_H_PDCH... */ if (ts->pchan != pchan) continue; - - /* - * Allocation for fully dynamic timeslots - * (does not apply for ip.access style GSM_PCHAN_TCH_F_PDCH) - * - * Note the special nature of a dynamic timeslot in PDCH mode: - * in PDCH mode, typically, lchan->type is GSM_LCHAN_NONE and - * lchan->state is LCHAN_S_NONE -- an otherwise unused slot - * becomes PDCH implicitly. In the same sense, this channel - * allocator will never be asked to find an available PDCH - * slot; only TCH/F or TCH/H will be requested, and PDCH mode - * means that it is available for switchover. - * - * A dynamic timeslot in PDCH mode may be switched to TCH/F or - * TCH/H. If a dyn TS is already in TCH/F or TCH/H mode, it - * means that it is in use and its mode can't be switched. - * - * The logic concerning channels for TCH/F is trivial: there is - * only one channel, so a dynamic TS in TCH/F mode is already - * taken and not available for allocation. For TCH/H, we need - * to check whether a dynamic timeslot is already in TCH/H mode - * and whether one of the two channels is still available. - */ - switch (pchan) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - if (ts->dyn.pchan_is != ts->dyn.pchan_want) { - /* The TS's mode is being switched. Not - * available anymore/yet. */ - DEBUGP(DRLL, "%s already in switchover\n", - gsm_ts_and_pchan_name(ts)); - continue; - } - if (ts->dyn.pchan_is == GSM_PCHAN_PDCH) { - /* This slot is available. Still check for - * error states to be sure; in all cases the - * first lchan will be used. */ - if (ts->lchan->state != LCHAN_S_NONE - && ts->lchan->state != LCHAN_S_ACTIVE) - continue; - return ts->lchan; - } - if (ts->dyn.pchan_is != dyn_as_pchan) - /* not applicable. */ - continue; - /* The requested type matches the dynamic timeslot's - * current mode. A channel may still be available - * (think TCH/H). */ - check_subslots = ts_subslots(ts); - break; - - case GSM_PCHAN_TCH_F_PDCH: - /* Available for voice when in PDCH mode */ - if (ts_pchan(ts) != GSM_PCHAN_PDCH) - continue; - /* Subslots of a PDCH ts don't need to be checked. */ + /* Next, is this timeslot in or can it be switched to the pchan we want to use it for? */ + if (!ts_usable_as_pchan(ts, as_pchan)) + continue; + /* If we need to switch it, after above check we are also allowed to switch it, and we + * will always use the first lchan after the switch. Return that lchan and rely on the + * caller to perform the pchan switchover. */ + if (ts_pchan(ts) != as_pchan) return ts->lchan; - default: - /* Not a dynamic channel, there is only one pchan kind: */ - check_subslots = ts_subslots(ts); - break; - } - - /* Is a sub-slot still available? */ + /* TS is in desired pchan mode. Go ahead and check for an available lchan. */ + check_subslots = ts_subslots(ts); for (ss = 0; ss < check_subslots; ss++) { struct gsm_lchan *lc = &ts->lchan[ss]; if (lc->type == GSM_LCHAN_NONE && @@ -264,7 +290,7 @@ static struct gsm_lchan * _lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) { - return _lc_dyn_find_bts(bts, pchan, GSM_PCHAN_NONE); + return _lc_dyn_find_bts(bts, pchan, pchan); } /* Allocate a logical channel. @@ -320,7 +346,8 @@ /* try dynamic TCH/F_PDCH */ if (lchan == NULL) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); /* TCH/F_PDCH will be used as TCH/F */ if (lchan) type = GSM_LCHAN_TCH_F; @@ -349,7 +376,8 @@ } /* If we don't have TCH/H either, try dynamic TCH/F_PDCH */ if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); /* TCH/F_PDCH used as TCH/F -- here, type is already * set to GSM_LCHAN_TCH_F, but for clarity's sake... */ if (lchan) @@ -396,7 +424,8 @@ */ /* If we don't have TCH/F either, try dynamic TCH/F_PDCH */ if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); if (lchan) type = GSM_LCHAN_TCH_F; } -- To view, visit https://gerrit.osmocom.org/8096 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72d5d833b186b1e1925d513885b405d8c19aa496 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From admin at opensuse.org Thu May 10 03:04:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 03:04:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3b6fb24e69_51bf3d868c33935@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 319s] [ 274.220813] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 274.846570] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 275.505844] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 276.146389] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 276.815662] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 276.823865] dracut-initqueue[458]: Warning: Could not boot. [ 322s] Starting Setup Virtual Console... [ 322s] [ OK ] Started Setup Virtual Console. [ 322s] Starting Dracut Emergency Shell... [ 322s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 322s] [ 322s] Generating "/run/initramfs/rdsosreport.txt" [ 322s] [ 322s] [ 322s] Entering emergency mode. Exit the shell to continue. [ 322s] Type "journalctl" to view system logs. [ 322s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 322s] after mounting them and attach it to a bug report. [ 322s] [ 322s] [ 337s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 337s] /var/cache/obs/worker/root_17/root: 42909 [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 31945 () [ 337s] ### VM INTERACTION END ### [ 337s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (42902) - No such process [ 338s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 338s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 01:59:16 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 01:59:16 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3a7814a946_51bf3d868c3278ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 13s] [67/70] preinstalling sysvinit-utils... [ 13s] [68/70] preinstalling e2fsprogs... [ 14s] [69/70] preinstalling sysv-rc... [ 14s] [70/70] preinstalling initscripts... [ 14s] [ 14s] [1/1] preinstalling libdevmapper1.02.1... [ 15s] copying packages... [ 18s] reordering...cycle: libc6 -> libgcc1 [ 18s] breaking dependency libgcc1 -> libc6 [ 18s] cycle: debhelper -> dh-autoreconf [ 18s] breaking dependency debhelper -> dh-autoreconf [ 18s] cycle: dh-strip-nondeterminism -> debhelper [ 18s] breaking dependency debhelper -> dh-strip-nondeterminism [ 18s] done [ 18s] objdump: /boot/Image.guest: File format not recognized [ 21s] booting kvm... [ 22s] ### VM INTERACTION START ### [ 22s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image.guest -initrd /boot/initrd.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_6/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 22s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_6/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 22s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_6/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 328s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_6/root: 24789 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 30317 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (24757) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 10 03:17:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:17:56 +0000 Subject: [PATCH] osmo-bts[master]: dyn TS: be less strict on chan_nr, to allow arbitrary pchan ... Message-ID: Review at https://gerrit.osmocom.org/8097 dyn TS: be less strict on chan_nr, to allow arbitrary pchan switches To allow switching a dyn TS also between TCH/H <-> TCH/F and anything else, don't thwart RSL messages just because their chan_nr doesn't reflect the current pchan mode. For dyn TS, leave that to message handling. In particular, a TS switch is invoked by a Chan Activ message, in which case the current pchan by definition mismatches the incoming chan_nr's reflected channel type. With this patch, I have tested successful direct TCH/H<->TCH/F switchover on sysmoBTS, with osmo-bsc patch I72d5d833b186b1e1925d513885b405d8c19aa496 (and 'msc'/'codec-list' vty config to change TCH kinds while gprs mode was none). Change-Id: I19e5e509101ec91204de9baff04582d99bc8dcb8 --- M src/common/gsm_data_shared.c 1 file changed, 4 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/8097/1 diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 328b57e..2a1f9c8 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -716,19 +716,13 @@ lch_idx = 0; /* TCH/F */ if (ts->pchan != GSM_PCHAN_TCH_F && ts->pchan != GSM_PCHAN_PDCH && - ts->pchan != GSM_PCHAN_TCH_F_PDCH - && !(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && (ts->dyn.pchan_is == GSM_PCHAN_TCH_F - || ts->dyn.pchan_is == GSM_PCHAN_NONE - || ts->dyn.pchan_want == GSM_PCHAN_TCH_F))) + ts->pchan != GSM_PCHAN_TCH_F_PDCH && + ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH) ok = false; } else if ((cbits & 0x1e) == 0x02) { lch_idx = cbits & 0x1; /* TCH/H */ - if (ts->pchan != GSM_PCHAN_TCH_H - && !(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && (ts->dyn.pchan_is == GSM_PCHAN_TCH_H - || ts->dyn.pchan_is == GSM_PCHAN_NONE - || ts->dyn.pchan_want == GSM_PCHAN_TCH_H))) + if (ts->pchan != GSM_PCHAN_TCH_H && + ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH) ok = false; } else if ((cbits & 0x1c) == 0x04) { lch_idx = cbits & 0x3; /* SDCCH/4 */ -- To view, visit https://gerrit.osmocom.org/8097 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19e5e509101ec91204de9baff04582d99bc8dcb8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From admin at opensuse.org Thu May 10 02:02:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 02:02:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3a87346dbb_51bf3d868c32841e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 289s] [ 258.056108] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 258.748078] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 290s] [ 259.460723] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 291s] [ 260.137201] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 292s] [ 260.806194] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 292s] [ 260.813245] dracut-initqueue[456]: Warning: Could not boot. [ 292s] Starting Setup Virtual Console... [ 292s] [ OK ] Started Setup Virtual Console. [ 292s] Starting Dracut Emergency Shell... [ 292s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 292s] [ 292s] Generating "/run/initramfs/rdsosreport.txt" [ 292s] [ 292s] [ 292s] Entering emergency mode. Exit the shell to continue. [ 292s] Type "journalctl" to view system logs. [ 292s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 292s] after mounting them and attach it to a bug report. [ 292s] [ 292s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_21/root: 20457 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 47289 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/21/build/build-vm: line 458: kill: (20447) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 03:30:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 03:30:25 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3bcd6ed32_51bf3d868c344033@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 321s] [ 281.204438] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 281.826838] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 282.485707] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 283.156951] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 283.805781] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 284.476808] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 285.116480] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 285.787609] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 286.435795] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 287.036819] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 287.686070] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 288.326598] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 288.996061] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 289.646693] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 290.335875] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 290.966947] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 291.585575] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 292.217080] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] [ 292.825875] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 293.446891] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] /var/cache/obs/worker/root_9/root: 15294 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 46467 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (15279) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 03:40:42 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 03:40:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3bf4c1363f_51bf3d868c3456b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 334s] [ 296.158894] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 296.950431] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 297.644363] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 298.337569] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 299.078545] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 299.726713] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 300.435680] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 301.096394] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 301.686831] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 302.530987] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 303.176840] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 342s] [ 303.864445] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 304.480152] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 305.176964] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 305.899673] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 345s] [ 306.637132] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 307.375342] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 308.192437] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] [ 308.883039] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 348s] [ 309.583432] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 348s] /var/cache/obs/worker/root_11/root: 22855 [ 348s] qemu-system-aarch64: terminating on signal 15 from pid 1339 (fuser) [ 348s] ### VM INTERACTION END ### [ 348s] /var/run/obs/worker/11/build/build-vm: line 458: kill: (22844) - No such process [ 348s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 348s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:00 +0000 Subject: [PATCH] osmo-bsc[master]: debug log: verbosely log all lchan alloc choices Message-ID: Review at https://gerrit.osmocom.org/8098 debug log: verbosely log all lchan alloc choices Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 --- M src/libbsc/chan_alloc.c 1 file changed, 43 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/8098/1 diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index bdb9d9d..369781b 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -37,21 +37,29 @@ bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { - if (!trx_is_usable(ts->trx)) + if (!trx_is_usable(ts->trx)) { + LOGP(DRLL, LOGL_DEBUG, "%s not usable\n", gsm_trx_name(ts->trx)); return false; + } /* If a TCH/F_PDCH TS is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) { - if (ts->flags & TS_F_PDCH_PENDING_MASK) + if (ts->flags & TS_F_PDCH_PENDING_MASK) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } /* If a dynamic channel is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { - if (ts->dyn.pchan_is != ts->dyn.pchan_want) + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } return true; @@ -218,8 +226,14 @@ int j, start, stop, dir, ss; int check_subslots; - if (!trx_is_usable(trx)) +#define LOGPLCHANALLOC(fmt, args...) \ + LOGP(DRLL, LOGL_DEBUG, "looking for lchan %s as %s: " fmt, \ + gsm_pchan_name(pchan), gsm_pchan_name(as_pchan), ## args) + + if (!trx_is_usable(trx)) { + LOGPLCHANALLOC("%s trx not usable\n", gsm_trx_name(trx)); return NULL; + } if (trx->bts->chan_alloc_reverse) { /* check TS 7..0 */ @@ -235,32 +249,50 @@ for (j = start; j != stop; j += dir) { ts = &trx->ts[j]; - if (!ts_is_usable(ts)) + if (!ts_is_usable(ts)) { + LOGPLCHANALLOC("%s not usable\n", gsm_ts_and_pchan_name(ts)); continue; + } /* The caller first selects what kind of TS to search in, e.g. looking for exact * GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_TCH_F_TCH_H_PDCH... */ - if (ts->pchan != pchan) + if (ts->pchan != pchan) { + LOGPLCHANALLOC("%s is != %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(pchan)); continue; + } /* Next, is this timeslot in or can it be switched to the pchan we want to use it for? */ - if (!ts_usable_as_pchan(ts, as_pchan)) + if (!ts_usable_as_pchan(ts, as_pchan)) { + LOGPLCHANALLOC("%s is not usable as %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); continue; + } /* If we need to switch it, after above check we are also allowed to switch it, and we * will always use the first lchan after the switch. Return that lchan and rely on the * caller to perform the pchan switchover. */ - if (ts_pchan(ts) != as_pchan) + if (ts_pchan(ts) != as_pchan) { + LOGPLCHANALLOC("%s is a match, will switch to %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); return ts->lchan; + } /* TS is in desired pchan mode. Go ahead and check for an available lchan. */ check_subslots = ts_subslots(ts); for (ss = 0; ss < check_subslots; ss++) { struct gsm_lchan *lc = &ts->lchan[ss]; if (lc->type == GSM_LCHAN_NONE && - lc->state == LCHAN_S_NONE) + lc->state == LCHAN_S_NONE) { + LOGPLCHANALLOC("%s ss=%d is available\n", gsm_ts_and_pchan_name(ts), + lc->nr); return lc; + } + LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s not suitable\n", + gsm_ts_and_pchan_name(ts), lc->nr, gsm_lchant_name(lc->type), + gsm_lchans_name(lc->state)); } } return NULL; +#undef LOGPLCHANALLOC } static struct gsm_lchan * @@ -308,6 +340,8 @@ struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; + LOGP(DRLL, LOGL_DEBUG, "bts-%d lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); + switch (type) { case GSM_LCHAN_SDCCH: if (bts->chan_alloc_reverse) { -- To view, visit https://gerrit.osmocom.org/8098 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:00 +0000 Subject: [PATCH] osmo-bsc[master]: deprecate dyn_ts_allow_tch_f and by default allow all TCH Message-ID: Review at https://gerrit.osmocom.org/8099 deprecate dyn_ts_allow_tch_f and by default allow all TCH In osmo-nitb, the way TCH lchans were assigned often resulted in mismatching TCH kinds, causing problems in the lack of transcoding. Hence dyn_ts_allow_tch_f was introduced as a workaround. Now however, we always assign an SDCCH to a requesting MS first, and only later assign a TCH channel, which then adheres to the codec list configured at 'msc' in the vty config. Hence it is now considerably harder to obtain a mismatch. Furthermore, forcing specific codecs is possible by simply omitting the unwanted ones from the msc config's codec-list. The equivalent of 'dyn_ts_allow_tch_f 0' could be e.g. 'codec-list hr3 hr2 hr1'. Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e --- M src/libbsc/bsc_vty.c M src/libbsc/net_init.c 2 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/99/8099/1 diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index 1efca0c..ea4c8d0 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -1001,8 +1001,8 @@ VTY_OUT_TIMER(3119); VTY_OUT_TIMER(3122); VTY_OUT_TIMER(3141); - vty_out(vty, " dyn_ts_allow_tch_f %d%s", - gsmnet->dyn_ts_allow_tch_f ? 1 : 0, VTY_NEWLINE); + if (!gsmnet->dyn_ts_allow_tch_f) + vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE); if (gsmnet->tz.override != 0) { if (gsmnet->tz.dst) vty_out(vty, " timezone %d %d %d%s", @@ -4615,7 +4615,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_net_dyn_ts_allow_tch_f, +DEFUN_DEPRECATED(cfg_net_dyn_ts_allow_tch_f, cfg_net_dyn_ts_allow_tch_f_cmd, "dyn_ts_allow_tch_f (0|1)", "Allow or disallow allocating TCH/F on TCH_F_TCH_H_PDCH timeslots\n" @@ -4624,6 +4624,8 @@ { struct gsm_network *gsmnet = gsmnet_from_vty(vty); gsmnet->dyn_ts_allow_tch_f = atoi(argv[0]) ? true : false; + vty_out(vty, "%% dyn_ts_allow_tch_f is deprecated, rather use msc/codec-list to pick codecs%s", + VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index d5ea5b2..f03a2e1 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -52,6 +52,8 @@ .mnc = 1, }; + net->dyn_ts_allow_tch_f = true; + /* Permit a compile-time default of A5/3 and A5/1 */ net->a5_encryption_mask = (1 << 3) | (1 << 1); -- To view, visit https://gerrit.osmocom.org/8099 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:00 +0000 Subject: [PATCH] osmo-bsc[master]: fix default fallbacks in audio_support_to_gsm88() Message-ID: Review at https://gerrit.osmocom.org/8100 fix default fallbacks in audio_support_to_gsm88() For audio->hr == true, use HR1, and for hr == false use FR1; not vice versa. Change-Id: Ifb4dba7c8e9c1d0a22a007355fbd2eda57e789d3 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/8100/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3f7e4f8..dcc6b9f 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -61,7 +61,7 @@ default: LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", audio->ver); - return GSM0808_PERM_FR1; + return GSM0808_PERM_HR1; } } else { switch (audio->ver) { @@ -77,7 +77,7 @@ default: LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", audio->ver); - return GSM0808_PERM_HR1; + return GSM0808_PERM_FR1; } } } -- To view, visit https://gerrit.osmocom.org/8100 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb4dba7c8e9c1d0a22a007355fbd2eda57e789d3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:01 +0000 Subject: [PATCH] osmo-bsc[master]: log: indicate hr/fr in audio_support_to_gsm88() error Message-ID: Review at https://gerrit.osmocom.org/8101 log: indicate hr/fr in audio_support_to_gsm88() error Change-Id: Iaaa710d0274fe813d227cb658d82a24db68c4161 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/8101/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index dcc6b9f..bfa4091 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -59,7 +59,7 @@ return GSM0808_PERM_HR3; break; default: - LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", + LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: hr%d, using hr1 instead\n", audio->ver); return GSM0808_PERM_HR1; } @@ -75,7 +75,7 @@ return GSM0808_PERM_FR3; break; default: - LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", + LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: fr%d, using fr1 instead\n", audio->ver); return GSM0808_PERM_FR1; } -- To view, visit https://gerrit.osmocom.org/8101 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaaa710d0274fe813d227cb658d82a24db68c4161 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:01 +0000 Subject: [PATCH] osmo-bsc[master]: cosmetic: dyn ts init: undup logging for gprs = none Message-ID: Review at https://gerrit.osmocom.org/8102 cosmetic: dyn ts init: undup logging for gprs = none Reshuffle the decision not to activate PDCH when GPRS is off: Even though all current callers should avoid passing a PDCH activation in case GPRS is off, it's a better idea to not assert on it and crash osmo-bsc. Move the decision to omit PDCH activation and logging about it into the actual functions that do PDCH activation. If PDCH activation is skipped, the lchan then just stays as it was, and that's what it should anyway be doing. Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d --- M src/libbsc/abis_rsl.c M src/libbsc/bsc_dyn_ts.c 2 files changed, 20 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/8102/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 167ef6b..ffbf630 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -2495,6 +2495,16 @@ return abis_rsl_sendmsg(msg); } +static bool check_gprs_enabled(struct gsm_bts_trx_ts *ts) +{ + if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { + LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none': not activating PDCH.\n", + gsm_ts_and_pchan_name(ts)); + return false; + } + return true; +} + int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act) { struct msgb *msg = rsl_msgb_alloc(); @@ -2512,8 +2522,9 @@ } if (act){ - /* Callers should heed the GPRS mode. */ - OSMO_ASSERT(ts->trx->bts->gprs.mode != BTS_GPRS_NONE); + if (!check_gprs_enabled(ts)) + return -ENOTSUP; + msg_type = RSL_MT_IPAC_PDCH_ACT; ts->flags |= TS_F_PDCH_ACT_PENDING; } else { @@ -2647,8 +2658,6 @@ int rc = -EIO; OSMO_ASSERT(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH); - DEBUGP(DRSL, "%s starting switchover to %s\n", - gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan)); if (ts->dyn.pchan_is != ts->dyn.pchan_want) { LOGP(DRSL, LOGL_ERROR, @@ -2680,6 +2689,12 @@ } } + if (to_pchan == GSM_PCHAN_PDCH && !check_gprs_enabled(ts)) + return -ENOTSUP; + + DEBUGP(DRSL, "%s starting switchover to %s\n", + gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan)); + /* Record that we're busy switching. */ ts->dyn.pchan_want = to_pchan; diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index aa3c252..6a1cff7 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/src/libbsc/bsc_dyn_ts.c @@ -27,31 +27,14 @@ { int rc; - if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { - LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':" - " not activating PDCH.\n", - gsm_ts_and_pchan_name(ts)); - return; - } - - LOGP(DRSL, LOGL_DEBUG, "%s: trying to PDCH ACT\n", - gsm_ts_and_pchan_name(ts)); - rc = rsl_ipacc_pdch_activate(ts, 1); - if (rc != 0) + if (rc != 0 && rc != -ENOTSUP) LOGP(DRSL, LOGL_ERROR, "%s %s: PDCH ACT failed\n", gsm_ts_name(ts), gsm_pchan_name(ts->pchan)); } void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) { - if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { - LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':" - " not activating PDCH.\n", - gsm_ts_and_pchan_name(ts)); - return; - } - dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); } -- To view, visit https://gerrit.osmocom.org/8102 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:47:52 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:47:52 +0000 Subject: [ABANDON] osmo-bsc[master]: prevent ARFCN+BSIC collisions in config In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. Change subject: prevent ARFCN+BSIC collisions in config ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7814 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia7c38188ccbad5d8b7398e3e5220015e62c08c8b Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr From gerrit-no-reply at lists.osmocom.org Thu May 10 03:51:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 10 May 2018 03:51:02 +0000 Subject: [PATCH] osmo-bsc[master]: debug log: verbosely log all lchan alloc choices In-Reply-To: References: Message-ID: debug log: verbosely log all lchan alloc choices Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 --- M src/libbsc/chan_alloc.c 1 file changed, 40 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/98/8098/2 diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index bdb9d9d..d773382 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -37,21 +37,29 @@ bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { - if (!trx_is_usable(ts->trx)) + if (!trx_is_usable(ts->trx)) { + LOGP(DRLL, LOGL_DEBUG, "%s not usable\n", gsm_trx_name(ts->trx)); return false; + } /* If a TCH/F_PDCH TS is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) { - if (ts->flags & TS_F_PDCH_PENDING_MASK) + if (ts->flags & TS_F_PDCH_PENDING_MASK) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } /* If a dynamic channel is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { - if (ts->dyn.pchan_is != ts->dyn.pchan_want) + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } return true; @@ -218,8 +226,14 @@ int j, start, stop, dir, ss; int check_subslots; - if (!trx_is_usable(trx)) +#define LOGPLCHANALLOC(fmt, args...) \ + LOGP(DRLL, LOGL_DEBUG, "looking for lchan %s as %s: " fmt, \ + gsm_pchan_name(pchan), gsm_pchan_name(as_pchan), ## args) + + if (!trx_is_usable(trx)) { + LOGPLCHANALLOC("%s trx not usable\n", gsm_trx_name(trx)); return NULL; + } if (trx->bts->chan_alloc_reverse) { /* check TS 7..0 */ @@ -239,28 +253,44 @@ continue; /* The caller first selects what kind of TS to search in, e.g. looking for exact * GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_TCH_F_TCH_H_PDCH... */ - if (ts->pchan != pchan) + if (ts->pchan != pchan) { + LOGPLCHANALLOC("%s is != %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(pchan)); continue; + } /* Next, is this timeslot in or can it be switched to the pchan we want to use it for? */ - if (!ts_usable_as_pchan(ts, as_pchan)) + if (!ts_usable_as_pchan(ts, as_pchan)) { + LOGPLCHANALLOC("%s is not usable as %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); continue; + } /* If we need to switch it, after above check we are also allowed to switch it, and we * will always use the first lchan after the switch. Return that lchan and rely on the * caller to perform the pchan switchover. */ - if (ts_pchan(ts) != as_pchan) + if (ts_pchan(ts) != as_pchan) { + LOGPLCHANALLOC("%s is a match, will switch to %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); return ts->lchan; + } /* TS is in desired pchan mode. Go ahead and check for an available lchan. */ check_subslots = ts_subslots(ts); for (ss = 0; ss < check_subslots; ss++) { struct gsm_lchan *lc = &ts->lchan[ss]; if (lc->type == GSM_LCHAN_NONE && - lc->state == LCHAN_S_NONE) + lc->state == LCHAN_S_NONE) { + LOGPLCHANALLOC("%s ss=%d is available\n", gsm_ts_and_pchan_name(ts), + lc->nr); return lc; + } + LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s not suitable\n", + gsm_ts_and_pchan_name(ts), lc->nr, gsm_lchant_name(lc->type), + gsm_lchans_name(lc->state)); } } return NULL; +#undef LOGPLCHANALLOC } static struct gsm_lchan * @@ -308,6 +338,8 @@ struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; + LOGP(DRLL, LOGL_DEBUG, "bts-%d lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); + switch (type) { case GSM_LCHAN_SDCCH: if (bts->chan_alloc_reverse) { -- To view, visit https://gerrit.osmocom.org/8098 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder From admin at opensuse.org Thu May 10 04:18:07 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 04:18:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3c8136a52c_51bf3d868c353345@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 363s] [ 299.919831] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 364s] [ 300.568788] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 365s] [ 301.190918] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 365s] [ 301.792257] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 366s] [ 302.539567] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 367s] [ 303.215832] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 367s] [ 303.867144] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 368s] [ 304.509769] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 369s] [ 305.146383] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 369s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 369s] [ 305.796789] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 369s] [ 305.803694] dracut-initqueue[461]: Warning: Could not boot. [ 369s] Starting Setup Virtual Console... [ 369s] [ OK ] Started Setup Virtual Console. [ 369s] Starting Dracut Emergency Shell... [ 370s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 370s] [ 370s] Generating "/run/initramfs/rdsosreport.txt" [ 375s] [ 375s] [ 375s] Entering emergency mode. Exit the shell to continue. [ 375s] T/var/cache/obs/worker/root_6/root: 29596 [ 375s] ypqemu-system-aarch64: terminating on signal 15 from pid 3353 () [ 375s] e### VM INTERACTION END ### [ 375s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (29585) - No such process [ 375s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 375s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 04:22:59 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 04:22:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af3c945e63a8_51bf3d868c360982@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 305s] [ 257.656639] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 306s] [ 258.407351] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 307s] [ 259.098133] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 307s] [ 259.727334] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 308s] [ 260.393702] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 308s] [ 260.405743] dracut-initqueue[480]: Warning: Could not boot. [ 308s] Starting Setup Virtual Console... [ 308s] [ OK ] Started Setup Virtual Console. [ 308s] Starting Dracut Emergency Shell... [ 308s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 308s] [ 308s] Generating "/run/initramfs/rdsosreport.txt" [ 309s] [ 309s] [ 309s] Entering emergency mode. Exit the shell to continue. [ 309s] Type "journalctl" to view system logs. [ 309s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 309s] after mounting them and attach it to a bug report. [ 309s] [ 309s] [ 355s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 356s] /var/cache/obs/worker/root_3/root: 40802 [ 356s] qemu-system-aarch64: terminating on signal 15 from pid 13075 (fuser) [ 356s] ### VM INTERACTION END ### [ 356s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (40784) - No such process [ 356s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 356s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu May 10 07:36:03 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 10 May 2018 07:36:03 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#457?= In-Reply-To: <405279701.472.1525911262411.JavaMail.jenkins@jenkins.osmocom.org> References: <405279701.472.1525911262411.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1911825531.483.1525937763273.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu May 10 08:37:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:37:18 +0000 Subject: [PATCH] libosmocore[master]: Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/5185 to look at the new patch set (#2). Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd Linux offers file descriptor based periodic (interval) timers, which can achieve a higher precision than our userspace based timers and which can be slave'd to CLOCK_MONOTINIC or other clock sources. Let's add some code for osmo_fd wrapped versions that integrate well with our select() abstraction. The code has been used in osmo-bts-trx since June 2017 (change-id I51b19adde14ebb7ef3bb863d45e06243c323e22e), and I'm just renaming and moving it to libosmocore here. After a merge, the osmo-bts implementations can be removed in favor if this one. Change-Id: Ibeffba7c997252c003723bcd5d14122c4ded2fe7 --- M configure.ac M include/osmocom/core/select.h M src/select.c 3 files changed, 74 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/5185/2 diff --git a/configure.ac b/configure.ac index 6f56176..6b9c66f 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ dnl checks for header files AC_HEADER_STDC -AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h netinet/tcp.h) +AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h) # for src/conv.c AC_FUNC_ALLOCA AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""]) diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index b6fed3c..1ba6b83 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -6,6 +6,7 @@ #include #include +#include /*! \defgroup select Select loop abstraction * @{ @@ -54,4 +55,10 @@ int osmo_fd_fill_fds(void *readset, void *writeset, void *exceptset); int osmo_fd_disp_fds(void *readset, void *writeset, void *exceptset); +/* timerfd integration */ +int osmo_timerfd_disable(struct osmo_fd *ofd); +int osmo_timerfd_schedule(struct osmo_fd *ofd, const struct timespec *first, + const struct timespec *interval); +int osmo_timerfd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data); + /*! @} */ diff --git a/src/select.c b/src/select.c index 1c62e01..0b115c6 100644 --- a/src/select.c +++ b/src/select.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -270,6 +271,71 @@ return NULL; } +#ifdef HAVE_SYS_TIMERFD_H +#include + +/*! disable the osmocom-wrapped timerfd */ +int osmo_timerfd_disable(struct osmo_fd *ofd) +{ + const struct itimerspec its_null = { + .it_value = { 0, 0 }, + .it_interval = { 0, 0 }, + }; + return timerfd_settime(ofd->fd, 0, &its_null, NULL); +} + +/*! schedule the osmcoom-wrapped timerfd to occur first at \a first, then periodically at \a interval + * \param[in] ofd Osmocom wrapped timerfd + * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) + * \param[in] interval Time interval at which subsequent timer shall fire + * \returns 0 on success; negative on error */ +int osmo_timerfd_schedule(struct osmo_fd *ofd, const struct timespec *first, + const struct timespec *interval) +{ + struct itimerspec its; + + if (ofd->fd < 0) + return -EINVAL; + + /* first expiration */ + if (first) + its.it_value = *first; + else + its.it_value = *interval; + /* repeating interval */ + its.it_interval = *interval; + + return timerfd_settime(ofd->fd, 0, &its, NULL); +} + +/*! setup osmocom-wrapped timerfd + * \param[inout] ofd Osmocom-wrapped timerfd on which to operate + * \param[in] cb Call-back function called when timerfd becomes readable + * \param[in] data Opaque data to be passed on to call-back + * \returns 0 on success; negative on error + * + * We simply initialize the data structures here, but do not yet + * schedule the timer. + */ +int osmo_timerfd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) +{ + ofd->cb = cb; + ofd->data = data; + ofd->when = BSC_FD_READ; + + if (ofd->fd < 0) { + ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); + if (ofd->fd < 0) + return ofd->fd; + + osmo_fd_register(ofd); + } + return 0; +} + +#endif /* HAVE_SYS_TIMERFD_H */ + + /*! @} */ #endif /* _HAVE_SYS_SELECT_H */ -- To view, visit https://gerrit.osmocom.org/5185 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibeffba7c997252c003723bcd5d14122c4ded2fe7 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max From gerrit-no-reply at lists.osmocom.org Thu May 10 08:38:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:38:30 +0000 Subject: osmo-bsc[master]: dyn TS: allow any pchan type changes, fix for gprs mode none In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8096 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I72d5d833b186b1e1925d513885b405d8c19aa496 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 08:39:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:39:23 +0000 Subject: osmo-bts[master]: dyn TS: be less strict on chan_nr, to allow arbitrary pchan ... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8097 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I19e5e509101ec91204de9baff04582d99bc8dcb8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 08:41:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:41:06 +0000 Subject: osmo-bsc[master]: dyn TS: init only when both RSL and the Channel OM are estab... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8095 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I99f29d2ba079f6f4b77f0af12d9784588d2f56b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 08:41:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:41:23 +0000 Subject: [MERGED] osmo-bsc[master]: dyn TS: init only when both RSL and the Channel OM are estab... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: init only when both RSL and the Channel OM are established ...................................................................... dyn TS: init only when both RSL and the Channel OM are established Recent Icf6e25ff068e8a2600562d52726ead65e864ec02 changed the dyn_ts_init() hook from bootstrap_rsl() to the Channel OPSTART ACK, but this is not sufficient. Now RBS2k never calls dyn_ts_init(), and we may need to wait for RSL: Dyn TS should actually be initialized only when *both* OML opstart and RSL link are established. To that end, introduce a generalized API to query OML and RSL status and to trigger a timeslot init at the appropriate time. Add gsm_ts_check_init() to be called both when RSL and OML opstart are established: trigger gsm_ts_init() only when both are given. Add gsm_bts_trx_ts->initialized flag to mark whether initialization has already taken place. Add gsm_bts_mark_all_ts_uninitialized() to conveniently clear this flag for all TS in a BTS. Add gsm_bts_model.oml_is_ts_ready() callback so that each BTS implementation can return the OML status of a timeslot in its own OML implementation. Actually, currently all BTS models that need this init mechanism store the TS' OML status in ts->mo.nm_state. While we would in practice correctly init dyn TS by just looking at ts->mo.nm_state, semantically, the decision whether the TS is ready is up to the BTS models' specific OML implementations. >From bootstrap_rsl(), call gsm_ts_check_init(), in case the TS OML Opstart has happened before RSL is established -- applies to all BTS models. For all BTS models: - call gsm_{bts,trx}_mark_all_ts_uninitialized() when OM is torn down, to make sure the TS init mechanism will work a second time. For all BTS models supporting dyn TS, i.e. osmo-bts, nanobts and RBS2k: - implement oml_is_ts_ready(). - call gsm_ts_check_init() when a Channel OM is taken into operation. Any BTS models that don't set oml_is_ts_ready() will see a ts init as soon as RSL is bootstrapped (incidentally, the old dyn TS behavior before recent Icf6e25ff068e8a2600562d52726ead65e864ec02). This firstly fixes dyn TS for RBS2k by re-adding the initial switch to PDCH, and furthermore does so only after both OML TS opstart and RSL are through. This fixes the ttcn3-bsc-tests around dyn TS, since for the osmo-bts-virtual, the RSL is established only after OML opstart on the TS, which was broken by Icf6e25ff068e8a2600562d52726ead65e864ec02. Nokia Site and Siemens BS11 practically do not require this init mechanism, since all that happens there so far is dyn TS init, and these BTS models do not support dyn TS of any kind. A future patch may add oml_is_ts_ready(). Related: OS#3205 Change-Id: I99f29d2ba079f6f4b77f0af12d9784588d2f56b3 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/abis_om2000.c M src/libbsc/abis_rsl.c M src/libbsc/bsc_init.c M src/libbsc/bts_ericsson_rbs2000.c M src/libbsc/bts_ipaccess_nanobts.c M src/libbsc/bts_nokia_site.c M src/libbsc/bts_siemens_bs11.c 8 files changed, 73 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index f113904..29b97f0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -459,6 +459,8 @@ /* One Timeslot in a TRX */ struct gsm_bts_trx_ts { struct gsm_bts_trx *trx; + bool initialized; + /* number of this timeslot at the TRX */ uint8_t nr; @@ -605,6 +607,7 @@ int (*start)(struct gsm_network *net); int (*oml_rcvmsg)(struct msgb *msg); char * (*oml_status)(const struct gsm_bts *bts); + bool (*oml_is_ts_ready)(const struct gsm_bts_trx_ts *ts); void (*e1line_bind_ops)(struct e1inp_line *line); @@ -1387,4 +1390,8 @@ bool classmark_is_r99(struct gsm_classmark *cm); +void gsm_ts_check_init(struct gsm_bts_trx_ts *ts); +void gsm_trx_mark_all_ts_uninitialized(struct gsm_bts_trx *trx); +void gsm_bts_mark_all_ts_uninitialized(struct gsm_bts *bts); + #endif /* _GSM_DATA_H */ diff --git a/src/libbsc/abis_om2000.c b/src/libbsc/abis_om2000.c index 6057bc6..d533ea1 100644 --- a/src/libbsc/abis_om2000.c +++ b/src/libbsc/abis_om2000.c @@ -2737,8 +2737,10 @@ bts->nr, 255, trx->nr); for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - om2k_mo_init(&trx->ts[i].rbs2000.om2k_mo, OM2K_MO_CLS_TS, + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + om2k_mo_init(&ts->rbs2000.om2k_mo, OM2K_MO_CLS_TS, bts->nr, trx->nr, i); + gsm_ts_check_init(ts); } } diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index b36e496..e6d0cea 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -3017,3 +3017,40 @@ /* Now release it */ return rsl_rf_chan_release(lchan, 0, SACCH_NONE); } + +/* Initial timeslot actions when a timeslot first comes into operation. */ +static bool gsm_ts_init(struct gsm_bts_trx_ts *ts) +{ + dyn_ts_init(ts); + return true; +} + +/* Trigger initial timeslot actions iff both OML and RSL are setup. */ +void gsm_ts_check_init(struct gsm_bts_trx_ts *ts) +{ + struct gsm_bts *bts = ts->trx->bts; + if (bts->model->oml_is_ts_ready + && !bts->model->oml_is_ts_ready(ts)) + return; + if (!ts->trx->rsl_link) + return; + if (ts->initialized) + return; + ts->initialized = gsm_ts_init(ts); +} + +void gsm_trx_mark_all_ts_uninitialized(struct gsm_bts_trx *trx) +{ + int i; + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + ts->initialized = false; + } +} + +void gsm_bts_mark_all_ts_uninitialized(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + llist_for_each_entry(trx, &bts->trx_list, list) + gsm_trx_mark_all_ts_uninitialized(trx); +} diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 92b8c27..5b157c5 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -353,7 +353,9 @@ } for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { - generate_ma_for_ts(&trx->ts[i]); + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + generate_ma_for_ts(ts); + gsm_ts_check_init(ts); } } diff --git a/src/libbsc/bts_ericsson_rbs2000.c b/src/libbsc/bts_ericsson_rbs2000.c index 20b498a..9c8b90e 100644 --- a/src/libbsc/bts_ericsson_rbs2000.c +++ b/src/libbsc/bts_ericsson_rbs2000.c @@ -52,6 +52,8 @@ static int shutdown_om(struct gsm_bts *bts) { + gsm_bts_mark_all_ts_uninitialized(bts); + /* FIXME */ return 0; } @@ -172,11 +174,17 @@ e1inp_line_bind_ops(line, &bts_isdn_e1inp_line_ops); } +static bool bts_model_rbs2k_is_ts_ready(const struct gsm_bts_trx_ts *ts) +{ + return ts && ts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + static struct gsm_bts_model model_rbs2k = { .type = GSM_BTS_TYPE_RBS2000, .name = "rbs2000", .start = bts_model_rbs2k_start, .oml_rcvmsg = &abis_om2k_rcvmsg, + .oml_is_ts_ready = bts_model_rbs2k_is_ts_ready, .config_write_bts = &config_write_bts, .e1line_bind_ops = &bts_model_rbs2k_e1line_bind_ops, }; diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index 3eb7e0e..d5b3b21 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -56,12 +56,18 @@ return "disconnected"; } +static bool oml_is_ts_ready(const struct gsm_bts_trx_ts *ts) +{ + return ts && ts->mo.nm_state.operational == NM_OPSTATE_ENABLED; +} + struct gsm_bts_model bts_model_nanobts = { .type = GSM_BTS_TYPE_NANOBTS, .name = "nanobts", .start = bts_model_nanobts_start, .oml_rcvmsg = &abis_nm_rcvmsg, .oml_status = &get_oml_status, + .oml_is_ts_ready = oml_is_ts_ready, .e1line_bind_ops = bts_model_nanobts_e1line_bind_ops, .nm_att_tlvdef = { .def = { @@ -320,7 +326,7 @@ return; } - dyn_ts_init(ts); + gsm_ts_check_init(ts); } static void nm_rx_opstart_ack(struct abis_om_fom_hdr *foh) @@ -426,6 +432,8 @@ llist_for_each_entry(trx, &bts->trx_list, list) ipaccess_drop_rsl(trx); + gsm_bts_mark_all_ts_uninitialized(bts); + bts->ip_access.flags = 0; /* diff --git a/src/libbsc/bts_nokia_site.c b/src/libbsc/bts_nokia_site.c index 67281bb..4a24c39 100644 --- a/src/libbsc/bts_nokia_site.c +++ b/src/libbsc/bts_nokia_site.c @@ -55,6 +55,8 @@ { LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for BTS %u\n", bts->nr); + gsm_bts_mark_all_ts_uninitialized(bts); + if (!bts->nokia.skip_reset) { if (!bts->nokia.did_reset) abis_nm_reset(bts, 1); @@ -66,6 +68,8 @@ { LOGP(DNM, LOGL_NOTICE, "bootstrapping OML for TRX %u/%u\n", trx->bts->nr, trx->nr); + + gsm_trx_mark_all_ts_uninitialized(trx); } static int shutdown_om(struct gsm_bts *bts) diff --git a/src/libbsc/bts_siemens_bs11.c b/src/libbsc/bts_siemens_bs11.c index 5701e47..2d23517 100644 --- a/src/libbsc/bts_siemens_bs11.c +++ b/src/libbsc/bts_siemens_bs11.c @@ -536,6 +536,8 @@ /* Reset BTS Site manager resource */ abis_nm_bs11_reset_resource(bts); + gsm_bts_mark_all_ts_uninitialized(bts); + return 0; } -- To view, visit https://gerrit.osmocom.org/8095 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I99f29d2ba079f6f4b77f0af12d9784588d2f56b3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 08:41:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 08:41:24 +0000 Subject: [MERGED] osmo-bsc[master]: dyn TS: allow any pchan type changes, fix for gprs mode none In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: allow any pchan type changes, fix for gprs mode none ...................................................................... dyn TS: allow any pchan type changes, fix for gprs mode none In rsl_chan_activate_lchan(), remove a condition to also allow switching pchan modes when not in PDCH mode, which is actually not needed and would hinder switching from pchan=NONE or between TCH/F <-> TCH/H. Refactor the part where lchan_alloc() decides to switch a pchan mode into a separate function, ts_usable_as_pchan(), which transparently checks both dyn TS kinds for: - Already in switchover? (missing check for ip.access style dyn TS) - Is the lchan->state in error? (missing check for ip.access style dyn TS) - Switch from pchan=NONE? (missing feature for Osmocom style dyn TS, for proper handling with gprs mode none) - Switch between TCH/F <-> TCH/H when all subslots are unused? (missing feature for Osmocom style dyn TS, also useful for gprs mode none) Always pass the desired pchan in the dyn_as_pchan argument to the _lc_find_* functions to make switchover decisions transparent. Use the _lc_dyn_find_bts() function for ip.access style dyn TS for the same reason. Related: OS#3244 Change-Id: I72d5d833b186b1e1925d513885b405d8c19aa496 --- M src/libbsc/abis_rsl.c M src/libbsc/chan_alloc.c 2 files changed, 96 insertions(+), 68 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index e6d0cea..167ef6b 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -569,7 +569,6 @@ * released. */ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH && lchan->ts->dyn.pchan_is == lchan->ts->dyn.pchan_want) { enum gsm_phys_chan_config pchan_want; pchan_want = pchan_for_lchant(lchan->type); diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index 9668968..bdb9d9d 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -133,9 +133,86 @@ return count; } +static bool ts_usable_as_pchan(struct gsm_bts_trx_ts *ts, + enum gsm_phys_chan_config as_pchan) +{ + switch (ts->pchan) { + case GSM_PCHAN_TCH_F_PDCH: + if (ts->flags & TS_F_PDCH_PENDING_MASK) { + /* currently being switched over. Not usable. */ + return false; + } + switch (as_pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_PDCH: + /* continue to check below. */ + break; + default: + return false; + } + break; + + case GSM_PCHAN_TCH_F_TCH_H_PDCH: + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + /* currently being switched over. Not usable. */ + return false; + } + switch (as_pchan) { + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + case GSM_PCHAN_PDCH: + /* continue to check below. */ + break; + default: + return false; + } + break; + + default: + /* static timeslots never switch. */ + return ts->pchan == as_pchan; + } + + /* Dynamic timeslots -- Checks depending on the current actual pchan mode: */ + switch (ts_pchan(ts)) { + case GSM_PCHAN_NONE: + /* Not initialized, possibly because GPRS was disabled. We may switch. */ + return true; + + case GSM_PCHAN_PDCH: + /* This slot is in PDCH mode and available to switch pchan mode. But check for + * error states: */ + if (ts->lchan->state != LCHAN_S_NONE && ts->lchan->state != LCHAN_S_ACTIVE) + return false; + return true; + + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_H: + /* No need to switch at all? */ + if (ts_pchan(ts) == as_pchan) + return true; + + /* If any lchan is in use, we can't change the pchan kind */ + { + int ss; + int subslots = ts_subslots(ts); + for (ss = 0; ss < subslots; ss++) { + struct gsm_lchan *lc = &ts->lchan[ss]; + if (lc->type != GSM_LCHAN_NONE || lc->state != LCHAN_S_NONE) + return false; + } + } + return true; + + default: + /* Not implemented. */ + return false; + } +} + static struct gsm_lchan * _lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan, - enum gsm_phys_chan_config dyn_as_pchan) + enum gsm_phys_chan_config as_pchan) { struct gsm_bts_trx_ts *ts; int j, start, stop, dir, ss; @@ -160,72 +237,21 @@ ts = &trx->ts[j]; if (!ts_is_usable(ts)) continue; + /* The caller first selects what kind of TS to search in, e.g. looking for exact + * GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_TCH_F_TCH_H_PDCH... */ if (ts->pchan != pchan) continue; - - /* - * Allocation for fully dynamic timeslots - * (does not apply for ip.access style GSM_PCHAN_TCH_F_PDCH) - * - * Note the special nature of a dynamic timeslot in PDCH mode: - * in PDCH mode, typically, lchan->type is GSM_LCHAN_NONE and - * lchan->state is LCHAN_S_NONE -- an otherwise unused slot - * becomes PDCH implicitly. In the same sense, this channel - * allocator will never be asked to find an available PDCH - * slot; only TCH/F or TCH/H will be requested, and PDCH mode - * means that it is available for switchover. - * - * A dynamic timeslot in PDCH mode may be switched to TCH/F or - * TCH/H. If a dyn TS is already in TCH/F or TCH/H mode, it - * means that it is in use and its mode can't be switched. - * - * The logic concerning channels for TCH/F is trivial: there is - * only one channel, so a dynamic TS in TCH/F mode is already - * taken and not available for allocation. For TCH/H, we need - * to check whether a dynamic timeslot is already in TCH/H mode - * and whether one of the two channels is still available. - */ - switch (pchan) { - case GSM_PCHAN_TCH_F_TCH_H_PDCH: - if (ts->dyn.pchan_is != ts->dyn.pchan_want) { - /* The TS's mode is being switched. Not - * available anymore/yet. */ - DEBUGP(DRLL, "%s already in switchover\n", - gsm_ts_and_pchan_name(ts)); - continue; - } - if (ts->dyn.pchan_is == GSM_PCHAN_PDCH) { - /* This slot is available. Still check for - * error states to be sure; in all cases the - * first lchan will be used. */ - if (ts->lchan->state != LCHAN_S_NONE - && ts->lchan->state != LCHAN_S_ACTIVE) - continue; - return ts->lchan; - } - if (ts->dyn.pchan_is != dyn_as_pchan) - /* not applicable. */ - continue; - /* The requested type matches the dynamic timeslot's - * current mode. A channel may still be available - * (think TCH/H). */ - check_subslots = ts_subslots(ts); - break; - - case GSM_PCHAN_TCH_F_PDCH: - /* Available for voice when in PDCH mode */ - if (ts_pchan(ts) != GSM_PCHAN_PDCH) - continue; - /* Subslots of a PDCH ts don't need to be checked. */ + /* Next, is this timeslot in or can it be switched to the pchan we want to use it for? */ + if (!ts_usable_as_pchan(ts, as_pchan)) + continue; + /* If we need to switch it, after above check we are also allowed to switch it, and we + * will always use the first lchan after the switch. Return that lchan and rely on the + * caller to perform the pchan switchover. */ + if (ts_pchan(ts) != as_pchan) return ts->lchan; - default: - /* Not a dynamic channel, there is only one pchan kind: */ - check_subslots = ts_subslots(ts); - break; - } - - /* Is a sub-slot still available? */ + /* TS is in desired pchan mode. Go ahead and check for an available lchan. */ + check_subslots = ts_subslots(ts); for (ss = 0; ss < check_subslots; ss++) { struct gsm_lchan *lc = &ts->lchan[ss]; if (lc->type == GSM_LCHAN_NONE && @@ -264,7 +290,7 @@ static struct gsm_lchan * _lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) { - return _lc_dyn_find_bts(bts, pchan, GSM_PCHAN_NONE); + return _lc_dyn_find_bts(bts, pchan, pchan); } /* Allocate a logical channel. @@ -320,7 +346,8 @@ /* try dynamic TCH/F_PDCH */ if (lchan == NULL) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); /* TCH/F_PDCH will be used as TCH/F */ if (lchan) type = GSM_LCHAN_TCH_F; @@ -349,7 +376,8 @@ } /* If we don't have TCH/H either, try dynamic TCH/F_PDCH */ if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); /* TCH/F_PDCH used as TCH/F -- here, type is already * set to GSM_LCHAN_TCH_F, but for clarity's sake... */ if (lchan) @@ -396,7 +424,8 @@ */ /* If we don't have TCH/F either, try dynamic TCH/F_PDCH */ if (!lchan) { - lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F_PDCH); + lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH, + GSM_PCHAN_TCH_F); if (lchan) type = GSM_LCHAN_TCH_F; } -- To view, visit https://gerrit.osmocom.org/8096 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72d5d833b186b1e1925d513885b405d8c19aa496 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 09:42:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 09:42:45 +0000 Subject: libosmocore[master]: Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5185 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibeffba7c997252c003723bcd5d14122c4ded2fe7 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:03:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:03:57 +0000 Subject: [MERGED] libosmocore[master]: Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd ...................................................................... Add osmo_timerfd_* functions for osmo_fd-wrapped timerfd Linux offers file descriptor based periodic (interval) timers, which can achieve a higher precision than our userspace based timers and which can be slave'd to CLOCK_MONOTINIC or other clock sources. Let's add some code for osmo_fd wrapped versions that integrate well with our select() abstraction. The code has been used in osmo-bts-trx since June 2017 (change-id I51b19adde14ebb7ef3bb863d45e06243c323e22e), and I'm just renaming and moving it to libosmocore here. After a merge, the osmo-bts implementations can be removed in favor if this one. Change-Id: Ibeffba7c997252c003723bcd5d14122c4ded2fe7 --- M configure.ac M include/osmocom/core/select.h M src/select.c 3 files changed, 74 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 6f56176..6b9c66f 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ dnl checks for header files AC_HEADER_STDC -AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h syslog.h ctype.h netinet/tcp.h) +AC_CHECK_HEADERS(execinfo.h sys/select.h sys/socket.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h) # for src/conv.c AC_FUNC_ALLOCA AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""]) diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index b6fed3c..1ba6b83 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -6,6 +6,7 @@ #include #include +#include /*! \defgroup select Select loop abstraction * @{ @@ -54,4 +55,10 @@ int osmo_fd_fill_fds(void *readset, void *writeset, void *exceptset); int osmo_fd_disp_fds(void *readset, void *writeset, void *exceptset); +/* timerfd integration */ +int osmo_timerfd_disable(struct osmo_fd *ofd); +int osmo_timerfd_schedule(struct osmo_fd *ofd, const struct timespec *first, + const struct timespec *interval); +int osmo_timerfd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data); + /*! @} */ diff --git a/src/select.c b/src/select.c index 1c62e01..0b115c6 100644 --- a/src/select.c +++ b/src/select.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -270,6 +271,71 @@ return NULL; } +#ifdef HAVE_SYS_TIMERFD_H +#include + +/*! disable the osmocom-wrapped timerfd */ +int osmo_timerfd_disable(struct osmo_fd *ofd) +{ + const struct itimerspec its_null = { + .it_value = { 0, 0 }, + .it_interval = { 0, 0 }, + }; + return timerfd_settime(ofd->fd, 0, &its_null, NULL); +} + +/*! schedule the osmcoom-wrapped timerfd to occur first at \a first, then periodically at \a interval + * \param[in] ofd Osmocom wrapped timerfd + * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) + * \param[in] interval Time interval at which subsequent timer shall fire + * \returns 0 on success; negative on error */ +int osmo_timerfd_schedule(struct osmo_fd *ofd, const struct timespec *first, + const struct timespec *interval) +{ + struct itimerspec its; + + if (ofd->fd < 0) + return -EINVAL; + + /* first expiration */ + if (first) + its.it_value = *first; + else + its.it_value = *interval; + /* repeating interval */ + its.it_interval = *interval; + + return timerfd_settime(ofd->fd, 0, &its, NULL); +} + +/*! setup osmocom-wrapped timerfd + * \param[inout] ofd Osmocom-wrapped timerfd on which to operate + * \param[in] cb Call-back function called when timerfd becomes readable + * \param[in] data Opaque data to be passed on to call-back + * \returns 0 on success; negative on error + * + * We simply initialize the data structures here, but do not yet + * schedule the timer. + */ +int osmo_timerfd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) +{ + ofd->cb = cb; + ofd->data = data; + ofd->when = BSC_FD_READ; + + if (ofd->fd < 0) { + ofd->fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); + if (ofd->fd < 0) + return ofd->fd; + + osmo_fd_register(ofd); + } + return 0; +} + +#endif /* HAVE_SYS_TIMERFD_H */ + + /*! @} */ #endif /* _HAVE_SYS_SELECT_H */ -- To view, visit https://gerrit.osmocom.org/5185 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibeffba7c997252c003723bcd5d14122c4ded2fe7 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max From gerrit-no-reply at lists.osmocom.org Thu May 10 10:11:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:11:57 +0000 Subject: [PATCH] osmo-bts[master]: scheduler_trx: Add reminders to use libosmocore functions Message-ID: Review at https://gerrit.osmocom.org/8103 scheduler_trx: Add reminders to use libosmocore functions Let' wait until the just-merged osmo_timerfd_* functions of Change-Id Ibeffba7c997252c003723bcd5d14122c4ded2fe7 have made it into the next tagged release, and then replace the implementation here. Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/8103/1 diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4c4ae6c..2b91d66 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1427,6 +1427,7 @@ } /*! disable the osmocom-wrapped timerfd */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */t static int timer_ofd_disable(struct osmo_fd *ofd) { const struct itimerspec its_null = { @@ -1441,6 +1442,7 @@ * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) * \param[in] interval Time interval at which subsequent timer shall fire * \returns 0 on success; negative on error */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ static int timer_ofd_schedule(struct osmo_fd *ofd, const struct timespec *first, const struct timespec *interval) { @@ -1469,6 +1471,7 @@ * We simply initialize the data structures here, but do not yet * schedule the timer. */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ static int timer_ofd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) { ofd->cb = cb; -- To view, visit https://gerrit.osmocom.org/8103 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 10:12:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:12:28 +0000 Subject: [MERGED] osmo-bts[master]: dyn TS: be less strict on chan_nr, to allow arbitrary pchan ... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: dyn TS: be less strict on chan_nr, to allow arbitrary pchan switches ...................................................................... dyn TS: be less strict on chan_nr, to allow arbitrary pchan switches To allow switching a dyn TS also between TCH/H <-> TCH/F and anything else, don't thwart RSL messages just because their chan_nr doesn't reflect the current pchan mode. For dyn TS, leave that to message handling. In particular, a TS switch is invoked by a Chan Activ message, in which case the current pchan by definition mismatches the incoming chan_nr's reflected channel type. With this patch, I have tested successful direct TCH/H<->TCH/F switchover on sysmoBTS, with osmo-bsc patch I72d5d833b186b1e1925d513885b405d8c19aa496 (and 'msc'/'codec-list' vty config to change TCH kinds while gprs mode was none). Change-Id: I19e5e509101ec91204de9baff04582d99bc8dcb8 --- M src/common/gsm_data_shared.c 1 file changed, 4 insertions(+), 10 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c index 328b57e..2a1f9c8 100644 --- a/src/common/gsm_data_shared.c +++ b/src/common/gsm_data_shared.c @@ -716,19 +716,13 @@ lch_idx = 0; /* TCH/F */ if (ts->pchan != GSM_PCHAN_TCH_F && ts->pchan != GSM_PCHAN_PDCH && - ts->pchan != GSM_PCHAN_TCH_F_PDCH - && !(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && (ts->dyn.pchan_is == GSM_PCHAN_TCH_F - || ts->dyn.pchan_is == GSM_PCHAN_NONE - || ts->dyn.pchan_want == GSM_PCHAN_TCH_F))) + ts->pchan != GSM_PCHAN_TCH_F_PDCH && + ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH) ok = false; } else if ((cbits & 0x1e) == 0x02) { lch_idx = cbits & 0x1; /* TCH/H */ - if (ts->pchan != GSM_PCHAN_TCH_H - && !(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH - && (ts->dyn.pchan_is == GSM_PCHAN_TCH_H - || ts->dyn.pchan_is == GSM_PCHAN_NONE - || ts->dyn.pchan_want == GSM_PCHAN_TCH_H))) + if (ts->pchan != GSM_PCHAN_TCH_H && + ts->pchan != GSM_PCHAN_TCH_F_TCH_H_PDCH) ok = false; } else if ((cbits & 0x1c) == 0x04) { lch_idx = cbits & 0x3; /* SDCCH/4 */ -- To view, visit https://gerrit.osmocom.org/8097 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19e5e509101ec91204de9baff04582d99bc8dcb8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 10:13:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:13:23 +0000 Subject: osmo-bsc[master]: deprecate dyn_ts_allow_tch_f and by default allow all TCH In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8099 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:13:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:13:43 +0000 Subject: osmo-bsc[master]: fix default fallbacks in audio_support_to_gsm88() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8100 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifb4dba7c8e9c1d0a22a007355fbd2eda57e789d3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:13:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:13:55 +0000 Subject: osmo-bsc[master]: log: indicate hr/fr in audio_support_to_gsm88() error In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8101 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaaa710d0274fe813d227cb658d82a24db68c4161 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:14:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:14:53 +0000 Subject: osmo-bsc[master]: cosmetic: dyn ts init: undup logging for gprs = none In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8102 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:15:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:15:08 +0000 Subject: osmo-bsc[master]: debug log: verbosely log all lchan alloc choices In-Reply-To: References: Message-ID: Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8098 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 10:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:15:22 +0000 Subject: [MERGED] osmo-bsc[master]: debug log: verbosely log all lchan alloc choices In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: debug log: verbosely log all lchan alloc choices ...................................................................... debug log: verbosely log all lchan alloc choices Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 --- M src/libbsc/chan_alloc.c 1 file changed, 40 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index bdb9d9d..d773382 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -37,21 +37,29 @@ bool ts_is_usable(const struct gsm_bts_trx_ts *ts) { - if (!trx_is_usable(ts->trx)) + if (!trx_is_usable(ts->trx)) { + LOGP(DRLL, LOGL_DEBUG, "%s not usable\n", gsm_trx_name(ts->trx)); return false; + } /* If a TCH/F_PDCH TS is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_PDCH) { - if (ts->flags & TS_F_PDCH_PENDING_MASK) + if (ts->flags & TS_F_PDCH_PENDING_MASK) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } /* If a dynamic channel is busy changing, it is already taken or not * yet available. */ if (ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH) { - if (ts->dyn.pchan_is != ts->dyn.pchan_want) + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + LOGP(DRLL, LOGL_DEBUG, "%s in switchover, not available\n", + gsm_ts_and_pchan_name(ts)); return false; + } } return true; @@ -218,8 +226,14 @@ int j, start, stop, dir, ss; int check_subslots; - if (!trx_is_usable(trx)) +#define LOGPLCHANALLOC(fmt, args...) \ + LOGP(DRLL, LOGL_DEBUG, "looking for lchan %s as %s: " fmt, \ + gsm_pchan_name(pchan), gsm_pchan_name(as_pchan), ## args) + + if (!trx_is_usable(trx)) { + LOGPLCHANALLOC("%s trx not usable\n", gsm_trx_name(trx)); return NULL; + } if (trx->bts->chan_alloc_reverse) { /* check TS 7..0 */ @@ -239,28 +253,44 @@ continue; /* The caller first selects what kind of TS to search in, e.g. looking for exact * GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_TCH_F_TCH_H_PDCH... */ - if (ts->pchan != pchan) + if (ts->pchan != pchan) { + LOGPLCHANALLOC("%s is != %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(pchan)); continue; + } /* Next, is this timeslot in or can it be switched to the pchan we want to use it for? */ - if (!ts_usable_as_pchan(ts, as_pchan)) + if (!ts_usable_as_pchan(ts, as_pchan)) { + LOGPLCHANALLOC("%s is not usable as %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); continue; + } /* If we need to switch it, after above check we are also allowed to switch it, and we * will always use the first lchan after the switch. Return that lchan and rely on the * caller to perform the pchan switchover. */ - if (ts_pchan(ts) != as_pchan) + if (ts_pchan(ts) != as_pchan) { + LOGPLCHANALLOC("%s is a match, will switch to %s\n", gsm_ts_and_pchan_name(ts), + gsm_pchan_name(as_pchan)); return ts->lchan; + } /* TS is in desired pchan mode. Go ahead and check for an available lchan. */ check_subslots = ts_subslots(ts); for (ss = 0; ss < check_subslots; ss++) { struct gsm_lchan *lc = &ts->lchan[ss]; if (lc->type == GSM_LCHAN_NONE && - lc->state == LCHAN_S_NONE) + lc->state == LCHAN_S_NONE) { + LOGPLCHANALLOC("%s ss=%d is available\n", gsm_ts_and_pchan_name(ts), + lc->nr); return lc; + } + LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s not suitable\n", + gsm_ts_and_pchan_name(ts), lc->nr, gsm_lchant_name(lc->type), + gsm_lchans_name(lc->state)); } } return NULL; +#undef LOGPLCHANALLOC } static struct gsm_lchan * @@ -308,6 +338,8 @@ struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; + LOGP(DRLL, LOGL_DEBUG, "bts-%d lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); + switch (type) { case GSM_LCHAN_SDCCH: if (bts->chan_alloc_reverse) { -- To view, visit https://gerrit.osmocom.org/8098 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0070b8f7b6cc7fffbc582cf9f472e60f3096000 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 10:15:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 10:15:38 +0000 Subject: osmo-bts[master]: scheduler_trx: Add reminders to use libosmocore functions In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8103 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From jenkins at lists.osmocom.org Thu May 10 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 10 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#118?= In-Reply-To: <1124375570.466.1525878656882.JavaMail.jenkins@jenkins.osmocom.org> References: <1124375570.466.1525878656882.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1706940787.487.1525965006770.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu May 10 16:43:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:43:19 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: LAPDm_Types: Fix encoding of S+I frames Message-ID: Review at https://gerrit.osmocom.org/8104 LAPDm_Types: Fix encoding of S+I frames For some reason, the "FIELDORDER(lsb)" only worked for U-frames, but not for S- and I-frames. Probably a TITAN bug, but rather than debugging that now, let's rewrite the LAPDm types as "FIELDORDER(msb)" as that appears to work. Change-Id: Id90ff80576fd8007def4d8d027b481eef693ddc0 --- M library/LAPDm_Types.ttcn 1 file changed, 39 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/8104/1 diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 487748d..2e008e5 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -42,25 +42,25 @@ }; type record LapdmCtrlI { - BIT1 spare ('0'B), - uint3_t n_s, + uint3_t n_r, boolean p, - uint3_t n_r - } with { variant "FIELDORDER(lsb)" }; + uint3_t n_s, + BIT1 spare ('0'B) + } with { variant "FIELDORDER(msb)" }; type record LapdmCtrlS { - BIT2 spare ('01'B), - LapdmSBits s, + uint3_t n_r, boolean p_f, - uint3_t n_r - } with { variant "FIELDORDER(lsb)" }; + LapdmSBits s, + BIT2 spare ('01'B) + } with { variant "FIELDORDER(msb)" }; type record LapdmCtrlU { - BIT2 spare ('11'B), - LapdmU2Bits u2, + LapdmUBits u, boolean p_f, - LapdmUBits u - } with { variant "FIELDORDER(lsb)" }; + LapdmU2Bits u2, + BIT2 spare ('11'B) + } with { variant "FIELDORDER(msb)" }; /* TS 44.006 Table 3 */ type union LapdmCtrl { @@ -77,60 +77,67 @@ /* TS 44.006 Table 4 */ template LapdmCtrl tr_LapdmCtrlS := { - s := { spare := '01'B, s := ?, p_f := ?, n_r := ? } + s := { n_r := ?, p_f := ?, s := ?, spare := '01'B } }; template LapdmCtrl tr_LapdmCtrlU := { - u := { spare := '11'B, u2 := ?, p_f := ?, u := ? } + u := { u := ?, p_f := ?, u2 := ?, spare := '11'B } }; /* TS 44.006 Table 4 */ template LapdmCtrl tr_LapdmCtrlI(template uint3_t nr, template uint3_t ns, template boolean p) := { - i := { spare := '0'B, n_s := ns, p := p, n_r := nr } + i := { n_r := nr, p := p, n_s := ns, spare := '0'B } + }; + template (value) LapdmCtrl ts_LapdmCtrlI(uint3_t nr, uint3_t ns, boolean p) := { + i := { n_r := nr, p := p, n_s := ns, spare := '0'B } }; + template LapdmCtrl tr_LapdmCtrlRR(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '00'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '00'B } + }; + template (value) LapdmCtrl ts_LapdmCtrlRR(uint3_t nr, boolean pf) := { + s := { n_r := nr, p_f := pf, s := '00'B } }; template LapdmCtrl tr_LapdmCtrlRNR(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '01'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '01'B } }; template LapdmCtrl tr_LapdmCtrlREJ(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '10'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '10'B } }; - template LapdmCtrl tr_LapdmCtrlSABM(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '11'B, p_f := p, u := '001'B } + template LapdmCtrl tr_LapdmCtrlSABM(template boolean p) := { + u := { u := '001'B, p_f := p, u2 := '11'B, spare := '11'B } }; template (value) LapdmCtrl ts_LapdmCtrlSABM(boolean p) := { - u := { spare := '11'B, u2 := '11'B, p_f := p, u := '001'B } + u := { u := '001'B, p_f := p, u2 := '11'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlDM(template boolean f) modifies tr_LapdmCtrlU := { - u := { u2 := '11'B, p_f := f, u := '000'B } + template LapdmCtrl tr_LapdmCtrlDM(template boolean f) := { + u := { u := '000'B, p_f := f, u2 := '11'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlUI(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := p, u := '000'B } + template LapdmCtrl tr_LapdmCtrlUI(template boolean p := false) := { + u := { u := '000'B, p_f := p, u2 := '00'B, spare := '11'B } }; - template (value) LapdmCtrl ts_LapdmCtrlUI(boolean p) := { - u := { spare := '11'B, u2 := '00'B, p_f := p, u := '000'B } + template (value) LapdmCtrl ts_LapdmCtrlUI(boolean p := false) := { + u := { u := '000'B, p_f := p, u2 := '00'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlDISC(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := p, u := '010'B } + template LapdmCtrl tr_LapdmCtrlDISC(template boolean p) := { + u := { u := '010'B, p_f := p, u2 := '00'B, spare := '11'B } }; template LapdmCtrl ts_LapdmCtrlDISC(boolean p) := { - u := { spare := '11'B, u2 := '00'B, p_f := p, u := '010'B } + u := { u := '010'B, p_f := p, u2 := '00'B, spare := '11'B } }; template LapdmCtrl tr_LapdmCtrlUA(template boolean f) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := f, u := '011'B } + u := { u := '011'B, p_f := f, u2 := '00'B, spare := '11'B } }; template (value) LapdmCtrl ts_LapdmCtrlUA(boolean f) := { - u := { spare := '11'B, u2 := '00'B, p_f := f, u := '011'B } + u := { u := '011'B, p_f := f, u2 := '00'B, spare := '11'B } }; -- To view, visit https://gerrit.osmocom.org/8104 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id90ff80576fd8007def4d8d027b481eef693ddc0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 16:43:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:43:20 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: ciphering tests Message-ID: Review at https://gerrit.osmocom.org/8105 bts: ciphering tests Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea --- M bsc/MSC_ConnectionHandler.ttcn M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/L1CTL_Types.ttcn M library/L3_Templates.ttcn M library/LAPDm_Types.ttcn M library/RSL_Types.ttcn 7 files changed, 387 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/8105/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index e648427..efd68a3 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -395,42 +395,42 @@ } /* Convert the chipher representation on BSSMAP to the representation used on RSL */ -function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return OCT1 +function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId { /* A5 0 */ if (alg_bssmap == '01'O) { - return '01'O; + return RSL_ALG_ID_A5_0; } /* A5 1 */ else if (alg_bssmap == '02'O) { - return '02'O; + return RSL_ALG_ID_A5_1; } /* A5 2 */ else if (alg_bssmap == '04'O) { - return '03'O; + return RSL_ALG_ID_A5_2; } /* A5 3 */ else if (alg_bssmap == '08'O) { - return '04'O; + return RSL_ALG_ID_A5_3; } /* A5 4 */ else if (alg_bssmap == '10'O) { - return '05'O; + return RSL_ALG_ID_A5_4; } /* A5 5 */ else if (alg_bssmap == '20'O) { - return '06'O; + return RSL_ALG_ID_A5_5; } /* A5 6 */ else if (alg_bssmap == '40'O) { - return '07'O; + return RSL_ALG_ID_A5_6; } /* A5 7 */ else if (alg_bssmap == '80'O) { - return '08'O; + return RSL_ALG_ID_A5_7; } else { setverdict(fail, "Unexpected Encryption Algorithm"); - return '00'O; + return RSL_ALG_ID_A5_0; } } @@ -438,7 +438,7 @@ runs on MSC_ConnHdlr { var PDU_BSSAP bssap; var RSL_Message rsl; - var OCT1 alg_rsl; + var RSL_AlgId alg_rsl; if (isvalue(kc128)) { BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(alg, key, valueof(kc128))); diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c706437..69f7b57 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -143,7 +143,8 @@ RSL_IE_ChannelMode chan_mode, float t_guard, ConnL1Pars l1_pars, - TestSpecUnion spec optional + TestSpecUnion spec optional, + RSL_IE_EncryptionInfo encr optional } /* Test-specific parameters */ @@ -464,9 +465,17 @@ var RSL_Message rx := f_rsl_transceive_ret(tx, exp_rx, id, ignore_other); } -function f_rsl_chan_act(RSL_IE_ChannelMode mode) runs on ConnHdlr { - f_rsl_transceive(ts_RSL_CHAN_ACT(g_chan_nr, mode), tr_RSL_CHAN_ACT_ACK(g_chan_nr), - "RSL CHAN ACT"); +function f_rsl_chan_act(RSL_IE_ChannelMode mode, boolean encr_enable := false) +runs on ConnHdlr { + var RSL_Message ch_act := valueof(ts_RSL_CHAN_ACT(g_chan_nr, mode)); + if (encr_enable) { + /* append encryption related IEs, if requested */ + var RSL_IE_EncryptionInfo encr_info; + encr_info := valueof(ts_RSL_IE_EncrInfo(g_pars.encr.alg_id, g_pars.encr.key)); + ch_act.ies := ch_act.ies & { valueof(t_RSL_IE(RSL_IE_ENCR_INFO, RSL_IE_Body:{encr_info := +encr_info})) }; + } + f_rsl_transceive(ch_act, tr_RSL_CHAN_ACT_ACK(g_chan_nr), "RSL CHAN ACT"); } function f_rsl_chan_deact() runs on ConnHdlr { @@ -498,7 +507,8 @@ ms_power_level := 0, ms_actual_ta := 0 }, - spec := omit + spec := omit, + encr := omit } /*********************************************************************** @@ -617,6 +627,23 @@ vc_conn := f_start_handler(refers(f_TC_chan_act_wrong_nr), pars); vc_conn.done; } + f_shutdown(); +} + +/* execute the same callback function on a variety of logical channels */ +private function f_testmatrix_each_chan(ConnHdlrPars pars, void_fn fn) runs on test_CT { + var ConnHdlr vc_conn; + f_init(testcasename()); + + /* test on each of the channels we have */ + for (var integer i := 0; i < sizeof(g_AllChanTypes); i := i+1) { + pars.chan_nr := valueof(g_AllChanTypes[i]); + + log(testcasename(), ": XXX Starting on ", g_AllChanTypes[i]); + vc_conn := f_start_handler(fn, pars); + vc_conn.done; + } + f_shutdown(); } @@ -1254,8 +1281,42 @@ } } +private function f_alg_id_to_l1ctl(RSL_AlgId rsl_alg_id) return uint8_t { + select (rsl_alg_id) { + case (RSL_ALG_ID_A5_0) { return 0; } + case (RSL_ALG_ID_A5_1) { return 1; } + case (RSL_ALG_ID_A5_2) { return 2; } + case (RSL_ALG_ID_A5_3) { return 3; } + case (RSL_ALG_ID_A5_4) { return 4; } + case (RSL_ALG_ID_A5_5) { return 5; } + case (RSL_ALG_ID_A5_6) { return 6; } + case (RSL_ALG_ID_A5_7) { return 7; } + case else { + setverdict(fail, "Unknwon Algorithm ID"); + self.stop; + } + } +} + +private function f_alg_id_to_l3(RSL_AlgId rsl_alg_id) return BIT3 { + select (rsl_alg_id) { + case (RSL_ALG_ID_A5_1) { return '000'B; } + case (RSL_ALG_ID_A5_2) { return '001'B; } + case (RSL_ALG_ID_A5_3) { return '010'B; } + case (RSL_ALG_ID_A5_4) { return '011'B; } + case (RSL_ALG_ID_A5_5) { return '100'B; } + case (RSL_ALG_ID_A5_6) { return '101'B; } + case (RSL_ALG_ID_A5_7) { return '110'B; } + case else { + setverdict(fail, "Unknwon Algorithm ID"); + self.stop; + } + } +} + + /* Establish dedicated channel: L1CTL + RSL side */ -private function f_est_dchan() runs on ConnHdlr { +private function f_est_dchan(boolean encr_enable := false) runs on ConnHdlr { var GsmFrameNumber fn; var ImmediateAssignment imm_ass; var integer ra := 23; @@ -1265,7 +1326,7 @@ //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); /* Activate channel on BTS side */ - f_rsl_chan_act(g_pars.chan_mode); + f_rsl_chan_act(g_pars.chan_mode, encr_enable); /* Send IMM.ASS via CCHAN */ var ChannelDescription ch_desc := { @@ -1287,6 +1348,11 @@ ia_um := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); /* enable dedicated mode */ f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um); + /* enable encryption, if requested */ + if (encr_enable) { + var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); + f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); + } g_first_meas_res := true; } @@ -3349,9 +3415,9 @@ RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, tc.link_id, tc.l3)); /* Expect it to arrive on the other side */ if (tc.link_id.c == SACCH) { - f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, tc.l3)); } else { - f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, tc.l3)); } /* release the channel */ @@ -3387,7 +3453,7 @@ L1CTL.clear; /* Send LAPDm UI frame. There is no B4 format in uplink! */ - f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, false, tc.l3), tc.link_id); + f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, tc.l3), tc.link_id); /* Expdct RLL UNITDATA IND on RSL side */ alt { [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tc.link_id, tc.l3)) { @@ -3418,6 +3484,172 @@ f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); } +/*********************************************************************** + * Encryption Related + ***********************************************************************/ + +/* send UNITDATA_REQ from BTS to MS and expect it to arrive */ +function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { + RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, link_id, l3)); + if (link_id.c == SACCH) { + f_l1_exp_lapdm(tr_LAPDm_B4_UI(link_id.sapi, cr_MT_CMD, l3)); + } else { + f_l1_exp_lapdm(tr_LAPDm_UI(link_id.sapi, cr_MT_CMD, l3)); + } +} + +/* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ +function f_unitdata_mo(RslLinkId link_id, octetstring l3) runs on ConnHdlr { + timer T := 3.0; + f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); + T.start; + /* Expect RLL UNITDATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { + setverdict(pass); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); + } + [] RSL.receive { repeat; } + } +} + +/* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ +function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { + f_l1_tune(L1CTL); + f_est_dchan(true); + + /* now we actually need to transmit some data both ways to check if the encryption works */ + var L1ctlDlMessage dl; + + var octetstring l3 := f_rnd_octstring(16); + var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0)); + + /* send UNITDATA_REQ from BTS to MS and expect it to arrive */ + f_unitdata_mt(link_id, l3); + + /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ + f_unitdata_mo(link_id, l3); + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_chan_act_a51() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_1, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} +testcase TC_chan_act_a52() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_2, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} +testcase TC_chan_act_a53() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_3, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} + + +/* Test unencrypted channel activation followed by explicit ENCR CMD later */ +function f_TC_encr_cmd(charstring id) runs on ConnHdlr { + /* L3 payload doesn't matter, as it is passed transparently */ + var BIT3 l3_alg_id := f_alg_id_to_l3(g_pars.encr.alg_id); + var octetstring l3 := enc_PDU_ML3_NW_MS(valueof(ts_RRM_CiphModeCmd(l3_alg_id))); + var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0)); + + f_l1_tune(L1CTL); + + /* first establish a dedicated channel in the clear */ + f_est_dchan(false); + + /* Establish ABM */ + f_est_rll_mo(link_id.sapi, link_id, '23420815'O); + + /* then send the RSL ENCR CMD with an actual RR CIPH MOD CMD inside */ + RSL.send(ts_RSL_ENCR_CMD(g_chan_nr, link_id, g_pars.encr.alg_id, g_pars.encr.key, l3)); + /* expect the L3 to arrive still unencrypted on the MS side */ + f_l1_exp_lapdm(tr_LAPDm_I(link_id.sapi, cr_MT_CMD, ?, ?, ?, l3)); + + /* configure L1 to apply ciphering */ + var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); + f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); + + /* send first ciphered I-frame in response */ + l3 := '0a0b0c0d'O; + f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, true, 1, 0, l3), link_id); + RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)); + + /* now the BTS code should have detected the first properly encrypted uplink I-frame, + * and hence enable encryption also on the downlink */ + + /* expect bi-directional communication work in encrypted mode */ + f_unitdata_mo(link_id, f_rnd_octstring(15)); + f_unitdata_mt(link_id, f_rnd_octstring(15)); + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_encr_cmd_a51() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_1, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} +testcase TC_encr_cmd_a52() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_2, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} +testcase TC_encr_cmd_a53() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_3, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} + +private function f_assert_lapdm(octetstring enc, template LapdmFrame exp_match, charstring name := "") { + var LapdmFrame lf; + var octetstring reenc; + + /* decode the LAPDm frame */ + if (ischosen(exp_match.ab)) { + lf.ab := dec_LapdmFrameAB(enc); + } else { + setverdict(fail, "unsupported frame type"); + self.stop; + } + + /* check if decoder result matches expectation */ + if (not match(lf, exp_match)) { + setverdict(fail, name, ": decoded LAPDm doesn't match"); + } else { + log(name, ": matched"); + setverdict(pass); + } + + /* test if re-encoded frame equals original input */ + reenc := enc_LapdmFrame(lf); + if (enc != reenc) { + setverdict(fail, name, ": re-encoded LAPDm frame doesn't match"); + } else { + setverdict(pass); + } +} + +testcase TC_lapdm_selftest() runs on test_CT { + f_assert_lapdm('030301'O, tr_LAPDm_UI(0, true, ''O), "ui_s0_empty"); + f_assert_lapdm('0F0301'O, tr_LAPDm_UI(3, true, ''O), "ui_s3_empty"); + f_assert_lapdm('013F01'O, tr_LAPDm_SABM(0, false, true, ''O), "sabm_s0_empty"); + f_assert_lapdm('013F1123420815'O, tr_LAPDm_SABM(0, false, true, '23420815'O), "sabm_s0_l3"); + f_assert_lapdm('03E101'O, tr_LAPDm_RR(0, true, false, 7), "rr_s0_7"); + f_assert_lapdm('03000d063505'O, tr_LAPDm_I(0, true, false, 0, 0, '063505'O), "I/0/0"); + f_assert_lapdm('03e00d063505'O, tr_LAPDm_I(0, true, false, 7, 0, '063505'O), "I/7/0"); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ @@ -3434,13 +3666,11 @@ * channel activation ** with BS_Power / MS_Power, bypassing power control loop ** on primary vs. secondary TRX -** with encryption from initial activation on ** with timing advance from initial activation on * mode modify ** encryption ** multirate * check DEACTIVATE SACCH -* encryption command / intricate logic about tx-only/tx+rx/... ** unsupported algorithm * handover detection * MS Power Control @@ -3543,6 +3773,15 @@ execute( TC_rll_unit_data_req_ACCH() ); execute( TC_rll_unit_data_ind_DCCH() ); execute( TC_rll_unit_data_ind_ACCH() ); + + execute( TC_chan_act_a51() ); + execute( TC_chan_act_a52() ); + execute( TC_chan_act_a53() ); + execute( TC_encr_cmd_a51() ); + execute( TC_encr_cmd_a52() ); + execute( TC_encr_cmd_a53() ); + + execute( TC_lapdm_selftest() ); } diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index f8bc670..51a3936 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -4,6 +4,7 @@ import from UD_PortType all; import from UD_Types all; import from Osmocom_Types all; + import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; import from L1CTL_PortType_CtrlFunct all; @@ -176,7 +177,10 @@ self.stop; } } + } + function f_L1CTL_CRYPTO_REQ(L1CTL_PT pt, RslChannelNr chan_nr, uint8_t algo, octetstring key) { + pt.send(ts_L1CTL_CRYPTO_REQ(chan_nr, algo, key)); } function f_connect_reset(L1CTL_PT pt, charstring l1ctl_sock_path := m_l1ctl_sock_path) { diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 4c0e14d..656f292 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -286,6 +286,12 @@ OCT3 padding } with { variant "" }; + type record L1CtlCryptoReq { + uint8_t algo, + uint8_t key_len, + octetstring key + } with { variant (key_len) "LENGTHTO(key)" }; + type record L1ctlTrafficReq { octetstring data length(TRAFFIC_DATA_LEN) @@ -311,6 +317,7 @@ L1ctlDmEstReq dm_est_req, L1ctlReset reset_req, //L1ctlNeighPmReq neigh_pm_req, + L1CtlCryptoReq crypto_req, L1ctlTrafficReq traffic_req, L1ctlTbfCfgReq tbf_cfg_req, octetstring other @@ -341,6 +348,7 @@ par_req, header.msg_type = L1CTL_PARAM_REQ; dm_est_req, header.msg_type = L1CTL_DM_EST_REQ; reset_req, header.msg_type = L1CTL_RESET_REQ; + crypto_req, header.msg_type = L1CTL_CRYPTO_REQ; traffic_req, header.msg_type = L1CTL_TRAFFIC_REQ; tbf_cfg_req, header.msg_type = L1CTL_TBF_CFG_REQ; other, OTHERWISE; @@ -631,6 +639,25 @@ } }; + template (value) L1ctlUlMessage ts_L1CTL_CRYPTO_REQ(RslChannelNr chan_nr, uint8_t algo, + octetstring key) := { + header := ts_L1ctlHeader(L1CTL_CRYPTO_REQ), + ul_info := { + chan_nr := chan_nr, + link_id := ts_RslLinkID_DCCH(0), + padding := '0000'O + }, + ul_info_tbf := omit, + ul_info_abs := omit, + payload := { + crypto_req := { + algo := algo, + key_len := 0, /* overwritten */ + key := key + } + } + }; + template ImmediateAssignment t_IMM_ASS(uint8_t ra, GsmFrameNumber fn) := { ded_or_tbf := ?, page_mode := ?, diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 3304662..5acd2bf 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -388,6 +388,28 @@ } } +template (value) PDU_ML3_NW_MS ts_RRM_CiphModeCmd(BIT3 alg_id) := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + cipheringModeCommand := { + messageType := '00110101'B, + cipherModeSetting := { + sC := '1'B, + algorithmIdentifier := alg_id + }, + cipherModeResponse := { + cR := '0'B, + spare := '000'B + } + } + } + } +} + template (value) PDU_ML3_MS_NW ts_RRM_CiphModeCompl := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 2e008e5..32e1ba6 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -275,10 +275,10 @@ } } - template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, octetstring l3) := { ab := { addr := ts_LapdmAddr(sapi, c_r), - ctrl := ts_LapdmCtrlUI(p), + ctrl := ts_LapdmCtrlUI, len := 0, m := false, el := 1, @@ -286,10 +286,10 @@ } } template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r, - template boolean p, template octetstring l3) := { + template octetstring l3) := { ab := { addr := tr_LapdmAddr(sapi, c_r), - ctrl := tr_LapdmCtrlUI(p), + ctrl := tr_LapdmCtrlUI, len := ?, m := false, el := 1, @@ -297,22 +297,69 @@ } } - template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, octetstring l3) := { b4 := { addr := ts_LapdmAddr(sapi, c_r), - ctrl := ts_LapdmCtrlUI(p), + ctrl := ts_LapdmCtrlUI, payload := l3 } } template LapdmFrame tr_LAPDm_B4_UI(template LapdmSapi sapi, template boolean c_r, - template boolean p, template octetstring l3) := { + template octetstring l3) := { b4 := { addr := tr_LapdmAddr(sapi, c_r), - ctrl := tr_LapdmCtrlUI(p), + ctrl := tr_LapdmCtrlUI, payload := l3 } } + template LapdmFrame tr_LAPDm_I(template LapdmSapi sapi, template boolean c_r, + template boolean p, template uint3_t nr, + template uint3_t ns, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlI(nr, ns, p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + template (value) LapdmFrame ts_LAPDm_I(LapdmSapi sapi, boolean c_r, boolean p, uint3_t nr, + uint3_t ns, octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlI(nr, ns, p), + len := 0, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame tr_LAPDm_RR(template LapdmSapi sapi, template boolean c_r, + template boolean p, template uint3_t nr) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlRR(nr, p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + template (value) LapdmFrame ts_LAPDm_RR(LapdmSapi sapi, boolean c_r, + boolean p, uint3_t nr) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlRR(nr, p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + } with { encode "RAW"; /*variant "FIELDORDER(msb)" */} diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 2d9c92e..b81bbbd 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -364,18 +364,30 @@ } /* 9.3.7 */ + type enumerated RSL_AlgId { + RSL_ALG_ID_A5_0 ('00000001'B), + RSL_ALG_ID_A5_1 ('00000010'B), + RSL_ALG_ID_A5_2 ('00000011'B), + RSL_ALG_ID_A5_3 ('00000100'B), + RSL_ALG_ID_A5_4 ('00000101'B), + RSL_ALG_ID_A5_5 ('00000110'B), + RSL_ALG_ID_A5_6 ('00000111'B), + RSL_ALG_ID_A5_7 ('00001000'B) + } with { variant "FIELDLENGTH(8)" }; type record RSL_IE_EncryptionInfo { uint8_t len, - OCT1 alg_id, + RSL_AlgId alg_id, octetstring key } with { variant (len) "LENGTHTO(alg_id,key)" }; - template RSL_IE_EncryptionInfo tr_RSL_IE_EncrInfo(template OCT1 alg, template octetstring key) := { + template RSL_IE_EncryptionInfo tr_RSL_IE_EncrInfo(template RSL_AlgId alg, + template octetstring key) := { len := ?, alg_id := alg, key := key } - template (value) RSL_IE_EncryptionInfo ts_RSL_IE_EncrInfo(OCT1 alg, octetstring key) := { + template (value) RSL_IE_EncryptionInfo ts_RSL_IE_EncrInfo(template (value) RSL_AlgId alg, + octetstring key) := { len := 0, /* overwritten */ alg_id := alg, key := key @@ -1154,7 +1166,7 @@ /* 8.4.6 BSC ->BTS */ template RSL_Message tr_RSL_ENCR_CMD(template RslChannelNr chan_nr, template RslLinkId link_id := ?, - template OCT1 alg := ?, + template RSL_AlgId alg := ?, template octetstring key := ?, template octetstring l3_info := ?) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), @@ -1168,7 +1180,7 @@ } template (value) RSL_Message ts_RSL_ENCR_CMD(template (value) RslChannelNr chan_nr, template (value) RslLinkId link_id, - OCT1 alg, octetstring key, + template (value) RSL_AlgId alg, octetstring key, octetstring l3_info) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), msg_type := RSL_MT_ENCR_CMD, -- To view, visit https://gerrit.osmocom.org/8105 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 16:46:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:46:06 +0000 Subject: osmo-ttcn3-hacks[master]: bts: ciphering tests In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8105 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 16:46:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:46:08 +0000 Subject: osmo-ttcn3-hacks[master]: LAPDm_Types: Fix encoding of S+I frames In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8104 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id90ff80576fd8007def4d8d027b481eef693ddc0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 16:46:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:46:10 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: LAPDm_Types: Fix encoding of S+I frames In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: LAPDm_Types: Fix encoding of S+I frames ...................................................................... LAPDm_Types: Fix encoding of S+I frames For some reason, the "FIELDORDER(lsb)" only worked for U-frames, but not for S- and I-frames. Probably a TITAN bug, but rather than debugging that now, let's rewrite the LAPDm types as "FIELDORDER(msb)" as that appears to work. Change-Id: Id90ff80576fd8007def4d8d027b481eef693ddc0 --- M library/LAPDm_Types.ttcn 1 file changed, 39 insertions(+), 32 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 487748d..2e008e5 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -42,25 +42,25 @@ }; type record LapdmCtrlI { - BIT1 spare ('0'B), - uint3_t n_s, + uint3_t n_r, boolean p, - uint3_t n_r - } with { variant "FIELDORDER(lsb)" }; + uint3_t n_s, + BIT1 spare ('0'B) + } with { variant "FIELDORDER(msb)" }; type record LapdmCtrlS { - BIT2 spare ('01'B), - LapdmSBits s, + uint3_t n_r, boolean p_f, - uint3_t n_r - } with { variant "FIELDORDER(lsb)" }; + LapdmSBits s, + BIT2 spare ('01'B) + } with { variant "FIELDORDER(msb)" }; type record LapdmCtrlU { - BIT2 spare ('11'B), - LapdmU2Bits u2, + LapdmUBits u, boolean p_f, - LapdmUBits u - } with { variant "FIELDORDER(lsb)" }; + LapdmU2Bits u2, + BIT2 spare ('11'B) + } with { variant "FIELDORDER(msb)" }; /* TS 44.006 Table 3 */ type union LapdmCtrl { @@ -77,60 +77,67 @@ /* TS 44.006 Table 4 */ template LapdmCtrl tr_LapdmCtrlS := { - s := { spare := '01'B, s := ?, p_f := ?, n_r := ? } + s := { n_r := ?, p_f := ?, s := ?, spare := '01'B } }; template LapdmCtrl tr_LapdmCtrlU := { - u := { spare := '11'B, u2 := ?, p_f := ?, u := ? } + u := { u := ?, p_f := ?, u2 := ?, spare := '11'B } }; /* TS 44.006 Table 4 */ template LapdmCtrl tr_LapdmCtrlI(template uint3_t nr, template uint3_t ns, template boolean p) := { - i := { spare := '0'B, n_s := ns, p := p, n_r := nr } + i := { n_r := nr, p := p, n_s := ns, spare := '0'B } + }; + template (value) LapdmCtrl ts_LapdmCtrlI(uint3_t nr, uint3_t ns, boolean p) := { + i := { n_r := nr, p := p, n_s := ns, spare := '0'B } }; + template LapdmCtrl tr_LapdmCtrlRR(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '00'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '00'B } + }; + template (value) LapdmCtrl ts_LapdmCtrlRR(uint3_t nr, boolean pf) := { + s := { n_r := nr, p_f := pf, s := '00'B } }; template LapdmCtrl tr_LapdmCtrlRNR(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '01'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '01'B } }; template LapdmCtrl tr_LapdmCtrlREJ(template uint3_t nr, template boolean pf) modifies tr_LapdmCtrlS := { - s := { s:= '10'B, p_f := pf, n_r := nr } + s := { n_r := nr, p_f := pf, s := '10'B } }; - template LapdmCtrl tr_LapdmCtrlSABM(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '11'B, p_f := p, u := '001'B } + template LapdmCtrl tr_LapdmCtrlSABM(template boolean p) := { + u := { u := '001'B, p_f := p, u2 := '11'B, spare := '11'B } }; template (value) LapdmCtrl ts_LapdmCtrlSABM(boolean p) := { - u := { spare := '11'B, u2 := '11'B, p_f := p, u := '001'B } + u := { u := '001'B, p_f := p, u2 := '11'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlDM(template boolean f) modifies tr_LapdmCtrlU := { - u := { u2 := '11'B, p_f := f, u := '000'B } + template LapdmCtrl tr_LapdmCtrlDM(template boolean f) := { + u := { u := '000'B, p_f := f, u2 := '11'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlUI(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := p, u := '000'B } + template LapdmCtrl tr_LapdmCtrlUI(template boolean p := false) := { + u := { u := '000'B, p_f := p, u2 := '00'B, spare := '11'B } }; - template (value) LapdmCtrl ts_LapdmCtrlUI(boolean p) := { - u := { spare := '11'B, u2 := '00'B, p_f := p, u := '000'B } + template (value) LapdmCtrl ts_LapdmCtrlUI(boolean p := false) := { + u := { u := '000'B, p_f := p, u2 := '00'B, spare := '11'B } }; - template LapdmCtrl tr_LapdmCtrlDISC(template boolean p) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := p, u := '010'B } + template LapdmCtrl tr_LapdmCtrlDISC(template boolean p) := { + u := { u := '010'B, p_f := p, u2 := '00'B, spare := '11'B } }; template LapdmCtrl ts_LapdmCtrlDISC(boolean p) := { - u := { spare := '11'B, u2 := '00'B, p_f := p, u := '010'B } + u := { u := '010'B, p_f := p, u2 := '00'B, spare := '11'B } }; template LapdmCtrl tr_LapdmCtrlUA(template boolean f) modifies tr_LapdmCtrlU := { - u := { u2 := '00'B, p_f := f, u := '011'B } + u := { u := '011'B, p_f := f, u2 := '00'B, spare := '11'B } }; template (value) LapdmCtrl ts_LapdmCtrlUA(boolean f) := { - u := { spare := '11'B, u2 := '00'B, p_f := f, u := '011'B } + u := { u := '011'B, p_f := f, u2 := '00'B, spare := '11'B } }; -- To view, visit https://gerrit.osmocom.org/8104 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id90ff80576fd8007def4d8d027b481eef693ddc0 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 16:46:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 16:46:10 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts: ciphering tests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts: ciphering tests ...................................................................... bts: ciphering tests Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea --- M bsc/MSC_ConnectionHandler.ttcn M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/L1CTL_Types.ttcn M library/L3_Templates.ttcn M library/LAPDm_Types.ttcn M library/RSL_Types.ttcn 7 files changed, 387 insertions(+), 36 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index e648427..efd68a3 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -395,42 +395,42 @@ } /* Convert the chipher representation on BSSMAP to the representation used on RSL */ -function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return OCT1 +function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId { /* A5 0 */ if (alg_bssmap == '01'O) { - return '01'O; + return RSL_ALG_ID_A5_0; } /* A5 1 */ else if (alg_bssmap == '02'O) { - return '02'O; + return RSL_ALG_ID_A5_1; } /* A5 2 */ else if (alg_bssmap == '04'O) { - return '03'O; + return RSL_ALG_ID_A5_2; } /* A5 3 */ else if (alg_bssmap == '08'O) { - return '04'O; + return RSL_ALG_ID_A5_3; } /* A5 4 */ else if (alg_bssmap == '10'O) { - return '05'O; + return RSL_ALG_ID_A5_4; } /* A5 5 */ else if (alg_bssmap == '20'O) { - return '06'O; + return RSL_ALG_ID_A5_5; } /* A5 6 */ else if (alg_bssmap == '40'O) { - return '07'O; + return RSL_ALG_ID_A5_6; } /* A5 7 */ else if (alg_bssmap == '80'O) { - return '08'O; + return RSL_ALG_ID_A5_7; } else { setverdict(fail, "Unexpected Encryption Algorithm"); - return '00'O; + return RSL_ALG_ID_A5_0; } } @@ -438,7 +438,7 @@ runs on MSC_ConnHdlr { var PDU_BSSAP bssap; var RSL_Message rsl; - var OCT1 alg_rsl; + var RSL_AlgId alg_rsl; if (isvalue(kc128)) { BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(alg, key, valueof(kc128))); diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index c706437..69f7b57 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -143,7 +143,8 @@ RSL_IE_ChannelMode chan_mode, float t_guard, ConnL1Pars l1_pars, - TestSpecUnion spec optional + TestSpecUnion spec optional, + RSL_IE_EncryptionInfo encr optional } /* Test-specific parameters */ @@ -464,9 +465,17 @@ var RSL_Message rx := f_rsl_transceive_ret(tx, exp_rx, id, ignore_other); } -function f_rsl_chan_act(RSL_IE_ChannelMode mode) runs on ConnHdlr { - f_rsl_transceive(ts_RSL_CHAN_ACT(g_chan_nr, mode), tr_RSL_CHAN_ACT_ACK(g_chan_nr), - "RSL CHAN ACT"); +function f_rsl_chan_act(RSL_IE_ChannelMode mode, boolean encr_enable := false) +runs on ConnHdlr { + var RSL_Message ch_act := valueof(ts_RSL_CHAN_ACT(g_chan_nr, mode)); + if (encr_enable) { + /* append encryption related IEs, if requested */ + var RSL_IE_EncryptionInfo encr_info; + encr_info := valueof(ts_RSL_IE_EncrInfo(g_pars.encr.alg_id, g_pars.encr.key)); + ch_act.ies := ch_act.ies & { valueof(t_RSL_IE(RSL_IE_ENCR_INFO, RSL_IE_Body:{encr_info := +encr_info})) }; + } + f_rsl_transceive(ch_act, tr_RSL_CHAN_ACT_ACK(g_chan_nr), "RSL CHAN ACT"); } function f_rsl_chan_deact() runs on ConnHdlr { @@ -498,7 +507,8 @@ ms_power_level := 0, ms_actual_ta := 0 }, - spec := omit + spec := omit, + encr := omit } /*********************************************************************** @@ -617,6 +627,23 @@ vc_conn := f_start_handler(refers(f_TC_chan_act_wrong_nr), pars); vc_conn.done; } + f_shutdown(); +} + +/* execute the same callback function on a variety of logical channels */ +private function f_testmatrix_each_chan(ConnHdlrPars pars, void_fn fn) runs on test_CT { + var ConnHdlr vc_conn; + f_init(testcasename()); + + /* test on each of the channels we have */ + for (var integer i := 0; i < sizeof(g_AllChanTypes); i := i+1) { + pars.chan_nr := valueof(g_AllChanTypes[i]); + + log(testcasename(), ": XXX Starting on ", g_AllChanTypes[i]); + vc_conn := f_start_handler(fn, pars); + vc_conn.done; + } + f_shutdown(); } @@ -1254,8 +1281,42 @@ } } +private function f_alg_id_to_l1ctl(RSL_AlgId rsl_alg_id) return uint8_t { + select (rsl_alg_id) { + case (RSL_ALG_ID_A5_0) { return 0; } + case (RSL_ALG_ID_A5_1) { return 1; } + case (RSL_ALG_ID_A5_2) { return 2; } + case (RSL_ALG_ID_A5_3) { return 3; } + case (RSL_ALG_ID_A5_4) { return 4; } + case (RSL_ALG_ID_A5_5) { return 5; } + case (RSL_ALG_ID_A5_6) { return 6; } + case (RSL_ALG_ID_A5_7) { return 7; } + case else { + setverdict(fail, "Unknwon Algorithm ID"); + self.stop; + } + } +} + +private function f_alg_id_to_l3(RSL_AlgId rsl_alg_id) return BIT3 { + select (rsl_alg_id) { + case (RSL_ALG_ID_A5_1) { return '000'B; } + case (RSL_ALG_ID_A5_2) { return '001'B; } + case (RSL_ALG_ID_A5_3) { return '010'B; } + case (RSL_ALG_ID_A5_4) { return '011'B; } + case (RSL_ALG_ID_A5_5) { return '100'B; } + case (RSL_ALG_ID_A5_6) { return '101'B; } + case (RSL_ALG_ID_A5_7) { return '110'B; } + case else { + setverdict(fail, "Unknwon Algorithm ID"); + self.stop; + } + } +} + + /* Establish dedicated channel: L1CTL + RSL side */ -private function f_est_dchan() runs on ConnHdlr { +private function f_est_dchan(boolean encr_enable := false) runs on ConnHdlr { var GsmFrameNumber fn; var ImmediateAssignment imm_ass; var integer ra := 23; @@ -1265,7 +1326,7 @@ //RSL.receive(tr_RSL_CHAN_RQD(int2oct(23,1))); /* Activate channel on BTS side */ - f_rsl_chan_act(g_pars.chan_mode); + f_rsl_chan_act(g_pars.chan_mode, encr_enable); /* Send IMM.ASS via CCHAN */ var ChannelDescription ch_desc := { @@ -1287,6 +1348,11 @@ ia_um := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); /* enable dedicated mode */ f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um); + /* enable encryption, if requested */ + if (encr_enable) { + var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); + f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); + } g_first_meas_res := true; } @@ -3349,9 +3415,9 @@ RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, tc.link_id, tc.l3)); /* Expect it to arrive on the other side */ if (tc.link_id.c == SACCH) { - f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + f_l1_exp_lapdm(tr_LAPDm_B4_UI(tc.sapi, cr_MT_CMD, tc.l3)); } else { - f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, false, tc.l3)); + f_l1_exp_lapdm(tr_LAPDm_UI(tc.sapi, cr_MT_CMD, tc.l3)); } /* release the channel */ @@ -3387,7 +3453,7 @@ L1CTL.clear; /* Send LAPDm UI frame. There is no B4 format in uplink! */ - f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, false, tc.l3), tc.link_id); + f_tx_lapdm(ts_LAPDm_UI(tc.sapi, cr_MO_CMD, tc.l3), tc.link_id); /* Expdct RLL UNITDATA IND on RSL side */ alt { [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, tc.link_id, tc.l3)) { @@ -3418,6 +3484,172 @@ f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind)); } +/*********************************************************************** + * Encryption Related + ***********************************************************************/ + +/* send UNITDATA_REQ from BTS to MS and expect it to arrive */ +function f_unitdata_mt(RslLinkId link_id, octetstring l3) runs on ConnHdlr { + RSL.send(ts_RSL_UNITDATA_REQ(g_chan_nr, link_id, l3)); + if (link_id.c == SACCH) { + f_l1_exp_lapdm(tr_LAPDm_B4_UI(link_id.sapi, cr_MT_CMD, l3)); + } else { + f_l1_exp_lapdm(tr_LAPDm_UI(link_id.sapi, cr_MT_CMD, l3)); + } +} + +/* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ +function f_unitdata_mo(RslLinkId link_id, octetstring l3) runs on ConnHdlr { + timer T := 3.0; + f_tx_lapdm(ts_LAPDm_UI(link_id.sapi, cr_MO_CMD, l3), link_id); + T.start; + /* Expect RLL UNITDATA IND on RSL side */ + alt { + [] RSL.receive(tr_RSL_UNITDATA_IND(g_chan_nr, link_id, l3)) { + setverdict(pass); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for UNIT_DATA_IND"); + } + [] RSL.receive { repeat; } + } +} + +/* Test channel activation with A5/n right from the beginning (like in assignment + hand-over) */ +function f_TC_chan_act_encr(charstring id) runs on ConnHdlr { + f_l1_tune(L1CTL); + f_est_dchan(true); + + /* now we actually need to transmit some data both ways to check if the encryption works */ + var L1ctlDlMessage dl; + + var octetstring l3 := f_rnd_octstring(16); + var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0)); + + /* send UNITDATA_REQ from BTS to MS and expect it to arrive */ + f_unitdata_mt(link_id, l3); + + /* Send UI frame from MS and expect it to arrive as RLL UNITDATA IND on Abis */ + f_unitdata_mo(link_id, l3); + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_chan_act_a51() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_1, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} +testcase TC_chan_act_a52() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_2, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} +testcase TC_chan_act_a53() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_3, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_chan_act_encr)); +} + + +/* Test unencrypted channel activation followed by explicit ENCR CMD later */ +function f_TC_encr_cmd(charstring id) runs on ConnHdlr { + /* L3 payload doesn't matter, as it is passed transparently */ + var BIT3 l3_alg_id := f_alg_id_to_l3(g_pars.encr.alg_id); + var octetstring l3 := enc_PDU_ML3_NW_MS(valueof(ts_RRM_CiphModeCmd(l3_alg_id))); + var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0)); + + f_l1_tune(L1CTL); + + /* first establish a dedicated channel in the clear */ + f_est_dchan(false); + + /* Establish ABM */ + f_est_rll_mo(link_id.sapi, link_id, '23420815'O); + + /* then send the RSL ENCR CMD with an actual RR CIPH MOD CMD inside */ + RSL.send(ts_RSL_ENCR_CMD(g_chan_nr, link_id, g_pars.encr.alg_id, g_pars.encr.key, l3)); + /* expect the L3 to arrive still unencrypted on the MS side */ + f_l1_exp_lapdm(tr_LAPDm_I(link_id.sapi, cr_MT_CMD, ?, ?, ?, l3)); + + /* configure L1 to apply ciphering */ + var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); + f_L1CTL_CRYPTO_REQ(L1CTL, g_pars.chan_nr, alg_id, g_pars.encr.key); + + /* send first ciphered I-frame in response */ + l3 := '0a0b0c0d'O; + f_tx_lapdm(ts_LAPDm_I(link_id.sapi, cr_MO_CMD, true, 1, 0, l3), link_id); + RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3)); + + /* now the BTS code should have detected the first properly encrypted uplink I-frame, + * and hence enable encryption also on the downlink */ + + /* expect bi-directional communication work in encrypted mode */ + f_unitdata_mo(link_id, f_rnd_octstring(15)); + f_unitdata_mt(link_id, f_rnd_octstring(15)); + + /* release the channel */ + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_encr_cmd_a51() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_1, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} +testcase TC_encr_cmd_a52() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_2, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} +testcase TC_encr_cmd_a53() runs on test_CT { + var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN)); + pars.encr := valueof(ts_RSL_IE_EncrInfo(RSL_ALG_ID_A5_3, f_rnd_octstring(8))); + f_testmatrix_each_chan(pars, refers(f_TC_encr_cmd)); +} + +private function f_assert_lapdm(octetstring enc, template LapdmFrame exp_match, charstring name := "") { + var LapdmFrame lf; + var octetstring reenc; + + /* decode the LAPDm frame */ + if (ischosen(exp_match.ab)) { + lf.ab := dec_LapdmFrameAB(enc); + } else { + setverdict(fail, "unsupported frame type"); + self.stop; + } + + /* check if decoder result matches expectation */ + if (not match(lf, exp_match)) { + setverdict(fail, name, ": decoded LAPDm doesn't match"); + } else { + log(name, ": matched"); + setverdict(pass); + } + + /* test if re-encoded frame equals original input */ + reenc := enc_LapdmFrame(lf); + if (enc != reenc) { + setverdict(fail, name, ": re-encoded LAPDm frame doesn't match"); + } else { + setverdict(pass); + } +} + +testcase TC_lapdm_selftest() runs on test_CT { + f_assert_lapdm('030301'O, tr_LAPDm_UI(0, true, ''O), "ui_s0_empty"); + f_assert_lapdm('0F0301'O, tr_LAPDm_UI(3, true, ''O), "ui_s3_empty"); + f_assert_lapdm('013F01'O, tr_LAPDm_SABM(0, false, true, ''O), "sabm_s0_empty"); + f_assert_lapdm('013F1123420815'O, tr_LAPDm_SABM(0, false, true, '23420815'O), "sabm_s0_l3"); + f_assert_lapdm('03E101'O, tr_LAPDm_RR(0, true, false, 7), "rr_s0_7"); + f_assert_lapdm('03000d063505'O, tr_LAPDm_I(0, true, false, 0, 0, '063505'O), "I/0/0"); + f_assert_lapdm('03e00d063505'O, tr_LAPDm_I(0, true, false, 7, 0, '063505'O), "I/7/0"); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ @@ -3434,13 +3666,11 @@ * channel activation ** with BS_Power / MS_Power, bypassing power control loop ** on primary vs. secondary TRX -** with encryption from initial activation on ** with timing advance from initial activation on * mode modify ** encryption ** multirate * check DEACTIVATE SACCH -* encryption command / intricate logic about tx-only/tx+rx/... ** unsupported algorithm * handover detection * MS Power Control @@ -3543,6 +3773,15 @@ execute( TC_rll_unit_data_req_ACCH() ); execute( TC_rll_unit_data_ind_DCCH() ); execute( TC_rll_unit_data_ind_ACCH() ); + + execute( TC_chan_act_a51() ); + execute( TC_chan_act_a52() ); + execute( TC_chan_act_a53() ); + execute( TC_encr_cmd_a51() ); + execute( TC_encr_cmd_a52() ); + execute( TC_encr_cmd_a53() ); + + execute( TC_lapdm_selftest() ); } diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index f8bc670..51a3936 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -4,6 +4,7 @@ import from UD_PortType all; import from UD_Types all; import from Osmocom_Types all; + import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; import from L1CTL_PortType_CtrlFunct all; @@ -176,7 +177,10 @@ self.stop; } } + } + function f_L1CTL_CRYPTO_REQ(L1CTL_PT pt, RslChannelNr chan_nr, uint8_t algo, octetstring key) { + pt.send(ts_L1CTL_CRYPTO_REQ(chan_nr, algo, key)); } function f_connect_reset(L1CTL_PT pt, charstring l1ctl_sock_path := m_l1ctl_sock_path) { diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 4c0e14d..656f292 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -286,6 +286,12 @@ OCT3 padding } with { variant "" }; + type record L1CtlCryptoReq { + uint8_t algo, + uint8_t key_len, + octetstring key + } with { variant (key_len) "LENGTHTO(key)" }; + type record L1ctlTrafficReq { octetstring data length(TRAFFIC_DATA_LEN) @@ -311,6 +317,7 @@ L1ctlDmEstReq dm_est_req, L1ctlReset reset_req, //L1ctlNeighPmReq neigh_pm_req, + L1CtlCryptoReq crypto_req, L1ctlTrafficReq traffic_req, L1ctlTbfCfgReq tbf_cfg_req, octetstring other @@ -341,6 +348,7 @@ par_req, header.msg_type = L1CTL_PARAM_REQ; dm_est_req, header.msg_type = L1CTL_DM_EST_REQ; reset_req, header.msg_type = L1CTL_RESET_REQ; + crypto_req, header.msg_type = L1CTL_CRYPTO_REQ; traffic_req, header.msg_type = L1CTL_TRAFFIC_REQ; tbf_cfg_req, header.msg_type = L1CTL_TBF_CFG_REQ; other, OTHERWISE; @@ -631,6 +639,25 @@ } }; + template (value) L1ctlUlMessage ts_L1CTL_CRYPTO_REQ(RslChannelNr chan_nr, uint8_t algo, + octetstring key) := { + header := ts_L1ctlHeader(L1CTL_CRYPTO_REQ), + ul_info := { + chan_nr := chan_nr, + link_id := ts_RslLinkID_DCCH(0), + padding := '0000'O + }, + ul_info_tbf := omit, + ul_info_abs := omit, + payload := { + crypto_req := { + algo := algo, + key_len := 0, /* overwritten */ + key := key + } + } + }; + template ImmediateAssignment t_IMM_ASS(uint8_t ra, GsmFrameNumber fn) := { ded_or_tbf := ?, page_mode := ?, diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 3304662..5acd2bf 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -388,6 +388,28 @@ } } +template (value) PDU_ML3_NW_MS ts_RRM_CiphModeCmd(BIT3 alg_id) := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + rrm := { + cipheringModeCommand := { + messageType := '00110101'B, + cipherModeSetting := { + sC := '1'B, + algorithmIdentifier := alg_id + }, + cipherModeResponse := { + cR := '0'B, + spare := '000'B + } + } + } + } +} + template (value) PDU_ML3_MS_NW ts_RRM_CiphModeCompl := { discriminator := '0000'B, /* overwritten */ tiOrSkip := { diff --git a/library/LAPDm_Types.ttcn b/library/LAPDm_Types.ttcn index 2e008e5..32e1ba6 100644 --- a/library/LAPDm_Types.ttcn +++ b/library/LAPDm_Types.ttcn @@ -275,10 +275,10 @@ } } - template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + template LapdmFrame ts_LAPDm_UI(LapdmSapi sapi, boolean c_r, octetstring l3) := { ab := { addr := ts_LapdmAddr(sapi, c_r), - ctrl := ts_LapdmCtrlUI(p), + ctrl := ts_LapdmCtrlUI, len := 0, m := false, el := 1, @@ -286,10 +286,10 @@ } } template LapdmFrame tr_LAPDm_UI(template LapdmSapi sapi, template boolean c_r, - template boolean p, template octetstring l3) := { + template octetstring l3) := { ab := { addr := tr_LapdmAddr(sapi, c_r), - ctrl := tr_LapdmCtrlUI(p), + ctrl := tr_LapdmCtrlUI, len := ?, m := false, el := 1, @@ -297,22 +297,69 @@ } } - template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, boolean p, octetstring l3) := { + template LapdmFrame ts_LAPDm_B4_UI(LapdmSapi sapi, boolean c_r, octetstring l3) := { b4 := { addr := ts_LapdmAddr(sapi, c_r), - ctrl := ts_LapdmCtrlUI(p), + ctrl := ts_LapdmCtrlUI, payload := l3 } } template LapdmFrame tr_LAPDm_B4_UI(template LapdmSapi sapi, template boolean c_r, - template boolean p, template octetstring l3) := { + template octetstring l3) := { b4 := { addr := tr_LapdmAddr(sapi, c_r), - ctrl := tr_LapdmCtrlUI(p), + ctrl := tr_LapdmCtrlUI, payload := l3 } } + template LapdmFrame tr_LAPDm_I(template LapdmSapi sapi, template boolean c_r, + template boolean p, template uint3_t nr, + template uint3_t ns, template octetstring l3) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlI(nr, ns, p), + len := ?, + m := false, + el := 1, + payload := l3 + } + } + template (value) LapdmFrame ts_LAPDm_I(LapdmSapi sapi, boolean c_r, boolean p, uint3_t nr, + uint3_t ns, octetstring l3) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlI(nr, ns, p), + len := 0, + m := false, + el := 1, + payload := l3 + } + } + + template LapdmFrame tr_LAPDm_RR(template LapdmSapi sapi, template boolean c_r, + template boolean p, template uint3_t nr) := { + ab := { + addr := tr_LapdmAddr(sapi, c_r), + ctrl := tr_LapdmCtrlRR(nr, p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + template (value) LapdmFrame ts_LAPDm_RR(LapdmSapi sapi, boolean c_r, + boolean p, uint3_t nr) := { + ab := { + addr := ts_LapdmAddr(sapi, c_r), + ctrl := ts_LapdmCtrlRR(nr, p), + len := 0, + m := false, + el := 1, + payload := ''O + } + } + } with { encode "RAW"; /*variant "FIELDORDER(msb)" */} diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 2d9c92e..b81bbbd 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -364,18 +364,30 @@ } /* 9.3.7 */ + type enumerated RSL_AlgId { + RSL_ALG_ID_A5_0 ('00000001'B), + RSL_ALG_ID_A5_1 ('00000010'B), + RSL_ALG_ID_A5_2 ('00000011'B), + RSL_ALG_ID_A5_3 ('00000100'B), + RSL_ALG_ID_A5_4 ('00000101'B), + RSL_ALG_ID_A5_5 ('00000110'B), + RSL_ALG_ID_A5_6 ('00000111'B), + RSL_ALG_ID_A5_7 ('00001000'B) + } with { variant "FIELDLENGTH(8)" }; type record RSL_IE_EncryptionInfo { uint8_t len, - OCT1 alg_id, + RSL_AlgId alg_id, octetstring key } with { variant (len) "LENGTHTO(alg_id,key)" }; - template RSL_IE_EncryptionInfo tr_RSL_IE_EncrInfo(template OCT1 alg, template octetstring key) := { + template RSL_IE_EncryptionInfo tr_RSL_IE_EncrInfo(template RSL_AlgId alg, + template octetstring key) := { len := ?, alg_id := alg, key := key } - template (value) RSL_IE_EncryptionInfo ts_RSL_IE_EncrInfo(OCT1 alg, octetstring key) := { + template (value) RSL_IE_EncryptionInfo ts_RSL_IE_EncrInfo(template (value) RSL_AlgId alg, + octetstring key) := { len := 0, /* overwritten */ alg_id := alg, key := key @@ -1154,7 +1166,7 @@ /* 8.4.6 BSC ->BTS */ template RSL_Message tr_RSL_ENCR_CMD(template RslChannelNr chan_nr, template RslLinkId link_id := ?, - template OCT1 alg := ?, + template RSL_AlgId alg := ?, template octetstring key := ?, template octetstring l3_info := ?) := { msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false), @@ -1168,7 +1180,7 @@ } template (value) RSL_Message ts_RSL_ENCR_CMD(template (value) RslChannelNr chan_nr, template (value) RslLinkId link_id, - OCT1 alg, octetstring key, + template (value) RSL_AlgId alg, octetstring key, octetstring l3_info) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), msg_type := RSL_MT_ENCR_CMD, -- To view, visit https://gerrit.osmocom.org/8105 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If450e36cfd8cde713f304e57ec09bc1239bdf7ea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 17:38:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 17:38:58 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bts: Fix TC_rll_rel_req() Message-ID: Review at https://gerrit.osmocom.org/8106 bts: Fix TC_rll_rel_req() The test case was broken (c/r bit), the BTS operated correctly. Change-Id: I07285aa715fa218c62b9fd2d81c88e73a4117f08 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/8106/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 69f7b57..49bf45e 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3373,7 +3373,7 @@ RSL.send(ts_RSL_REL_REQ(g_chan_nr, tc.link_id, RSL_REL_MODE_NORMAL)); /* ... and expect the DISC on the Um side */ alt { - [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MO_CMD, true)) { + [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MT_CMD, true)) { /* FIXME: send a UA in resposne to the DISC */ } } -- To view, visit https://gerrit.osmocom.org/8106 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07285aa715fa218c62b9fd2d81c88e73a4117f08 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 17:43:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 17:43:22 +0000 Subject: osmo-ttcn3-hacks[master]: bts: Fix TC_rll_rel_req() In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8106 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I07285aa715fa218c62b9fd2d81c88e73a4117f08 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 17:43:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 17:43:23 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bts: Fix TC_rll_rel_req() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bts: Fix TC_rll_rel_req() ...................................................................... bts: Fix TC_rll_rel_req() The test case was broken (c/r bit), the BTS operated correctly. Change-Id: I07285aa715fa218c62b9fd2d81c88e73a4117f08 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 69f7b57..49bf45e 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3373,7 +3373,7 @@ RSL.send(ts_RSL_REL_REQ(g_chan_nr, tc.link_id, RSL_REL_MODE_NORMAL)); /* ... and expect the DISC on the Um side */ alt { - [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MO_CMD, true)) { + [] as_l1_exp_lapdm(tr_LAPDm_DISC(tc.sapi, cr_MT_CMD, true)) { /* FIXME: send a UA in resposne to the DISC */ } } -- To view, visit https://gerrit.osmocom.org/8106 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07285aa715fa218c62b9fd2d81c88e73a4117f08 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 20:02:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:02:09 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: Avoid having to pass testcasename() to f_start_handler Message-ID: Review at https://gerrit.osmocom.org/8107 bsc: Avoid having to pass testcasename() to f_start_handler Change-Id: If9a02bb192b224e5225a4a2f0e66b1f0254b0d46 --- M bsc/BSC_Tests.ttcn 1 file changed, 20 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/8107/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 057906f..8ab77cf 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1405,8 +1405,9 @@ type function void_fn(charstring id) runs on MSC_ConnHdlr; /* helper function to create, connect and start a MSC_ConnHdlr component */ -function f_start_handler(void_fn fn, charstring id, template (omit) TestHdlrParams pars := omit) +function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit) runs on test_CT return MSC_ConnHdlr { + var charstring id := testcasename(); var MSC_ConnHdlr vc_conn; vc_conn := MSC_ConnHdlr.create(id); @@ -1453,7 +1454,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0)); vc_conn.done; } @@ -1480,7 +1481,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1)); vc_conn.done; } @@ -1502,7 +1503,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; } @@ -1527,7 +1528,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3)); vc_conn.done; } @@ -1553,7 +1554,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4)); vc_conn.done; } @@ -1573,7 +1574,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_sign), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_sign)); vc_conn.done; } @@ -1742,7 +1743,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1754,7 +1755,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1766,7 +1767,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecEFR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1778,7 +1779,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1790,7 +1791,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1811,7 +1812,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_classmark), testcasename()); + vc_conn := f_start_handler(refers(f_tc_classmark)); vc_conn.done; } @@ -1849,7 +1850,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail)); vc_conn.done; } @@ -1863,7 +1864,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl)); vc_conn.done; } @@ -1877,7 +1878,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail)); vc_conn.done; } @@ -1897,7 +1898,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_err_82_short_msg), testcasename()); + vc_conn := f_start_handler(refers(f_tc_err_82_short_msg)); vc_conn.done; } @@ -1918,7 +1919,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg), testcasename()); + vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg)); vc_conn.done; } @@ -1992,7 +1993,7 @@ var MSC_ConnHdlr vc_conn; f_init(2, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_ho_int), testcasename()); + vc_conn := f_start_handler(refers(f_tc_ho_int)); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/8107 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9a02bb192b224e5225a4a2f0e66b1f0254b0d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 20:02:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:02:10 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: Unify encryption related test cases Message-ID: Review at https://gerrit.osmocom.org/8108 bsc: Unify encryption related test cases Rather than having copy+pate code, parameterize it. Change-Id: Ifc554245f80b09309f2da60c9d17c289c331b22e --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 31 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/8108/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8ab77cf..b3c7c61 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1434,54 +1434,45 @@ fn.apply(id); } -private function f_tc_assignment_fr_a5_0(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); +private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('01'O, kc); + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } - testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); f_sleep(1.0); - - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0)); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; } - - - -private function f_tc_assignment_fr_a5_1(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); - - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; - - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); - ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - - f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('02'O, kc); -} - testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); + vc_conn.done; +} +testcase TC_assignment_fr_a5_3() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1)); + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; } @@ -1496,7 +1487,6 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); f_establish_fully(ass_cmd, exp_fail); } - testcase TC_assignment_fr_a5_1_codec_missing() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -1506,32 +1496,6 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; } - - -private function f_tc_assignment_fr_a5_3(charstring id ) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; - - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); - ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - - f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('08'O, kc); -} - -testcase TC_assignment_fr_a5_3() runs on test_CT { - var MSC_ConnHdlr vc_conn; - - f_init(1, true); - f_sleep(1.0); - - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3)); - vc_conn.done; -} - private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); @@ -1547,7 +1511,6 @@ f_cipher_mode('10'O, kc, kc128, true); /* TODO: expect GSM0808_CAUSE_CIPHERING_ALGORITHM_NOT_SUPPORTED cause value */ } - testcase TC_assignment_fr_a5_4() runs on test_CT { var MSC_ConnHdlr vc_conn; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index efd68a3..c1ff963 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -346,12 +346,23 @@ } } +type record TestHdlrEncrParams { + OCT1 enc_alg, + octetstring enc_key +}; + +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key) := { + enc_alg := alg, + enc_key := key +} + type record TestHdlrParams { OCT1 ra, GsmFrameNumber fn, hexstring imsi, RslLinkId link_id, - BSSMAP_IE_SpeechCodecList ass_codec_list optional + BSSMAP_IE_SpeechCodecList ass_codec_list optional, + TestHdlrEncrParams encr optional }; template (value) TestHdlrParams t_def_TestHdlrPars := { @@ -359,7 +370,8 @@ fn := 23, imsi := '001019876543210'H, link_id := valueof(ts_RslLinkID_DCCH(0)), - ass_codec_list := omit + ass_codec_list := omit, + encr := omit } function f_create_chan_and_exp() runs on MSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/8108 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc554245f80b09309f2da60c9d17c289c331b22e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 20:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:31:04 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: Verify correct encryption n RSL CHAN_ACT during assignment Message-ID: Review at https://gerrit.osmocom.org/8109 bsc: Verify correct encryption n RSL CHAN_ACT during assignment Change-Id: Iff77586ea39da32df570048b1d83f5a0edb5a533 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/8109/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b3c7c61..14f3724 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1443,7 +1443,6 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index c1ff963..fe524dc 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -544,6 +544,37 @@ modify_done := false } +private template RSL_IE_Body tr_EncrInfo(template RSL_AlgId alg, template octetstring key) := { + encr_info := { + len := ?, + alg_id := alg, + key := key + } +} + +/* ensure the RSL CHAN ACT (during assignment) contains values we expect depending on test case */ +private function f_check_chan_act(AssignmentState st, RSL_Message chan_act) runs on MSC_ConnHdlr { + var RSL_IE_Body encr_info; + if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { + if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { + setverdict(fail, "Missing Encryption IE in CHAN ACT"); + } else { + var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); + if (not match(encr_info, tr_EncrInfo(alg, g_pars.encr.enc_key))) { + setverdict(fail, "Wrong Encryption IE in CHAN ACT"); + } + } + } else { + if (f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { + if (encr_info.encr_info.alg_id != RSL_ALG_ID_A5_0) { + setverdict(fail, "Unexpected Encryption in CHAN ACT"); + } + } + } + /* FIXME: validate RSL_IE_ACT_TYPE, RSL_IE_CHAN_MODE, RSL_IE_CHAN_IDENT, RSL_IE_BS_POWER, + * RSL_IE_MS_POWER, RSL_IE_TIMING_ADVANCE */ +} + altstep as_assignment(inout AssignmentState st) runs on MSC_ConnHdlr { var RSL_Message rsl; [not st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr)) -> value rsl { @@ -566,6 +597,10 @@ st.old_chan_nr := g_chan_nr; g_chan_nr := new_chan_nr; st.rr_ass_cmpl_seen := true; + /* obtain channel activation from RSL_Emulation for new channel */ + var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); + /* check it (e.g. for correct ciphering parameters) */ + f_check_chan_act(st, chan_act); repeat; } else { setverdict(fail, "Unexpected L3 received", l3); @@ -666,6 +701,12 @@ f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); + + /* start ciphering, if requested */ + if (ispresent(g_pars.encr)) { + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); + } + f_create_mgcp_expect(mgcpcrit); BSSAP.send(ass_cmd); -- To view, visit https://gerrit.osmocom.org/8109 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff77586ea39da32df570048b1d83f5a0edb5a533 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 20:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:31:04 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: f_establish_fully(): Support non-assignment cases Message-ID: Review at https://gerrit.osmocom.org/8110 bsc: f_establish_fully(): Support non-assignment cases If it's a pure signalling procedure (like LU), the MSC will never even send a BSSMAP ASSIGNMENT CMD. Our test suite should be able to produce this kind of behavior by passing "omit" as assignment comamnd to the f_establish_fully() function. Change-Id: I9bb5c8c19518905cf1ce121aa0b433886ec594d5 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/8110/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index fe524dc..991a693 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -675,8 +675,25 @@ } /* establish a channel fully, expecting an assignment matching 'exp' */ -function f_establish_fully_ret(PDU_BSSAP ass_cmd, template PDU_BSSAP exp_ass_cpl) -runs on MSC_ConnHdlr return PDU_BSSAP { +function f_establish_fully(template (omit) PDU_BSSAP ass_tpl, template PDU_BSSAP exp_ass_cpl) +runs on MSC_ConnHdlr { + f_MscConnHdlr_init(1, "127.0.0.2", "127.0.0.3"); + + f_create_chan_and_exp(); + /* we should now have a COMPL_L3 at the MSC */ + BSSAP.receive(tr_BSSMAP_ComplL3); + + /* start ciphering, if requested */ + if (ispresent(g_pars.encr)) { + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); + } + + /* bail out early if no assignment requested */ + if (istemplatekind(ass_tpl, "omit")) { + return; + } + + var PDU_BSSAP ass_cmd := valueof(ass_tpl); var PDU_BSSAP bssap; timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); @@ -694,17 +711,6 @@ /* determine if the current channel can support the given service or not */ if (not f_channel_compatible(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr)) { st.is_assignment := true; - } - - f_MscConnHdlr_init(1, "127.0.0.2", "127.0.0.3"); - - f_create_chan_and_exp(); - /* we should now have a COMPL_L3 at the MSC */ - BSSAP.receive(tr_BSSMAP_ComplL3); - - /* start ciphering, if requested */ - if (ispresent(g_pars.encr)) { - f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } f_create_mgcp_expect(mgcpcrit); @@ -751,12 +757,6 @@ if (not isbound(bssap)) { self.stop; } - return bssap; -} - -function f_establish_fully(PDU_BSSAP ass_cmd, template PDU_BSSAP exp_ass_cpl) -runs on MSC_ConnHdlr { - var PDU_BSSAP unused := f_establish_fully_ret(ass_cmd, exp_ass_cpl); } type record HandoverState { -- To view, visit https://gerrit.osmocom.org/8110 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bb5c8c19518905cf1ce121aa0b433886ec594d5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 20:31:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:31:04 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: New test cases for encryption without assignment Message-ID: Review at https://gerrit.osmocom.org/8111 bsc: New test cases for encryption without assignment The existing encryption related test cases are all testing a case involving the assignment procedure. This patch adds some new testcases that test encryption without any assignment, like e.g. in a typical LU. Change-Id: I443cd8127e76f70fcaa7bf1638c2219524fa9381 Closes: OS#3183 --- M bsc/BSC_Tests.ttcn 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/8111/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 14f3724..762b5a2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1434,6 +1434,50 @@ fn.apply(id); } +/* Establish signalling channel (non-assignment case) followed by cipher mode */ +private function f_tc_ciph_mode_a5(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); + + // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) + //f_establish_fully(ass_cmd, exp_compl); + f_establish_fully(omit, exp_compl); +} +testcase TC_ciph_mode_a5_0() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} +testcase TC_ciph_mode_a5_1() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} +testcase TC_ciph_mode_a5_3() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} + + +/* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); @@ -2392,6 +2436,9 @@ execute( TC_assignment_fr_a5_1_codec_missing() ); execute( TC_assignment_fr_a5_3() ); execute( TC_assignment_fr_a5_4() ); + execute( TC_ciph_mode_a5_0() ); + execute( TC_ciph_mode_a5_1() ); + execute( TC_ciph_mode_a5_3() ); execute( TC_assignment_codec_fr() ); execute( TC_assignment_codec_hr() ); -- To view, visit https://gerrit.osmocom.org/8111 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I443cd8127e76f70fcaa7bf1638c2219524fa9381 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 20:32:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:32:38 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: Avoid having to pass testcasename() to f_start_handler In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8107 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a02bb192b224e5225a4a2f0e66b1f0254b0d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:01 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: Unify encryption related test cases In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8108 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifc554245f80b09309f2da60c9d17c289c331b22e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:15 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: Verify correct encryption n RSL CHAN_ACT during assignment In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8109 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iff77586ea39da32df570048b1d83f5a0edb5a533 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:28 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: f_establish_fully(): Support non-assignment cases In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8110 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9bb5c8c19518905cf1ce121aa0b433886ec594d5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:31 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: New test cases for encryption without assignment In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8111 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I443cd8127e76f70fcaa7bf1638c2219524fa9381 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:33 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: New test cases for encryption without assignment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: New test cases for encryption without assignment ...................................................................... bsc: New test cases for encryption without assignment The existing encryption related test cases are all testing a case involving the assignment procedure. This patch adds some new testcases that test encryption without any assignment, like e.g. in a typical LU. Change-Id: I443cd8127e76f70fcaa7bf1638c2219524fa9381 Closes: OS#3183 --- M bsc/BSC_Tests.ttcn 1 file changed, 47 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 14f3724..762b5a2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1434,6 +1434,50 @@ fn.apply(id); } +/* Establish signalling channel (non-assignment case) followed by cipher mode */ +private function f_tc_ciph_mode_a5(charstring id) runs on MSC_ConnHdlr { + var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); + + // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) + //f_establish_fully(ass_cmd, exp_compl); + f_establish_fully(omit, exp_compl); +} +testcase TC_ciph_mode_a5_0() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} +testcase TC_ciph_mode_a5_1() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} +testcase TC_ciph_mode_a5_3() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); + + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars); + vc_conn.done; +} + + +/* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); @@ -2392,6 +2436,9 @@ execute( TC_assignment_fr_a5_1_codec_missing() ); execute( TC_assignment_fr_a5_3() ); execute( TC_assignment_fr_a5_4() ); + execute( TC_ciph_mode_a5_0() ); + execute( TC_ciph_mode_a5_1() ); + execute( TC_ciph_mode_a5_3() ); execute( TC_assignment_codec_fr() ); execute( TC_assignment_codec_hr() ); -- To view, visit https://gerrit.osmocom.org/8111 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I443cd8127e76f70fcaa7bf1638c2219524fa9381 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:33 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: f_establish_fully(): Support non-assignment cases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: f_establish_fully(): Support non-assignment cases ...................................................................... bsc: f_establish_fully(): Support non-assignment cases If it's a pure signalling procedure (like LU), the MSC will never even send a BSSMAP ASSIGNMENT CMD. Our test suite should be able to produce this kind of behavior by passing "omit" as assignment comamnd to the f_establish_fully() function. Change-Id: I9bb5c8c19518905cf1ce121aa0b433886ec594d5 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 19 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index fe524dc..991a693 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -675,8 +675,25 @@ } /* establish a channel fully, expecting an assignment matching 'exp' */ -function f_establish_fully_ret(PDU_BSSAP ass_cmd, template PDU_BSSAP exp_ass_cpl) -runs on MSC_ConnHdlr return PDU_BSSAP { +function f_establish_fully(template (omit) PDU_BSSAP ass_tpl, template PDU_BSSAP exp_ass_cpl) +runs on MSC_ConnHdlr { + f_MscConnHdlr_init(1, "127.0.0.2", "127.0.0.3"); + + f_create_chan_and_exp(); + /* we should now have a COMPL_L3 at the MSC */ + BSSAP.receive(tr_BSSMAP_ComplL3); + + /* start ciphering, if requested */ + if (ispresent(g_pars.encr)) { + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); + } + + /* bail out early if no assignment requested */ + if (istemplatekind(ass_tpl, "omit")) { + return; + } + + var PDU_BSSAP ass_cmd := valueof(ass_tpl); var PDU_BSSAP bssap; timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); @@ -694,17 +711,6 @@ /* determine if the current channel can support the given service or not */ if (not f_channel_compatible(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr)) { st.is_assignment := true; - } - - f_MscConnHdlr_init(1, "127.0.0.2", "127.0.0.3"); - - f_create_chan_and_exp(); - /* we should now have a COMPL_L3 at the MSC */ - BSSAP.receive(tr_BSSMAP_ComplL3); - - /* start ciphering, if requested */ - if (ispresent(g_pars.encr)) { - f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } f_create_mgcp_expect(mgcpcrit); @@ -751,12 +757,6 @@ if (not isbound(bssap)) { self.stop; } - return bssap; -} - -function f_establish_fully(PDU_BSSAP ass_cmd, template PDU_BSSAP exp_ass_cpl) -runs on MSC_ConnHdlr { - var PDU_BSSAP unused := f_establish_fully_ret(ass_cmd, exp_ass_cpl); } type record HandoverState { -- To view, visit https://gerrit.osmocom.org/8110 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bb5c8c19518905cf1ce121aa0b433886ec594d5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:33 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: Verify correct encryption n RSL CHAN_ACT during assignment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: Verify correct encryption n RSL CHAN_ACT during assignment ...................................................................... bsc: Verify correct encryption n RSL CHAN_ACT during assignment Change-Id: Iff77586ea39da32df570048b1d83f5a0edb5a533 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 41 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b3c7c61..14f3724 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1443,7 +1443,6 @@ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index c1ff963..fe524dc 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -544,6 +544,37 @@ modify_done := false } +private template RSL_IE_Body tr_EncrInfo(template RSL_AlgId alg, template octetstring key) := { + encr_info := { + len := ?, + alg_id := alg, + key := key + } +} + +/* ensure the RSL CHAN ACT (during assignment) contains values we expect depending on test case */ +private function f_check_chan_act(AssignmentState st, RSL_Message chan_act) runs on MSC_ConnHdlr { + var RSL_IE_Body encr_info; + if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { + if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { + setverdict(fail, "Missing Encryption IE in CHAN ACT"); + } else { + var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); + if (not match(encr_info, tr_EncrInfo(alg, g_pars.encr.enc_key))) { + setverdict(fail, "Wrong Encryption IE in CHAN ACT"); + } + } + } else { + if (f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { + if (encr_info.encr_info.alg_id != RSL_ALG_ID_A5_0) { + setverdict(fail, "Unexpected Encryption in CHAN ACT"); + } + } + } + /* FIXME: validate RSL_IE_ACT_TYPE, RSL_IE_CHAN_MODE, RSL_IE_CHAN_IDENT, RSL_IE_BS_POWER, + * RSL_IE_MS_POWER, RSL_IE_TIMING_ADVANCE */ +} + altstep as_assignment(inout AssignmentState st) runs on MSC_ConnHdlr { var RSL_Message rsl; [not st.rr_ass_cmpl_seen] RSL.receive(tr_RSL_DATA_REQ(g_chan_nr)) -> value rsl { @@ -566,6 +597,10 @@ st.old_chan_nr := g_chan_nr; g_chan_nr := new_chan_nr; st.rr_ass_cmpl_seen := true; + /* obtain channel activation from RSL_Emulation for new channel */ + var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); + /* check it (e.g. for correct ciphering parameters) */ + f_check_chan_act(st, chan_act); repeat; } else { setverdict(fail, "Unexpected L3 received", l3); @@ -666,6 +701,12 @@ f_create_chan_and_exp(); /* we should now have a COMPL_L3 at the MSC */ BSSAP.receive(tr_BSSMAP_ComplL3); + + /* start ciphering, if requested */ + if (ispresent(g_pars.encr)) { + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); + } + f_create_mgcp_expect(mgcpcrit); BSSAP.send(ass_cmd); -- To view, visit https://gerrit.osmocom.org/8109 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff77586ea39da32df570048b1d83f5a0edb5a533 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:33 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: Unify encryption related test cases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: Unify encryption related test cases ...................................................................... bsc: Unify encryption related test cases Rather than having copy+pate code, parameterize it. Change-Id: Ifc554245f80b09309f2da60c9d17c289c331b22e --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 31 insertions(+), 56 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8ab77cf..b3c7c61 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1434,54 +1434,45 @@ fn.apply(id); } -private function f_tc_assignment_fr_a5_0(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); +private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('01'O, kc); + f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key); } - testcase TC_assignment_fr_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8))); f_init(1, true); f_sleep(1.0); - - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0)); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; } - - - -private function f_tc_assignment_fr_a5_1(charstring id) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); - - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; - - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); - ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - - f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('02'O, kc); -} - testcase TC_assignment_fr_a5_1() runs on test_CT { var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('02'O, f_rnd_octstring(8))); f_init(1, true); f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); + vc_conn.done; +} +testcase TC_assignment_fr_a5_3() runs on test_CT { + var MSC_ConnHdlr vc_conn; + var TestHdlrParams pars := valueof(t_def_TestHdlrPars); + pars.encr := valueof(t_EncrParams('08'O, f_rnd_octstring(8))); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1)); + f_init(1, true); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars); vc_conn.done; } @@ -1496,7 +1487,6 @@ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); f_establish_fully(ass_cmd, exp_fail); } - testcase TC_assignment_fr_a5_1_codec_missing() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -1506,32 +1496,6 @@ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; } - - -private function f_tc_assignment_fr_a5_3(charstring id ) runs on MSC_ConnHdlr { - g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - const OCT8 kc := '0001020304050607'O; - - ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); - ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - - f_establish_fully(ass_cmd, exp_compl); - f_cipher_mode('08'O, kc); -} - -testcase TC_assignment_fr_a5_3() runs on test_CT { - var MSC_ConnHdlr vc_conn; - - f_init(1, true); - f_sleep(1.0); - - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3)); - vc_conn.done; -} - private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); @@ -1547,7 +1511,6 @@ f_cipher_mode('10'O, kc, kc128, true); /* TODO: expect GSM0808_CAUSE_CIPHERING_ALGORITHM_NOT_SUPPORTED cause value */ } - testcase TC_assignment_fr_a5_4() runs on test_CT { var MSC_ConnHdlr vc_conn; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index efd68a3..c1ff963 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -346,12 +346,23 @@ } } +type record TestHdlrEncrParams { + OCT1 enc_alg, + octetstring enc_key +}; + +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key) := { + enc_alg := alg, + enc_key := key +} + type record TestHdlrParams { OCT1 ra, GsmFrameNumber fn, hexstring imsi, RslLinkId link_id, - BSSMAP_IE_SpeechCodecList ass_codec_list optional + BSSMAP_IE_SpeechCodecList ass_codec_list optional, + TestHdlrEncrParams encr optional }; template (value) TestHdlrParams t_def_TestHdlrPars := { @@ -359,7 +370,8 @@ fn := 23, imsi := '001019876543210'H, link_id := valueof(ts_RslLinkID_DCCH(0)), - ass_codec_list := omit + ass_codec_list := omit, + encr := omit } function f_create_chan_and_exp() runs on MSC_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/8108 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc554245f80b09309f2da60c9d17c289c331b22e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 20:33:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 20:33:33 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: Avoid having to pass testcasename() to f_start_handler In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: Avoid having to pass testcasename() to f_start_handler ...................................................................... bsc: Avoid having to pass testcasename() to f_start_handler Change-Id: If9a02bb192b224e5225a4a2f0e66b1f0254b0d46 --- M bsc/BSC_Tests.ttcn 1 file changed, 20 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 057906f..8ab77cf 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1405,8 +1405,9 @@ type function void_fn(charstring id) runs on MSC_ConnHdlr; /* helper function to create, connect and start a MSC_ConnHdlr component */ -function f_start_handler(void_fn fn, charstring id, template (omit) TestHdlrParams pars := omit) +function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars := omit) runs on test_CT return MSC_ConnHdlr { + var charstring id := testcasename(); var MSC_ConnHdlr vc_conn; vc_conn := MSC_ConnHdlr.create(id); @@ -1453,7 +1454,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_0)); vc_conn.done; } @@ -1480,7 +1481,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1)); vc_conn.done; } @@ -1502,7 +1503,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_1_codec_missing)); vc_conn.done; } @@ -1527,7 +1528,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_3)); vc_conn.done; } @@ -1553,7 +1554,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4)); vc_conn.done; } @@ -1573,7 +1574,7 @@ f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_assignment_sign), testcasename()); + vc_conn := f_start_handler(refers(f_tc_assignment_sign)); vc_conn.done; } @@ -1742,7 +1743,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1754,7 +1755,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1766,7 +1767,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecEFR})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1778,7 +1779,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1790,7 +1791,7 @@ f_sleep(1.0); pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); - vc_conn := f_start_handler(refers(f_TC_assignment_codec), testcasename(), pars); + vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars); vc_conn.done; } @@ -1811,7 +1812,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_classmark), testcasename()); + vc_conn := f_start_handler(refers(f_tc_classmark)); vc_conn.done; } @@ -1849,7 +1850,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ass_fail)); vc_conn.done; } @@ -1863,7 +1864,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ass_compl)); vc_conn.done; } @@ -1877,7 +1878,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail), testcasename()); + vc_conn := f_start_handler(refers(f_tc_unsol_ho_fail)); vc_conn.done; } @@ -1897,7 +1898,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_err_82_short_msg), testcasename()); + vc_conn := f_start_handler(refers(f_tc_err_82_short_msg)); vc_conn.done; } @@ -1918,7 +1919,7 @@ var MSC_ConnHdlr vc_conn; f_init(1, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg), testcasename()); + vc_conn := f_start_handler(refers(f_tc_err_84_unknown_msg)); vc_conn.done; } @@ -1992,7 +1993,7 @@ var MSC_ConnHdlr vc_conn; f_init(2, true); f_sleep(1.0); - vc_conn := f_start_handler(refers(f_tc_ho_int), testcasename()); + vc_conn := f_start_handler(refers(f_tc_ho_int)); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/8107 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9a02bb192b224e5225a4a2f0e66b1f0254b0d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From admin at opensuse.org Thu May 10 20:47:45 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 20:47:45 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4b00cdde55_51bf3d868c5683b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 271s] [ 244.556878] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 245.256155] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 245.915649] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 246.546430] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.225628] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.233429] dracut-initqueue[460]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 274s] [ 274s] [ 274s] Entering emergency mode. Exit the shell to continue. [ 274s] Type "journalctl" to view system logs. [ 274s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 274s] after mounting them and attach it to a bug report. [ 274s] [ 274s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_12/root: 771 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 6075 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (764) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 10 21:04:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:04:31 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: bsc: Update expected-results.xml with 3 new ciphering relate... Message-ID: Review at https://gerrit.osmocom.org/8112 bsc: Update expected-results.xml with 3 new ciphering related tests Change-Id: I2465016a7f355a657187d39c90992ade1afe584f --- M bsc/expected-results.xml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/8112/1 diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 5b62fc9..3aa7983 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -30,6 +30,9 @@ + + + -- To view, visit https://gerrit.osmocom.org/8112 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2465016a7f355a657187d39c90992ade1afe584f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 21:07:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:07:17 +0000 Subject: osmo-ttcn3-hacks[master]: bsc: Update expected-results.xml with 3 new ciphering relate... In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8112 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2465016a7f355a657187d39c90992ade1afe584f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 21:07:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:07:42 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: bsc: Update expected-results.xml with 3 new ciphering relate... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: bsc: Update expected-results.xml with 3 new ciphering related tests ...................................................................... bsc: Update expected-results.xml with 3 new ciphering related tests Change-Id: I2465016a7f355a657187d39c90992ade1afe584f --- M bsc/expected-results.xml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 5b62fc9..3aa7983 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -30,6 +30,9 @@ + + + -- To view, visit https://gerrit.osmocom.org/8112 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2465016a7f355a657187d39c90992ade1afe584f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Thu May 10 21:12:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:12:07 +0000 Subject: [PATCH] osmo-ttcn3-hacks[master]: update expected results Message-ID: Review at https://gerrit.osmocom.org/8113 update expected results Change-Id: I65f72e9a8a9031a9715c7c2237824a45d7d8bef1 --- M bts/expected-results.xml M sgsn/expected-results.xml 2 files changed, 29 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/8113/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 6ac0686..27f061e 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -60,32 +60,33 @@ - - RSL for unknown Dchan - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_unsol_deact testcase - - - - "Timeout expecting RSL CHAN ACT" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_double_act testcase - - + + - - Tguard timeout - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_tchf_act_pdch_act_nack testcase - + + + + + + + + + + + Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 383, which has already terminated. - - "Timeout expecting RSL CHAN ACT" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_act_tchf_act_nack testcase - - + + + + + + + + + + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 6724a8f..b60c25c 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -53,4 +53,7 @@ SGSN_Tests.ttcn:MASKED TC_attach_pdp_act_user_deact_mt testcase + + + -- To view, visit https://gerrit.osmocom.org/8113 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65f72e9a8a9031a9715c7c2237824a45d7d8bef1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Thu May 10 21:12:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:12:46 +0000 Subject: osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8113 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I65f72e9a8a9031a9715c7c2237824a45d7d8bef1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Thu May 10 21:12:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 10 May 2018 21:12:47 +0000 Subject: [MERGED] osmo-ttcn3-hacks[master]: update expected results In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: update expected results ...................................................................... update expected results Change-Id: I65f72e9a8a9031a9715c7c2237824a45d7d8bef1 --- M bts/expected-results.xml M sgsn/expected-results.xml 2 files changed, 29 insertions(+), 25 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 6ac0686..27f061e 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -60,32 +60,33 @@ - - RSL for unknown Dchan - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_unsol_deact testcase - - - - "Timeout expecting RSL CHAN ACT" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_osmo_pdch_double_act testcase - - + + - - Tguard timeout - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_tchf_act_pdch_act_nack testcase - + + + + + + + + + + + Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 383, which has already terminated. - - "Timeout expecting RSL CHAN ACT" - BTS_Tests.ttcn:MASKED BTS_Tests control part - BTS_Tests.ttcn:MASKED TC_dyn_ipa_pdch_act_tchf_act_nack testcase - - + + + + + + + + + + + diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml index 6724a8f..b60c25c 100644 --- a/sgsn/expected-results.xml +++ b/sgsn/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -53,4 +53,7 @@ SGSN_Tests.ttcn:MASKED TC_attach_pdp_act_user_deact_mt testcase + + + -- To view, visit https://gerrit.osmocom.org/8113 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65f72e9a8a9031a9715c7c2237824a45d7d8bef1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From admin at opensuse.org Thu May 10 21:47:28 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 21:47:28 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4bdfe60520_51bf3d868c5717fa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 354s] [ 308.980338] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 309.665192] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 310.325866] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 310.995087] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 357s] [ 311.665991] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 358s] [ 312.330331] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 358s] [ 312.985823] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 359s] [ 313.605014] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 359s] [ 314.276736] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 360s] [ 314.973720] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 361s] [ 315.637946] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 361s] [ 316.272473] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 362s] [ 316.896700] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 363s] [ 317.604323] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 363s] [ 318.237343] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 364s] [ 319.008651] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 365s] [ 319.726164] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 366s] [ 320.375123] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 366s] [ 321.025927] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 367s] [ 321.695514] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 368s] [ 322.357517] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 368s] /var/cache/obs/worker/root_22/root: 45606 [ 368s] qemu-system-aarch64: terminating on signal 15 from pid 16309 (fuser) [ 368s] ### VM INTERACTION END ### [ 368s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (45588) - No such process [ 368s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 368s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 21:59:11 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 21:59:11 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4c0cdc1039_51bf3d868c5723f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ *** ] A start job is running for dev-disk...2d0.device (4min 52s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ ***] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 2s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 349s] /var/cache/obs/worker/root_1/root: 18467 [ 349s] qemu-system-aarch64: terminating on signal 15 from pid 21275 [ 349s] ### VM INTERACTION END ### [ 349s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (18455) - No such process [ 349s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 349s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 22:00:19 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 22:00:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4c10d7b07d_51bf3d868c572689@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 281s] [ 239.656463] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 281s] [ 240.286510] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 282s] [ 240.966185] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 241.597269] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 242.246423] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 242.249666] dracut-initqueue[490]: Warning: Could not boot. [ 283s] Starting Setup Virtual Console... [ 283s] [ OK ] Started Setup Virtual Console. [ 283s] Starting Dracut Emergency Shell... [ 283s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 283s] [ 283s] Generating "/run/initramfs/rdsosreport.txt" [ 284s] [ 284s] [ 284s] Entering emergency mode. Exit the shell to continue. [ 284s] Type "journalctl" to view system logs. [ 284s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 284s] after mounting them and attach it to a bug report. [ 284s] [ 284s] [ 345s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 346s] /var/cache/obs/worker/root_20/root: 53140 [ 346s] qemu-system-aarch64: terminating on signal 15 from pid 14146 () [ 346s] ### VM INTERACTION END ### [ 346s] /var/run/obs/worker/20/build/build-vm: line 458: kill: (53133) - No such process [ 346s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 346s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 22:09:28 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 22:09:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4c322e09e3_51bf3d868c5751ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 269s] [ 245.215200] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.885648] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.535279] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.205737] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.874955] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.881732] dracut-initqueue[468]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_2/root: 17274 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 36660 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (17260) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 20:54:54 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 20:54:54 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4b1acc6f67_51bf3d868c568913@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 268s] [ 242.570275] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 243.191283] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 243.829496] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 244.522097] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 245.139324] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 245.141780] dracut-initqueue[486]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_24/root: 18572 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 40805 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (18565) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 20:55:28 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 20:55:28 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4b1cd87063_51bf3d868c569039@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 274s] [ 246.425995] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.058363] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 247.776712] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 248.437375] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.096880] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.112360] dracut-initqueue[465]: Warning: Could not boot. [ 276s] Starting Setup Virtual Console... [ 276s] [ OK ] Started Setup Virtual Console. [ 276s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 277s] [ 277s] [ 277s] Entering emergency mode. Exit the shell to continue. [ 277s] Type "journalctl" to view system logs. [ 277s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 277s] after mounting them and attach it to a bug report. [ 277s] [ 277s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_9/root: 12486 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 44887 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (12473) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 22:16:02 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 22:16:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4c4a9b0902_51bf3d868c575881@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 271s] [ 245.384955] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.025736] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 246.685630] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.376675] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.055111] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.063043] dracut-initqueue[453]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 274s] [ 274s] [ 274s] Entering emergency mode. Exit the shell to continue. [ 274s] Type "journalctl" to view system logs. [ 274s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 274s] after mounting them and attach it to a bug report. [ 274s] [ 274s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_12/root: 47024 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 6673 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (47017) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 21:00:54 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 21:00:54 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4b3188ad1f_51bf3d868c5696e7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ *** ] A start job is running for dev-disk?\x2d0.device (4min 52s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [* ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)/var/cache/obs/worker/root_3/root: 19477 [ 325s] qemu-system-aarch64: terminating on signal 15 from pid 22292 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (19470) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 21:00:54 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 21:00:54 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4b318f1eb5_51bf3d868c5697f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 262s] [ 238.587420] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 239.140675] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 239.820906] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 240.416043] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 241.008961] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 241.011601] dracut-initqueue[472]: Warning: Could not boot. [ 265s] Starting Setup Virtual Console... [ 265s] [ OK ] Started Setup Virtual Console. [ 265s] Starting Dracut Emergency Shell... [ 265s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 265s] [ 265s] Generating "/run/initramfs/rdsosreport.txt" [ 265s] [ 265s] [ 265s] Entering emergency mode. Exit the shell to continue. [ 265s] Type "journalctl" to view system logs. [ 265s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 265s] after mounting them and attach it to a bug report. [ 265s] [ 265s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_13/root: 44954 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 8713 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/13/build/build-vm: line 458: kill: (44946) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Thu May 10 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 10 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#30?= In-Reply-To: <303867431.470.1525905680626.JavaMail.jenkins@jenkins.osmocom.org> References: <303867431.470.1525905680626.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2117192340.493.1525992080681.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-11284/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-11284/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-11284/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-11284/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-11284/ libtool: install: (cd /tmp/am-dc-11284/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-11284/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-11284/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-11284/ libtool: install: chmod 644 /tmp/am-dc-11284/ libtool: install: ranlib /tmp/am-dc-11284/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-11284/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-11284/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-11284/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-11284/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-11284/ /bin/mkdir -p '/tmp/am-dc-11284/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-11284/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-11284/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-11284/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-11284/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-11284/ libtool: uninstall: rm -f /tmp/am-dc-11284/ /tmp/am-dc-11284/ /tmp/am-dc-11284/ /tmp/am-dc-11284/ /tmp/am-dc-11284/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-11284/ && rm -f html.tar ) ( cd '/tmp/am-dc-11284/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-11284/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Thu May 10 22:49:45 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 22:49:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4cca490afa_51bf3d868c5777fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 269s] [ 235.451878] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 236.132020] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 236.753903] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 237.388486] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 237.977530] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 237.979508] dracut-initqueue[484]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 338s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 338s] /var/cache/obs/worker/root_11/root: 42157 [ 338s] qemu-system-aarch64: terminating on signal 15 from pid 7626 () [ 339s] ### VM INTERACTION END ### [ 339s] /var/run/obs/worker/11/build/build-vm: line 458: kill: (42150) - No such process [ 339s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 339s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 10 23:02:56 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 10 May 2018 23:02:56 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4cfb0787a8_51bf3d868c579299@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 284s] [ 255.479666] dracut-initqueue[489]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 256.159822] dracut-initqueue[489]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 256.832253] dracut-initqueue[489]: Warning: dracut-initqueue timeout - starting timeout scripts [ 286s] [ 257.476952] dracut-initqueue[489]: Warning: dracut-initqueue timeout - starting timeout scripts [ 287s] [ 258.207631] dracut-initqueue[489]: Warning: dracut-initqueue timeout - starting timeout scripts [ 287s] [ 258.217692] dracut-initqueue[489]: Warning: Could not boot. [ 287s] Starting Setup Virtual Console... [ 287s] [ OK ] Started Setup Virtual Console. [ 287s] Starting Dracut Emergency Shell... [ 287s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 287s] [ 287s] Generating "/run/initramfs/rdsosreport.txt" [ 287s] [ 287s] [ 287s] Entering emergency mode. Exit the shell to continue. [ 287s] Type "journalctl" to view system logs. [ 287s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 287s] after mounting them and attach it to a bug report. [ 287s] [ 287s] [ 336s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 337s] /var/cache/obs/worker/root_17/root: 6753 [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 39742 () [ 337s] ### VM INTERACTION END ### [ 337s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (6737) - No such process [ 337s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 337s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 01:09:56 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 01:09:56 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4ed74c0883_51bf3d868c596966@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ *] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ *] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 350s] /var/cache/obs/worker/root_2/root: 16315 [ 350s] qemu-system-aarch64: terminating on signal 15 from pid 18471 () [ 350s] ### VM INTERACTION END ### [ 350s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (16293) - No such process [ 350s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 350s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 01:59:39 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 01:59:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4f911a162c_51bf3d868c600310@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 266s] [ 242.634758] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.295607] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.954913] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.615701] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.255032] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.261766] dracut-initqueue[461]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_19/root: 7049 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 16698 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (7042) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 02:03:21 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 02:03:21 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af4f9ffe761f_51bf3d868c60065b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 265s] [ 243.794685] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.455381] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.114618] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.785510] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.454701] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.461549] dracut-initqueue[472]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_25/root: 47467 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 10858 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (47460) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Fri May 11 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 11 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#119?= In-Reply-To: <1706940787.487.1525965006770.JavaMail.jenkins@jenkins.osmocom.org> References: <1706940787.487.1525965006770.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1053312976.507.1526051406835.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Fri May 11 20:01:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:01:34 +0000 Subject: [PATCH] libosmocore[master]: import isdn4linux HDLC code from linux kernel Message-ID: Review at https://gerrit.osmocom.org/8114 import isdn4linux HDLC code from linux kernel I've been importing from 94d7dbf108813ea45a91e27e9a8bd231d5a23fa7 but the isdnhdlc code hasn't seen any changes since 2012 anyway. Change-Id: I3c58f9cb6921c2fdd0f2fcb11f622a0be88c7c63 --- A include/osmocom/core/isdnhdlc.h A src/isdnhdlc.c 2 files changed, 712 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/8114/1 diff --git a/include/osmocom/core/isdnhdlc.h b/include/osmocom/core/isdnhdlc.h new file mode 100644 index 0000000..9652137 --- /dev/null +++ b/include/osmocom/core/isdnhdlc.h @@ -0,0 +1,82 @@ +/* + * hdlc.h -- General purpose ISDN HDLC decoder. + * + * Implementation of a HDLC decoder/encoder in software. + * Necessary because some ISDN devices don't have HDLC + * controllers. + * + * Copyright (C) + * 2009 Karsten Keil + * 2002 Wolfgang M?es + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __ISDNHDLC_H__ +#define __ISDNHDLC_H__ + +struct isdnhdlc_vars { + int bit_shift; + int hdlc_bits1; + int data_bits; + int ffbit_shift; /* encoding only */ + int state; + int dstpos; + + u16 crc; + + u8 cbin; + u8 shift_reg; + u8 ffvalue; + + /* set if transferring data */ + u32 data_received:1; + /* set if D channel (send idle instead of flags) */ + u32 dchannel:1; + /* set if 56K adaptation */ + u32 do_adapt56:1; + /* set if in closing phase (need to send CRC + flag) */ + u32 do_closing:1; + /* set if data is bitreverse */ + u32 do_bitreverse:1; +}; + +/* Feature Flags */ +#define HDLC_56KBIT 0x01 +#define HDLC_DCHANNEL 0x02 +#define HDLC_BITREVERSE 0x04 + +/* + The return value from isdnhdlc_decode is + the frame length, 0 if no complete frame was decoded, + or a negative error number +*/ +#define HDLC_FRAMING_ERROR 1 +#define HDLC_CRC_ERROR 2 +#define HDLC_LENGTH_ERROR 3 + +extern void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features); + +extern int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, + int slen, int *count, u8 *dst, int dsize); + +extern void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features); + +extern int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, + u16 slen, int *count, u8 *dst, int dsize); + +#endif /* __ISDNHDLC_H__ */ diff --git a/src/isdnhdlc.c b/src/isdnhdlc.c new file mode 100644 index 0000000..027d1c5 --- /dev/null +++ b/src/isdnhdlc.c @@ -0,0 +1,630 @@ +/* + * isdnhdlc.c -- General purpose ISDN HDLC decoder. + * + * Copyright (C) + * 2009 Karsten Keil + * 2002 Wolfgang M?es + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include + +/*-------------------------------------------------------------------*/ + +MODULE_AUTHOR("Wolfgang M?es , " + "Frode Isaksen , " + "Kai Germaschewski "); +MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); +MODULE_LICENSE("GPL"); + +/*-------------------------------------------------------------------*/ + +enum { + HDLC_FAST_IDLE, HDLC_GET_FLAG_B0, HDLC_GETFLAG_B1A6, HDLC_GETFLAG_B7, + HDLC_GET_DATA, HDLC_FAST_FLAG +}; + +enum { + HDLC_SEND_DATA, HDLC_SEND_CRC1, HDLC_SEND_FAST_FLAG, + HDLC_SEND_FIRST_FLAG, HDLC_SEND_CRC2, HDLC_SEND_CLOSING_FLAG, + HDLC_SEND_IDLE1, HDLC_SEND_FAST_IDLE, HDLC_SENDFLAG_B0, + HDLC_SENDFLAG_B1A6, HDLC_SENDFLAG_B7, STOPPED, HDLC_SENDFLAG_ONE +}; + +void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features) +{ + memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + hdlc->state = HDLC_GET_DATA; + if (features & HDLC_56KBIT) + hdlc->do_adapt56 = 1; + if (features & HDLC_BITREVERSE) + hdlc->do_bitreverse = 1; +} +EXPORT_SYMBOL(isdnhdlc_out_init); + +void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features) +{ + memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + if (features & HDLC_DCHANNEL) { + hdlc->dchannel = 1; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + hdlc->dchannel = 0; + hdlc->state = HDLC_SEND_FAST_FLAG; + hdlc->ffvalue = 0x7e; + } + hdlc->cbin = 0x7e; + if (features & HDLC_56KBIT) { + hdlc->do_adapt56 = 1; + hdlc->state = HDLC_SENDFLAG_B0; + } else + hdlc->data_bits = 8; + if (features & HDLC_BITREVERSE) + hdlc->do_bitreverse = 1; +} +EXPORT_SYMBOL(isdnhdlc_rcv_init); + +static int +check_frame(struct isdnhdlc_vars *hdlc) +{ + int status; + + if (hdlc->dstpos < 2) /* too small - framing error */ + status = -HDLC_FRAMING_ERROR; + else if (hdlc->crc != 0xf0b8) /* crc error */ + status = -HDLC_CRC_ERROR; + else { + /* remove CRC */ + hdlc->dstpos -= 2; + /* good frame */ + status = hdlc->dstpos; + } + return status; +} + +/* + isdnhdlc_decode - decodes HDLC frames from a transparent bit stream. + + The source buffer is scanned for valid HDLC frames looking for + flags (01111110) to indicate the start of a frame. If the start of + the frame is found, the bit stuffing is removed (0 after 5 1's). + When a new flag is found, the complete frame has been received + and the CRC is checked. + If a valid frame is found, the function returns the frame length + excluding the CRC with the bit HDLC_END_OF_FRAME set. + If the beginning of a valid frame is found, the function returns + the length. + If a framing error is found (too many 1s and not a flag) the function + returns the length with the bit HDLC_FRAMING_ERROR set. + If a CRC error is found the function returns the length with the + bit HDLC_CRC_ERROR set. + If the frame length exceeds the destination buffer size, the function + returns the length with the bit HDLC_LENGTH_ERROR set. + + src - source buffer + slen - source buffer length + count - number of bytes removed (decoded) from the source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of decoded bytes in the destination buffer and status + flag. +*/ +int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, int slen, + int *count, u8 *dst, int dsize) +{ + int status = 0; + + static const unsigned char fast_flag[] = { + 0x00, 0x00, 0x00, 0x20, 0x30, 0x38, 0x3c, 0x3e, 0x3f + }; + + static const unsigned char fast_flag_value[] = { + 0x00, 0x7e, 0xfc, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3f + }; + + static const unsigned char fast_abort[] = { + 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff + }; + +#define handle_fast_flag(h) \ + do { \ + if (h->cbin == fast_flag[h->bit_shift]) { \ + h->ffvalue = fast_flag_value[h->bit_shift]; \ + h->state = HDLC_FAST_FLAG; \ + h->ffbit_shift = h->bit_shift; \ + h->bit_shift = 1; \ + } else { \ + h->state = HDLC_GET_DATA; \ + h->data_received = 0; \ + } \ + } while (0) + +#define handle_abort(h) \ + do { \ + h->shift_reg = fast_abort[h->ffbit_shift - 1]; \ + h->hdlc_bits1 = h->ffbit_shift - 2; \ + if (h->hdlc_bits1 < 0) \ + h->hdlc_bits1 = 0; \ + h->data_bits = h->ffbit_shift - 1; \ + h->state = HDLC_GET_DATA; \ + h->data_received = 0; \ + } while (0) + + *count = slen; + + while (slen > 0) { + if (hdlc->bit_shift == 0) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + hdlc->cbin = bitrev8(*src++); + else + hdlc->cbin = *src++; + slen--; + hdlc->bit_shift = 8; + if (hdlc->do_adapt56) + hdlc->bit_shift--; + } + + switch (hdlc->state) { + case STOPPED: + return 0; + case HDLC_FAST_IDLE: + if (hdlc->cbin == 0xff) { + hdlc->bit_shift = 0; + break; + } + hdlc->state = HDLC_GET_FLAG_B0; + hdlc->hdlc_bits1 = 0; + hdlc->bit_shift = 8; + break; + case HDLC_GET_FLAG_B0: + if (!(hdlc->cbin & 0x80)) { + hdlc->state = HDLC_GETFLAG_B1A6; + hdlc->hdlc_bits1 = 0; + } else { + if ((!hdlc->do_adapt56) && + (++hdlc->hdlc_bits1 >= 8) && + (hdlc->bit_shift == 1)) + hdlc->state = HDLC_FAST_IDLE; + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GETFLAG_B1A6: + if (hdlc->cbin & 0x80) { + hdlc->hdlc_bits1++; + if (hdlc->hdlc_bits1 == 6) + hdlc->state = HDLC_GETFLAG_B7; + } else + hdlc->hdlc_bits1 = 0; + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GETFLAG_B7: + if (hdlc->cbin & 0x80) { + hdlc->state = HDLC_GET_FLAG_B0; + } else { + hdlc->state = HDLC_GET_DATA; + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->hdlc_bits1 = 0; + hdlc->data_bits = 0; + hdlc->data_received = 0; + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GET_DATA: + if (hdlc->cbin & 0x80) { + hdlc->hdlc_bits1++; + switch (hdlc->hdlc_bits1) { + case 6: + break; + case 7: + if (hdlc->data_received) + /* bad frame */ + status = -HDLC_FRAMING_ERROR; + if (!hdlc->do_adapt56) { + if (hdlc->cbin == fast_abort + [hdlc->bit_shift + 1]) { + hdlc->state = + HDLC_FAST_IDLE; + hdlc->bit_shift = 1; + break; + } + } else + hdlc->state = HDLC_GET_FLAG_B0; + break; + default: + hdlc->shift_reg >>= 1; + hdlc->shift_reg |= 0x80; + hdlc->data_bits++; + break; + } + } else { + switch (hdlc->hdlc_bits1) { + case 5: + break; + case 6: + if (hdlc->data_received) + status = check_frame(hdlc); + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->data_bits = 0; + if (!hdlc->do_adapt56) + handle_fast_flag(hdlc); + else { + hdlc->state = HDLC_GET_DATA; + hdlc->data_received = 0; + } + break; + default: + hdlc->shift_reg >>= 1; + hdlc->data_bits++; + break; + } + hdlc->hdlc_bits1 = 0; + } + if (status) { + hdlc->dstpos = 0; + *count -= slen; + hdlc->cbin <<= 1; + hdlc->bit_shift--; + return status; + } + if (hdlc->data_bits == 8) { + hdlc->data_bits = 0; + hdlc->data_received = 1; + hdlc->crc = crc_ccitt_byte(hdlc->crc, + hdlc->shift_reg); + + /* good byte received */ + if (hdlc->dstpos < dsize) + dst[hdlc->dstpos++] = hdlc->shift_reg; + else { + /* frame too long */ + status = -HDLC_LENGTH_ERROR; + hdlc->dstpos = 0; + } + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_FAST_FLAG: + if (hdlc->cbin == hdlc->ffvalue) { + hdlc->bit_shift = 0; + break; + } else { + if (hdlc->cbin == 0xff) { + hdlc->state = HDLC_FAST_IDLE; + hdlc->bit_shift = 0; + } else if (hdlc->ffbit_shift == 8) { + hdlc->state = HDLC_GETFLAG_B7; + break; + } else + handle_abort(hdlc); + } + break; + default: + break; + } + } + *count -= slen; + return 0; +} +EXPORT_SYMBOL(isdnhdlc_decode); +/* + isdnhdlc_encode - encodes HDLC frames to a transparent bit stream. + + The bit stream starts with a beginning flag (01111110). After + that each byte is added to the bit stream with bit stuffing added + (0 after 5 1's). + When the last byte has been removed from the source buffer, the + CRC (2 bytes is added) and the frame terminates with the ending flag. + For the dchannel, the idle character (all 1's) is also added at the end. + If this function is called with empty source buffer (slen=0), flags or + idle character will be generated. + + src - source buffer + slen - source buffer length + count - number of bytes removed (encoded) from source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of encoded bytes in the destination buffer +*/ +int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, + int *count, u8 *dst, int dsize) +{ + static const unsigned char xfast_flag_value[] = { + 0x7e, 0x3f, 0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xfc, 0x7e + }; + + int len = 0; + + *count = slen; + + /* special handling for one byte frames */ + if ((slen == 1) && (hdlc->state == HDLC_SEND_FAST_FLAG)) + hdlc->state = HDLC_SENDFLAG_ONE; + while (dsize > 0) { + if (hdlc->bit_shift == 0) { + if (slen && !hdlc->do_closing) { + hdlc->shift_reg = *src++; + slen--; + if (slen == 0) + /* closing sequence, CRC + flag(s) */ + hdlc->do_closing = 1; + hdlc->bit_shift = 8; + } else { + if (hdlc->state == HDLC_SEND_DATA) { + if (hdlc->data_received) { + hdlc->state = HDLC_SEND_CRC1; + hdlc->crc ^= 0xffff; + hdlc->bit_shift = 8; + hdlc->shift_reg = + hdlc->crc & 0xff; + } else if (!hdlc->do_adapt56) + hdlc->state = + HDLC_SEND_FAST_FLAG; + else + hdlc->state = + HDLC_SENDFLAG_B0; + } + + } + } + + switch (hdlc->state) { + case STOPPED: + while (dsize--) + *dst++ = 0xff; + return dsize; + case HDLC_SEND_FAST_FLAG: + hdlc->do_closing = 0; + if (slen == 0) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->ffvalue); + else + *dst++ = hdlc->ffvalue; + len++; + dsize--; + break; + } + /* fall through */ + case HDLC_SENDFLAG_ONE: + if (hdlc->bit_shift == 8) { + hdlc->cbin = hdlc->ffvalue >> + (8 - hdlc->data_bits); + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SENDFLAG_B0: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->hdlc_bits1 = 0; + hdlc->state = HDLC_SENDFLAG_B1A6; + break; + case HDLC_SENDFLAG_B1A6: + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->cbin++; + if (++hdlc->hdlc_bits1 == 6) + hdlc->state = HDLC_SENDFLAG_B7; + break; + case HDLC_SENDFLAG_B7: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (slen == 0) { + hdlc->state = HDLC_SENDFLAG_B0; + break; + } + if (hdlc->bit_shift == 8) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SEND_FIRST_FLAG: + hdlc->data_received = 1; + if (hdlc->data_bits == 8) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + break; + } + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->shift_reg & 0x01) + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + } + break; + case HDLC_SEND_DATA: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->bit_shift == 8) + hdlc->crc = crc_ccitt_byte(hdlc->crc, + hdlc->shift_reg); + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + break; + case HDLC_SEND_CRC1: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if (hdlc->bit_shift == 0) { + hdlc->shift_reg = (hdlc->crc >> 8); + hdlc->state = HDLC_SEND_CRC2; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CRC2: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if (hdlc->bit_shift == 0) { + hdlc->shift_reg = 0x7e; + hdlc->state = HDLC_SEND_CLOSING_FLAG; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CLOSING_FLAG: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->ffvalue = + xfast_flag_value[hdlc->data_bits]; + if (hdlc->dchannel) { + hdlc->ffvalue = 0x7e; + hdlc->state = HDLC_SEND_IDLE1; + hdlc->bit_shift = 8-hdlc->data_bits; + if (hdlc->bit_shift == 0) + hdlc->state = + HDLC_SEND_FAST_IDLE; + } else { + if (!hdlc->do_adapt56) { + hdlc->state = + HDLC_SEND_FAST_FLAG; + hdlc->data_received = 0; + } else { + hdlc->state = HDLC_SENDFLAG_B0; + hdlc->data_received = 0; + } + /* Finished this frame, send flags */ + if (dsize > 1) + dsize = 1; + } + } + break; + case HDLC_SEND_IDLE1: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->state = HDLC_SEND_FAST_IDLE; + hdlc->bit_shift = 0; + } + break; + case HDLC_SEND_FAST_IDLE: + hdlc->do_closing = 0; + hdlc->cbin = 0xff; + hdlc->data_bits = 8; + if (hdlc->bit_shift == 8) { + hdlc->cbin = 0x7e; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->cbin); + else + *dst++ = hdlc->cbin; + hdlc->bit_shift = 0; + hdlc->data_bits = 0; + len++; + dsize = 0; + } + break; + default: + break; + } + if (hdlc->do_adapt56) { + if (hdlc->data_bits == 7) { + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + } + } + if (hdlc->data_bits == 8) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->cbin); + else + *dst++ = hdlc->cbin; + hdlc->data_bits = 0; + len++; + dsize--; + } + } + *count -= slen; + + return len; +} +EXPORT_SYMBOL(isdnhdlc_encode); -- To view, visit https://gerrit.osmocom.org/8114 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c58f9cb6921c2fdd0f2fcb11f622a0be88c7c63 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Fri May 11 20:01:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:01:35 +0000 Subject: [PATCH] libosmocore[master]: isdnhdlc: Port from kernel to userspace Message-ID: Review at https://gerrit.osmocom.org/8115 isdnhdlc: Port from kernel to userspace * prefix all symbols/constants with osmo_ * use stdint.h types instead of kernel types * use Doxygen API documentation * use Osmocom CRC16-CCITT functions * use Osmocom bit-reversal functions * integrate with Automake Change-Id: I109085ab3e412c20b19cd42fb7137aa0e4167542 --- M include/Makefile.am M include/osmocom/core/isdnhdlc.h M src/Makefile.am M src/isdnhdlc.c 4 files changed, 75 insertions(+), 84 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/8115/1 diff --git a/include/Makefile.am b/include/Makefile.am index f82012f..27a4090 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,6 +26,7 @@ osmocom/core/fsm.h \ osmocom/core/gsmtap.h \ osmocom/core/gsmtap_util.h \ + osmocom/core/isdnhdlc.h \ osmocom/core/linuxlist.h \ osmocom/core/linuxrbtree.h \ osmocom/core/logging.h \ diff --git a/include/osmocom/core/isdnhdlc.h b/include/osmocom/core/isdnhdlc.h index 9652137..56369bf 100644 --- a/include/osmocom/core/isdnhdlc.h +++ b/include/osmocom/core/isdnhdlc.h @@ -1,5 +1,5 @@ /* - * hdlc.h -- General purpose ISDN HDLC decoder. + * isdnhdlc.h -- General purpose ISDN HDLC decoder. * * Implementation of a HDLC decoder/encoder in software. * Necessary because some ISDN devices don't have HDLC @@ -29,7 +29,9 @@ #ifndef __ISDNHDLC_H__ #define __ISDNHDLC_H__ -struct isdnhdlc_vars { +#include + +struct osmo_isdnhdlc_vars { int bit_shift; int hdlc_bits1; int data_bits; @@ -37,46 +39,46 @@ int state; int dstpos; - u16 crc; + uint16_t crc; - u8 cbin; - u8 shift_reg; - u8 ffvalue; + uint8_t cbin; + uint8_t shift_reg; + uint8_t ffvalue; /* set if transferring data */ - u32 data_received:1; + uint32_t data_received:1; /* set if D channel (send idle instead of flags) */ - u32 dchannel:1; + uint32_t dchannel:1; /* set if 56K adaptation */ - u32 do_adapt56:1; + uint32_t do_adapt56:1; /* set if in closing phase (need to send CRC + flag) */ - u32 do_closing:1; + uint32_t do_closing:1; /* set if data is bitreverse */ - u32 do_bitreverse:1; + uint32_t do_bitreverse:1; }; /* Feature Flags */ -#define HDLC_56KBIT 0x01 -#define HDLC_DCHANNEL 0x02 -#define HDLC_BITREVERSE 0x04 +#define OSMO_HDLC_F_56KBIT 0x01 +#define OSMO_HDLC_F_DCHANNEL 0x02 +#define OSMO_HDLC_F_BITREVERSE 0x04 /* The return value from isdnhdlc_decode is the frame length, 0 if no complete frame was decoded, or a negative error number */ -#define HDLC_FRAMING_ERROR 1 -#define HDLC_CRC_ERROR 2 -#define HDLC_LENGTH_ERROR 3 +#define OSMO_HDLC_FRAMING_ERROR 1 +#define OSMO_HDLC_CRC_ERROR 2 +#define OSMO_HDLC_LENGTH_ERROR 3 -extern void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_rcv_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, - int slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_decode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + int slen, int *count, uint8_t *dst, int dsize); -extern void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_out_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, - u16 slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_encode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + uint16_t slen, int *count, uint8_t *dst, int dsize); #endif /* __ISDNHDLC_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index 2a77d5e..45fb89d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,8 @@ conv.c application.c rbtree.c strrb.c \ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - conv_acc.c conv_acc_generic.c sercomm.c prbs.c + conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ + isdnhdlc.c if HAVE_SSSE3 libosmocore_la_SOURCES += conv_acc_sse.c diff --git a/src/isdnhdlc.c b/src/isdnhdlc.c index 027d1c5..58b4a66 100644 --- a/src/isdnhdlc.c +++ b/src/isdnhdlc.c @@ -7,6 +7,8 @@ * 2001 Frode Isaksen * 2001 Kai Germaschewski * + * slightly adapted for use in userspace / osmocom envrionment by Harald Welte + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -22,21 +24,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include -#include -#include -#include +#include -/*-------------------------------------------------------------------*/ - -MODULE_AUTHOR("Wolfgang M?es , " - "Frode Isaksen , " - "Kai Germaschewski "); -MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); -MODULE_LICENSE("GPL"); - -/*-------------------------------------------------------------------*/ +#include +#include +#include enum { HDLC_FAST_IDLE, HDLC_GET_FLAG_B0, HDLC_GETFLAG_B1A6, HDLC_GETFLAG_B7, @@ -50,21 +42,22 @@ HDLC_SENDFLAG_B1A6, HDLC_SENDFLAG_B7, STOPPED, HDLC_SENDFLAG_ONE }; -void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features) +#define crc_ccitt_byte osmo_crc16_ccitt_byte + +void osmo_isdnhdlc_rcv_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features) { - memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + memset(hdlc, 0, sizeof(*hdlc)); hdlc->state = HDLC_GET_DATA; - if (features & HDLC_56KBIT) + if (features & OSMO_HDLC_F_56KBIT) hdlc->do_adapt56 = 1; - if (features & HDLC_BITREVERSE) + if (features & OSMO_HDLC_F_BITREVERSE) hdlc->do_bitreverse = 1; } -EXPORT_SYMBOL(isdnhdlc_out_init); -void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features) +void osmo_isdnhdlc_out_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features) { - memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); - if (features & HDLC_DCHANNEL) { + memset(hdlc, 0, sizeof(*hdlc)); + if (features & OSMO_HDLC_F_DCHANNEL) { hdlc->dchannel = 1; hdlc->state = HDLC_SEND_FIRST_FLAG; } else { @@ -73,25 +66,24 @@ hdlc->ffvalue = 0x7e; } hdlc->cbin = 0x7e; - if (features & HDLC_56KBIT) { + if (features & OSMO_HDLC_F_56KBIT) { hdlc->do_adapt56 = 1; hdlc->state = HDLC_SENDFLAG_B0; } else hdlc->data_bits = 8; - if (features & HDLC_BITREVERSE) + if (features & OSMO_HDLC_F_BITREVERSE) hdlc->do_bitreverse = 1; } -EXPORT_SYMBOL(isdnhdlc_rcv_init); static int -check_frame(struct isdnhdlc_vars *hdlc) +check_frame(struct osmo_isdnhdlc_vars *hdlc) { int status; if (hdlc->dstpos < 2) /* too small - framing error */ - status = -HDLC_FRAMING_ERROR; + status = -OSMO_HDLC_FRAMING_ERROR; else if (hdlc->crc != 0xf0b8) /* crc error */ - status = -HDLC_CRC_ERROR; + status = -OSMO_HDLC_CRC_ERROR; else { /* remove CRC */ hdlc->dstpos -= 2; @@ -101,8 +93,7 @@ return status; } -/* - isdnhdlc_decode - decodes HDLC frames from a transparent bit stream. +/*! decodes HDLC frames from a transparent bit stream. The source buffer is scanned for valid HDLC frames looking for flags (01111110) to indicate the start of a frame. If the start of @@ -114,22 +105,21 @@ If the beginning of a valid frame is found, the function returns the length. If a framing error is found (too many 1s and not a flag) the function - returns the length with the bit HDLC_FRAMING_ERROR set. + returns the length with the bit OSMO_HDLC_FRAMING_ERROR set. If a CRC error is found the function returns the length with the - bit HDLC_CRC_ERROR set. + bit OSMO_HDLC_CRC_ERROR set. If the frame length exceeds the destination buffer size, the function - returns the length with the bit HDLC_LENGTH_ERROR set. + returns the length with the bit OSMO_HDLC_LENGTH_ERROR set. - src - source buffer - slen - source buffer length - count - number of bytes removed (decoded) from the source buffer - dst _ destination buffer - dsize - destination buffer size - returns - number of decoded bytes in the destination buffer and status - flag. + \param[in] src source buffer + \param[in] slen source buffer length + \param[out] count number of bytes removed (decoded) from the source buffer + \param[out] dst destination buffer + \param[in] dsize destination buffer size + \returns number of decoded bytes in the destination buffer and status flag. */ -int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, int slen, - int *count, u8 *dst, int dsize) +int osmo_isdnhdlc_decode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, int slen, + int *count, uint8_t *dst, int dsize) { int status = 0; @@ -175,7 +165,7 @@ if (hdlc->bit_shift == 0) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - hdlc->cbin = bitrev8(*src++); + hdlc->cbin = osmo_revbytebits_8(*src++); else hdlc->cbin = *src++; slen--; @@ -242,7 +232,7 @@ case 7: if (hdlc->data_received) /* bad frame */ - status = -HDLC_FRAMING_ERROR; + status = -OSMO_HDLC_FRAMING_ERROR; if (!hdlc->do_adapt56) { if (hdlc->cbin == fast_abort [hdlc->bit_shift + 1]) { @@ -302,7 +292,7 @@ dst[hdlc->dstpos++] = hdlc->shift_reg; else { /* frame too long */ - status = -HDLC_LENGTH_ERROR; + status = -OSMO_HDLC_LENGTH_ERROR; hdlc->dstpos = 0; } } @@ -331,9 +321,7 @@ *count -= slen; return 0; } -EXPORT_SYMBOL(isdnhdlc_decode); -/* - isdnhdlc_encode - encodes HDLC frames to a transparent bit stream. +/*! encodes HDLC frames to a transparent bit stream. The bit stream starts with a beginning flag (01111110). After that each byte is added to the bit stream with bit stuffing added @@ -344,15 +332,15 @@ If this function is called with empty source buffer (slen=0), flags or idle character will be generated. - src - source buffer - slen - source buffer length - count - number of bytes removed (encoded) from source buffer - dst _ destination buffer - dsize - destination buffer size - returns - number of encoded bytes in the destination buffer + \param[in] src source buffer + \param[in] slen source buffer length + \param[out] count number of bytes removed (encoded) from source buffer + \param[out] dst destination buffer + \param[in] dsize destination buffer size + \returns - number of encoded bytes in the destination buffer */ -int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, - int *count, u8 *dst, int dsize) +int osmo_isdnhdlc_encode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, uint16_t slen, + int *count, uint8_t *dst, int dsize) { static const unsigned char xfast_flag_value[] = { 0x7e, 0x3f, 0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xfc, 0x7e @@ -403,7 +391,7 @@ if (slen == 0) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->ffvalue); + *dst++ = osmo_revbytebits_8(hdlc->ffvalue); else *dst++ = hdlc->ffvalue; len++; @@ -593,7 +581,7 @@ } else { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->cbin); + *dst++ = osmo_revbytebits_8(hdlc->cbin); else *dst++ = hdlc->cbin; hdlc->bit_shift = 0; @@ -615,7 +603,7 @@ if (hdlc->data_bits == 8) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->cbin); + *dst++ = osmo_revbytebits_8(hdlc->cbin); else *dst++ = hdlc->cbin; hdlc->data_bits = 0; @@ -627,4 +615,3 @@ return len; } -EXPORT_SYMBOL(isdnhdlc_encode); -- To view, visit https://gerrit.osmocom.org/8115 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I109085ab3e412c20b19cd42fb7137aa0e4167542 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte From gerrit-no-reply at lists.osmocom.org Fri May 11 20:05:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:05:16 +0000 Subject: libosmocore[master]: import isdn4linux HDLC code from linux kernel In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8114 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3c58f9cb6921c2fdd0f2fcb11f622a0be88c7c63 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 11 20:09:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:09:48 +0000 Subject: libosmocore[master]: isdnhdlc: Port from kernel to userspace In-Reply-To: References: Message-ID: Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8115 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I109085ab3e412c20b19cd42fb7137aa0e4167542 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No From gerrit-no-reply at lists.osmocom.org Fri May 11 20:09:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:09:49 +0000 Subject: [MERGED] libosmocore[master]: isdnhdlc: Port from kernel to userspace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: isdnhdlc: Port from kernel to userspace ...................................................................... isdnhdlc: Port from kernel to userspace * prefix all symbols/constants with osmo_ * use stdint.h types instead of kernel types * use Doxygen API documentation * use Osmocom CRC16-CCITT functions * use Osmocom bit-reversal functions * integrate with Automake Change-Id: I109085ab3e412c20b19cd42fb7137aa0e4167542 --- M include/Makefile.am M include/osmocom/core/isdnhdlc.h M src/Makefile.am M src/isdnhdlc.c 4 files changed, 75 insertions(+), 84 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index f82012f..27a4090 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -26,6 +26,7 @@ osmocom/core/fsm.h \ osmocom/core/gsmtap.h \ osmocom/core/gsmtap_util.h \ + osmocom/core/isdnhdlc.h \ osmocom/core/linuxlist.h \ osmocom/core/linuxrbtree.h \ osmocom/core/logging.h \ diff --git a/include/osmocom/core/isdnhdlc.h b/include/osmocom/core/isdnhdlc.h index 9652137..56369bf 100644 --- a/include/osmocom/core/isdnhdlc.h +++ b/include/osmocom/core/isdnhdlc.h @@ -1,5 +1,5 @@ /* - * hdlc.h -- General purpose ISDN HDLC decoder. + * isdnhdlc.h -- General purpose ISDN HDLC decoder. * * Implementation of a HDLC decoder/encoder in software. * Necessary because some ISDN devices don't have HDLC @@ -29,7 +29,9 @@ #ifndef __ISDNHDLC_H__ #define __ISDNHDLC_H__ -struct isdnhdlc_vars { +#include + +struct osmo_isdnhdlc_vars { int bit_shift; int hdlc_bits1; int data_bits; @@ -37,46 +39,46 @@ int state; int dstpos; - u16 crc; + uint16_t crc; - u8 cbin; - u8 shift_reg; - u8 ffvalue; + uint8_t cbin; + uint8_t shift_reg; + uint8_t ffvalue; /* set if transferring data */ - u32 data_received:1; + uint32_t data_received:1; /* set if D channel (send idle instead of flags) */ - u32 dchannel:1; + uint32_t dchannel:1; /* set if 56K adaptation */ - u32 do_adapt56:1; + uint32_t do_adapt56:1; /* set if in closing phase (need to send CRC + flag) */ - u32 do_closing:1; + uint32_t do_closing:1; /* set if data is bitreverse */ - u32 do_bitreverse:1; + uint32_t do_bitreverse:1; }; /* Feature Flags */ -#define HDLC_56KBIT 0x01 -#define HDLC_DCHANNEL 0x02 -#define HDLC_BITREVERSE 0x04 +#define OSMO_HDLC_F_56KBIT 0x01 +#define OSMO_HDLC_F_DCHANNEL 0x02 +#define OSMO_HDLC_F_BITREVERSE 0x04 /* The return value from isdnhdlc_decode is the frame length, 0 if no complete frame was decoded, or a negative error number */ -#define HDLC_FRAMING_ERROR 1 -#define HDLC_CRC_ERROR 2 -#define HDLC_LENGTH_ERROR 3 +#define OSMO_HDLC_FRAMING_ERROR 1 +#define OSMO_HDLC_CRC_ERROR 2 +#define OSMO_HDLC_LENGTH_ERROR 3 -extern void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_rcv_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, - int slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_decode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + int slen, int *count, uint8_t *dst, int dsize); -extern void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features); +extern void osmo_isdnhdlc_out_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features); -extern int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, - u16 slen, int *count, u8 *dst, int dsize); +extern int osmo_isdnhdlc_encode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, + uint16_t slen, int *count, uint8_t *dst, int dsize); #endif /* __ISDNHDLC_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index 2a77d5e..45fb89d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,8 @@ conv.c application.c rbtree.c strrb.c \ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - conv_acc.c conv_acc_generic.c sercomm.c prbs.c + conv_acc.c conv_acc_generic.c sercomm.c prbs.c \ + isdnhdlc.c if HAVE_SSSE3 libosmocore_la_SOURCES += conv_acc_sse.c diff --git a/src/isdnhdlc.c b/src/isdnhdlc.c index 027d1c5..58b4a66 100644 --- a/src/isdnhdlc.c +++ b/src/isdnhdlc.c @@ -7,6 +7,8 @@ * 2001 Frode Isaksen * 2001 Kai Germaschewski * + * slightly adapted for use in userspace / osmocom envrionment by Harald Welte + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -22,21 +24,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include -#include -#include -#include -#include +#include -/*-------------------------------------------------------------------*/ - -MODULE_AUTHOR("Wolfgang M?es , " - "Frode Isaksen , " - "Kai Germaschewski "); -MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); -MODULE_LICENSE("GPL"); - -/*-------------------------------------------------------------------*/ +#include +#include +#include enum { HDLC_FAST_IDLE, HDLC_GET_FLAG_B0, HDLC_GETFLAG_B1A6, HDLC_GETFLAG_B7, @@ -50,21 +42,22 @@ HDLC_SENDFLAG_B1A6, HDLC_SENDFLAG_B7, STOPPED, HDLC_SENDFLAG_ONE }; -void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features) +#define crc_ccitt_byte osmo_crc16_ccitt_byte + +void osmo_isdnhdlc_rcv_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features) { - memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + memset(hdlc, 0, sizeof(*hdlc)); hdlc->state = HDLC_GET_DATA; - if (features & HDLC_56KBIT) + if (features & OSMO_HDLC_F_56KBIT) hdlc->do_adapt56 = 1; - if (features & HDLC_BITREVERSE) + if (features & OSMO_HDLC_F_BITREVERSE) hdlc->do_bitreverse = 1; } -EXPORT_SYMBOL(isdnhdlc_out_init); -void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features) +void osmo_isdnhdlc_out_init(struct osmo_isdnhdlc_vars *hdlc, uint32_t features) { - memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); - if (features & HDLC_DCHANNEL) { + memset(hdlc, 0, sizeof(*hdlc)); + if (features & OSMO_HDLC_F_DCHANNEL) { hdlc->dchannel = 1; hdlc->state = HDLC_SEND_FIRST_FLAG; } else { @@ -73,25 +66,24 @@ hdlc->ffvalue = 0x7e; } hdlc->cbin = 0x7e; - if (features & HDLC_56KBIT) { + if (features & OSMO_HDLC_F_56KBIT) { hdlc->do_adapt56 = 1; hdlc->state = HDLC_SENDFLAG_B0; } else hdlc->data_bits = 8; - if (features & HDLC_BITREVERSE) + if (features & OSMO_HDLC_F_BITREVERSE) hdlc->do_bitreverse = 1; } -EXPORT_SYMBOL(isdnhdlc_rcv_init); static int -check_frame(struct isdnhdlc_vars *hdlc) +check_frame(struct osmo_isdnhdlc_vars *hdlc) { int status; if (hdlc->dstpos < 2) /* too small - framing error */ - status = -HDLC_FRAMING_ERROR; + status = -OSMO_HDLC_FRAMING_ERROR; else if (hdlc->crc != 0xf0b8) /* crc error */ - status = -HDLC_CRC_ERROR; + status = -OSMO_HDLC_CRC_ERROR; else { /* remove CRC */ hdlc->dstpos -= 2; @@ -101,8 +93,7 @@ return status; } -/* - isdnhdlc_decode - decodes HDLC frames from a transparent bit stream. +/*! decodes HDLC frames from a transparent bit stream. The source buffer is scanned for valid HDLC frames looking for flags (01111110) to indicate the start of a frame. If the start of @@ -114,22 +105,21 @@ If the beginning of a valid frame is found, the function returns the length. If a framing error is found (too many 1s and not a flag) the function - returns the length with the bit HDLC_FRAMING_ERROR set. + returns the length with the bit OSMO_HDLC_FRAMING_ERROR set. If a CRC error is found the function returns the length with the - bit HDLC_CRC_ERROR set. + bit OSMO_HDLC_CRC_ERROR set. If the frame length exceeds the destination buffer size, the function - returns the length with the bit HDLC_LENGTH_ERROR set. + returns the length with the bit OSMO_HDLC_LENGTH_ERROR set. - src - source buffer - slen - source buffer length - count - number of bytes removed (decoded) from the source buffer - dst _ destination buffer - dsize - destination buffer size - returns - number of decoded bytes in the destination buffer and status - flag. + \param[in] src source buffer + \param[in] slen source buffer length + \param[out] count number of bytes removed (decoded) from the source buffer + \param[out] dst destination buffer + \param[in] dsize destination buffer size + \returns number of decoded bytes in the destination buffer and status flag. */ -int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, int slen, - int *count, u8 *dst, int dsize) +int osmo_isdnhdlc_decode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, int slen, + int *count, uint8_t *dst, int dsize) { int status = 0; @@ -175,7 +165,7 @@ if (hdlc->bit_shift == 0) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - hdlc->cbin = bitrev8(*src++); + hdlc->cbin = osmo_revbytebits_8(*src++); else hdlc->cbin = *src++; slen--; @@ -242,7 +232,7 @@ case 7: if (hdlc->data_received) /* bad frame */ - status = -HDLC_FRAMING_ERROR; + status = -OSMO_HDLC_FRAMING_ERROR; if (!hdlc->do_adapt56) { if (hdlc->cbin == fast_abort [hdlc->bit_shift + 1]) { @@ -302,7 +292,7 @@ dst[hdlc->dstpos++] = hdlc->shift_reg; else { /* frame too long */ - status = -HDLC_LENGTH_ERROR; + status = -OSMO_HDLC_LENGTH_ERROR; hdlc->dstpos = 0; } } @@ -331,9 +321,7 @@ *count -= slen; return 0; } -EXPORT_SYMBOL(isdnhdlc_decode); -/* - isdnhdlc_encode - encodes HDLC frames to a transparent bit stream. +/*! encodes HDLC frames to a transparent bit stream. The bit stream starts with a beginning flag (01111110). After that each byte is added to the bit stream with bit stuffing added @@ -344,15 +332,15 @@ If this function is called with empty source buffer (slen=0), flags or idle character will be generated. - src - source buffer - slen - source buffer length - count - number of bytes removed (encoded) from source buffer - dst _ destination buffer - dsize - destination buffer size - returns - number of encoded bytes in the destination buffer + \param[in] src source buffer + \param[in] slen source buffer length + \param[out] count number of bytes removed (encoded) from source buffer + \param[out] dst destination buffer + \param[in] dsize destination buffer size + \returns - number of encoded bytes in the destination buffer */ -int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, - int *count, u8 *dst, int dsize) +int osmo_isdnhdlc_encode(struct osmo_isdnhdlc_vars *hdlc, const uint8_t *src, uint16_t slen, + int *count, uint8_t *dst, int dsize) { static const unsigned char xfast_flag_value[] = { 0x7e, 0x3f, 0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xfc, 0x7e @@ -403,7 +391,7 @@ if (slen == 0) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->ffvalue); + *dst++ = osmo_revbytebits_8(hdlc->ffvalue); else *dst++ = hdlc->ffvalue; len++; @@ -593,7 +581,7 @@ } else { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->cbin); + *dst++ = osmo_revbytebits_8(hdlc->cbin); else *dst++ = hdlc->cbin; hdlc->bit_shift = 0; @@ -615,7 +603,7 @@ if (hdlc->data_bits == 8) { /* the code is for bitreverse streams */ if (hdlc->do_bitreverse == 0) - *dst++ = bitrev8(hdlc->cbin); + *dst++ = osmo_revbytebits_8(hdlc->cbin); else *dst++ = hdlc->cbin; hdlc->data_bits = 0; @@ -627,4 +615,3 @@ return len; } -EXPORT_SYMBOL(isdnhdlc_encode); -- To view, visit https://gerrit.osmocom.org/8115 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I109085ab3e412c20b19cd42fb7137aa0e4167542 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From gerrit-no-reply at lists.osmocom.org Fri May 11 20:09:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 11 May 2018 20:09:50 +0000 Subject: [MERGED] libosmocore[master]: import isdn4linux HDLC code from linux kernel In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. Change subject: import isdn4linux HDLC code from linux kernel ...................................................................... import isdn4linux HDLC code from linux kernel I've been importing from 94d7dbf108813ea45a91e27e9a8bd231d5a23fa7 but the isdnhdlc code hasn't seen any changes since 2012 anyway. Change-Id: I3c58f9cb6921c2fdd0f2fcb11f622a0be88c7c63 --- A include/osmocom/core/isdnhdlc.h A src/isdnhdlc.c 2 files changed, 712 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/isdnhdlc.h b/include/osmocom/core/isdnhdlc.h new file mode 100644 index 0000000..9652137 --- /dev/null +++ b/include/osmocom/core/isdnhdlc.h @@ -0,0 +1,82 @@ +/* + * hdlc.h -- General purpose ISDN HDLC decoder. + * + * Implementation of a HDLC decoder/encoder in software. + * Necessary because some ISDN devices don't have HDLC + * controllers. + * + * Copyright (C) + * 2009 Karsten Keil + * 2002 Wolfgang M?es + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __ISDNHDLC_H__ +#define __ISDNHDLC_H__ + +struct isdnhdlc_vars { + int bit_shift; + int hdlc_bits1; + int data_bits; + int ffbit_shift; /* encoding only */ + int state; + int dstpos; + + u16 crc; + + u8 cbin; + u8 shift_reg; + u8 ffvalue; + + /* set if transferring data */ + u32 data_received:1; + /* set if D channel (send idle instead of flags) */ + u32 dchannel:1; + /* set if 56K adaptation */ + u32 do_adapt56:1; + /* set if in closing phase (need to send CRC + flag) */ + u32 do_closing:1; + /* set if data is bitreverse */ + u32 do_bitreverse:1; +}; + +/* Feature Flags */ +#define HDLC_56KBIT 0x01 +#define HDLC_DCHANNEL 0x02 +#define HDLC_BITREVERSE 0x04 + +/* + The return value from isdnhdlc_decode is + the frame length, 0 if no complete frame was decoded, + or a negative error number +*/ +#define HDLC_FRAMING_ERROR 1 +#define HDLC_CRC_ERROR 2 +#define HDLC_LENGTH_ERROR 3 + +extern void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features); + +extern int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, + int slen, int *count, u8 *dst, int dsize); + +extern void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features); + +extern int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, + u16 slen, int *count, u8 *dst, int dsize); + +#endif /* __ISDNHDLC_H__ */ diff --git a/src/isdnhdlc.c b/src/isdnhdlc.c new file mode 100644 index 0000000..027d1c5 --- /dev/null +++ b/src/isdnhdlc.c @@ -0,0 +1,630 @@ +/* + * isdnhdlc.c -- General purpose ISDN HDLC decoder. + * + * Copyright (C) + * 2009 Karsten Keil + * 2002 Wolfgang M?es + * 2001 Frode Isaksen + * 2001 Kai Germaschewski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include + +/*-------------------------------------------------------------------*/ + +MODULE_AUTHOR("Wolfgang M?es , " + "Frode Isaksen , " + "Kai Germaschewski "); +MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); +MODULE_LICENSE("GPL"); + +/*-------------------------------------------------------------------*/ + +enum { + HDLC_FAST_IDLE, HDLC_GET_FLAG_B0, HDLC_GETFLAG_B1A6, HDLC_GETFLAG_B7, + HDLC_GET_DATA, HDLC_FAST_FLAG +}; + +enum { + HDLC_SEND_DATA, HDLC_SEND_CRC1, HDLC_SEND_FAST_FLAG, + HDLC_SEND_FIRST_FLAG, HDLC_SEND_CRC2, HDLC_SEND_CLOSING_FLAG, + HDLC_SEND_IDLE1, HDLC_SEND_FAST_IDLE, HDLC_SENDFLAG_B0, + HDLC_SENDFLAG_B1A6, HDLC_SENDFLAG_B7, STOPPED, HDLC_SENDFLAG_ONE +}; + +void isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features) +{ + memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + hdlc->state = HDLC_GET_DATA; + if (features & HDLC_56KBIT) + hdlc->do_adapt56 = 1; + if (features & HDLC_BITREVERSE) + hdlc->do_bitreverse = 1; +} +EXPORT_SYMBOL(isdnhdlc_out_init); + +void isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features) +{ + memset(hdlc, 0, sizeof(struct isdnhdlc_vars)); + if (features & HDLC_DCHANNEL) { + hdlc->dchannel = 1; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + hdlc->dchannel = 0; + hdlc->state = HDLC_SEND_FAST_FLAG; + hdlc->ffvalue = 0x7e; + } + hdlc->cbin = 0x7e; + if (features & HDLC_56KBIT) { + hdlc->do_adapt56 = 1; + hdlc->state = HDLC_SENDFLAG_B0; + } else + hdlc->data_bits = 8; + if (features & HDLC_BITREVERSE) + hdlc->do_bitreverse = 1; +} +EXPORT_SYMBOL(isdnhdlc_rcv_init); + +static int +check_frame(struct isdnhdlc_vars *hdlc) +{ + int status; + + if (hdlc->dstpos < 2) /* too small - framing error */ + status = -HDLC_FRAMING_ERROR; + else if (hdlc->crc != 0xf0b8) /* crc error */ + status = -HDLC_CRC_ERROR; + else { + /* remove CRC */ + hdlc->dstpos -= 2; + /* good frame */ + status = hdlc->dstpos; + } + return status; +} + +/* + isdnhdlc_decode - decodes HDLC frames from a transparent bit stream. + + The source buffer is scanned for valid HDLC frames looking for + flags (01111110) to indicate the start of a frame. If the start of + the frame is found, the bit stuffing is removed (0 after 5 1's). + When a new flag is found, the complete frame has been received + and the CRC is checked. + If a valid frame is found, the function returns the frame length + excluding the CRC with the bit HDLC_END_OF_FRAME set. + If the beginning of a valid frame is found, the function returns + the length. + If a framing error is found (too many 1s and not a flag) the function + returns the length with the bit HDLC_FRAMING_ERROR set. + If a CRC error is found the function returns the length with the + bit HDLC_CRC_ERROR set. + If the frame length exceeds the destination buffer size, the function + returns the length with the bit HDLC_LENGTH_ERROR set. + + src - source buffer + slen - source buffer length + count - number of bytes removed (decoded) from the source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of decoded bytes in the destination buffer and status + flag. +*/ +int isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src, int slen, + int *count, u8 *dst, int dsize) +{ + int status = 0; + + static const unsigned char fast_flag[] = { + 0x00, 0x00, 0x00, 0x20, 0x30, 0x38, 0x3c, 0x3e, 0x3f + }; + + static const unsigned char fast_flag_value[] = { + 0x00, 0x7e, 0xfc, 0xf9, 0xf3, 0xe7, 0xcf, 0x9f, 0x3f + }; + + static const unsigned char fast_abort[] = { + 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff + }; + +#define handle_fast_flag(h) \ + do { \ + if (h->cbin == fast_flag[h->bit_shift]) { \ + h->ffvalue = fast_flag_value[h->bit_shift]; \ + h->state = HDLC_FAST_FLAG; \ + h->ffbit_shift = h->bit_shift; \ + h->bit_shift = 1; \ + } else { \ + h->state = HDLC_GET_DATA; \ + h->data_received = 0; \ + } \ + } while (0) + +#define handle_abort(h) \ + do { \ + h->shift_reg = fast_abort[h->ffbit_shift - 1]; \ + h->hdlc_bits1 = h->ffbit_shift - 2; \ + if (h->hdlc_bits1 < 0) \ + h->hdlc_bits1 = 0; \ + h->data_bits = h->ffbit_shift - 1; \ + h->state = HDLC_GET_DATA; \ + h->data_received = 0; \ + } while (0) + + *count = slen; + + while (slen > 0) { + if (hdlc->bit_shift == 0) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + hdlc->cbin = bitrev8(*src++); + else + hdlc->cbin = *src++; + slen--; + hdlc->bit_shift = 8; + if (hdlc->do_adapt56) + hdlc->bit_shift--; + } + + switch (hdlc->state) { + case STOPPED: + return 0; + case HDLC_FAST_IDLE: + if (hdlc->cbin == 0xff) { + hdlc->bit_shift = 0; + break; + } + hdlc->state = HDLC_GET_FLAG_B0; + hdlc->hdlc_bits1 = 0; + hdlc->bit_shift = 8; + break; + case HDLC_GET_FLAG_B0: + if (!(hdlc->cbin & 0x80)) { + hdlc->state = HDLC_GETFLAG_B1A6; + hdlc->hdlc_bits1 = 0; + } else { + if ((!hdlc->do_adapt56) && + (++hdlc->hdlc_bits1 >= 8) && + (hdlc->bit_shift == 1)) + hdlc->state = HDLC_FAST_IDLE; + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GETFLAG_B1A6: + if (hdlc->cbin & 0x80) { + hdlc->hdlc_bits1++; + if (hdlc->hdlc_bits1 == 6) + hdlc->state = HDLC_GETFLAG_B7; + } else + hdlc->hdlc_bits1 = 0; + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GETFLAG_B7: + if (hdlc->cbin & 0x80) { + hdlc->state = HDLC_GET_FLAG_B0; + } else { + hdlc->state = HDLC_GET_DATA; + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->hdlc_bits1 = 0; + hdlc->data_bits = 0; + hdlc->data_received = 0; + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_GET_DATA: + if (hdlc->cbin & 0x80) { + hdlc->hdlc_bits1++; + switch (hdlc->hdlc_bits1) { + case 6: + break; + case 7: + if (hdlc->data_received) + /* bad frame */ + status = -HDLC_FRAMING_ERROR; + if (!hdlc->do_adapt56) { + if (hdlc->cbin == fast_abort + [hdlc->bit_shift + 1]) { + hdlc->state = + HDLC_FAST_IDLE; + hdlc->bit_shift = 1; + break; + } + } else + hdlc->state = HDLC_GET_FLAG_B0; + break; + default: + hdlc->shift_reg >>= 1; + hdlc->shift_reg |= 0x80; + hdlc->data_bits++; + break; + } + } else { + switch (hdlc->hdlc_bits1) { + case 5: + break; + case 6: + if (hdlc->data_received) + status = check_frame(hdlc); + hdlc->crc = 0xffff; + hdlc->shift_reg = 0; + hdlc->data_bits = 0; + if (!hdlc->do_adapt56) + handle_fast_flag(hdlc); + else { + hdlc->state = HDLC_GET_DATA; + hdlc->data_received = 0; + } + break; + default: + hdlc->shift_reg >>= 1; + hdlc->data_bits++; + break; + } + hdlc->hdlc_bits1 = 0; + } + if (status) { + hdlc->dstpos = 0; + *count -= slen; + hdlc->cbin <<= 1; + hdlc->bit_shift--; + return status; + } + if (hdlc->data_bits == 8) { + hdlc->data_bits = 0; + hdlc->data_received = 1; + hdlc->crc = crc_ccitt_byte(hdlc->crc, + hdlc->shift_reg); + + /* good byte received */ + if (hdlc->dstpos < dsize) + dst[hdlc->dstpos++] = hdlc->shift_reg; + else { + /* frame too long */ + status = -HDLC_LENGTH_ERROR; + hdlc->dstpos = 0; + } + } + hdlc->cbin <<= 1; + hdlc->bit_shift--; + break; + case HDLC_FAST_FLAG: + if (hdlc->cbin == hdlc->ffvalue) { + hdlc->bit_shift = 0; + break; + } else { + if (hdlc->cbin == 0xff) { + hdlc->state = HDLC_FAST_IDLE; + hdlc->bit_shift = 0; + } else if (hdlc->ffbit_shift == 8) { + hdlc->state = HDLC_GETFLAG_B7; + break; + } else + handle_abort(hdlc); + } + break; + default: + break; + } + } + *count -= slen; + return 0; +} +EXPORT_SYMBOL(isdnhdlc_decode); +/* + isdnhdlc_encode - encodes HDLC frames to a transparent bit stream. + + The bit stream starts with a beginning flag (01111110). After + that each byte is added to the bit stream with bit stuffing added + (0 after 5 1's). + When the last byte has been removed from the source buffer, the + CRC (2 bytes is added) and the frame terminates with the ending flag. + For the dchannel, the idle character (all 1's) is also added at the end. + If this function is called with empty source buffer (slen=0), flags or + idle character will be generated. + + src - source buffer + slen - source buffer length + count - number of bytes removed (encoded) from source buffer + dst _ destination buffer + dsize - destination buffer size + returns - number of encoded bytes in the destination buffer +*/ +int isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src, u16 slen, + int *count, u8 *dst, int dsize) +{ + static const unsigned char xfast_flag_value[] = { + 0x7e, 0x3f, 0x9f, 0xcf, 0xe7, 0xf3, 0xf9, 0xfc, 0x7e + }; + + int len = 0; + + *count = slen; + + /* special handling for one byte frames */ + if ((slen == 1) && (hdlc->state == HDLC_SEND_FAST_FLAG)) + hdlc->state = HDLC_SENDFLAG_ONE; + while (dsize > 0) { + if (hdlc->bit_shift == 0) { + if (slen && !hdlc->do_closing) { + hdlc->shift_reg = *src++; + slen--; + if (slen == 0) + /* closing sequence, CRC + flag(s) */ + hdlc->do_closing = 1; + hdlc->bit_shift = 8; + } else { + if (hdlc->state == HDLC_SEND_DATA) { + if (hdlc->data_received) { + hdlc->state = HDLC_SEND_CRC1; + hdlc->crc ^= 0xffff; + hdlc->bit_shift = 8; + hdlc->shift_reg = + hdlc->crc & 0xff; + } else if (!hdlc->do_adapt56) + hdlc->state = + HDLC_SEND_FAST_FLAG; + else + hdlc->state = + HDLC_SENDFLAG_B0; + } + + } + } + + switch (hdlc->state) { + case STOPPED: + while (dsize--) + *dst++ = 0xff; + return dsize; + case HDLC_SEND_FAST_FLAG: + hdlc->do_closing = 0; + if (slen == 0) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->ffvalue); + else + *dst++ = hdlc->ffvalue; + len++; + dsize--; + break; + } + /* fall through */ + case HDLC_SENDFLAG_ONE: + if (hdlc->bit_shift == 8) { + hdlc->cbin = hdlc->ffvalue >> + (8 - hdlc->data_bits); + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SENDFLAG_B0: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->hdlc_bits1 = 0; + hdlc->state = HDLC_SENDFLAG_B1A6; + break; + case HDLC_SENDFLAG_B1A6: + hdlc->cbin <<= 1; + hdlc->data_bits++; + hdlc->cbin++; + if (++hdlc->hdlc_bits1 == 6) + hdlc->state = HDLC_SENDFLAG_B7; + break; + case HDLC_SENDFLAG_B7: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (slen == 0) { + hdlc->state = HDLC_SENDFLAG_B0; + break; + } + if (hdlc->bit_shift == 8) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + hdlc->data_received = 1; + } + break; + case HDLC_SEND_FIRST_FLAG: + hdlc->data_received = 1; + if (hdlc->data_bits == 8) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + break; + } + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->shift_reg & 0x01) + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->state = HDLC_SEND_DATA; + hdlc->crc = 0xffff; + hdlc->hdlc_bits1 = 0; + } + break; + case HDLC_SEND_DATA: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->bit_shift == 8) + hdlc->crc = crc_ccitt_byte(hdlc->crc, + hdlc->shift_reg); + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + break; + case HDLC_SEND_CRC1: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if (hdlc->bit_shift == 0) { + hdlc->shift_reg = (hdlc->crc >> 8); + hdlc->state = HDLC_SEND_CRC2; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CRC2: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) { + hdlc->hdlc_bits1++; + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } else { + hdlc->hdlc_bits1 = 0; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + } + if (hdlc->bit_shift == 0) { + hdlc->shift_reg = 0x7e; + hdlc->state = HDLC_SEND_CLOSING_FLAG; + hdlc->bit_shift = 8; + } + break; + case HDLC_SEND_CLOSING_FLAG: + hdlc->cbin <<= 1; + hdlc->data_bits++; + if (hdlc->hdlc_bits1 == 5) { + hdlc->hdlc_bits1 = 0; + break; + } + if (hdlc->shift_reg & 0x01) + hdlc->cbin++; + hdlc->shift_reg >>= 1; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->ffvalue = + xfast_flag_value[hdlc->data_bits]; + if (hdlc->dchannel) { + hdlc->ffvalue = 0x7e; + hdlc->state = HDLC_SEND_IDLE1; + hdlc->bit_shift = 8-hdlc->data_bits; + if (hdlc->bit_shift == 0) + hdlc->state = + HDLC_SEND_FAST_IDLE; + } else { + if (!hdlc->do_adapt56) { + hdlc->state = + HDLC_SEND_FAST_FLAG; + hdlc->data_received = 0; + } else { + hdlc->state = HDLC_SENDFLAG_B0; + hdlc->data_received = 0; + } + /* Finished this frame, send flags */ + if (dsize > 1) + dsize = 1; + } + } + break; + case HDLC_SEND_IDLE1: + hdlc->do_closing = 0; + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + hdlc->bit_shift--; + if (hdlc->bit_shift == 0) { + hdlc->state = HDLC_SEND_FAST_IDLE; + hdlc->bit_shift = 0; + } + break; + case HDLC_SEND_FAST_IDLE: + hdlc->do_closing = 0; + hdlc->cbin = 0xff; + hdlc->data_bits = 8; + if (hdlc->bit_shift == 8) { + hdlc->cbin = 0x7e; + hdlc->state = HDLC_SEND_FIRST_FLAG; + } else { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->cbin); + else + *dst++ = hdlc->cbin; + hdlc->bit_shift = 0; + hdlc->data_bits = 0; + len++; + dsize = 0; + } + break; + default: + break; + } + if (hdlc->do_adapt56) { + if (hdlc->data_bits == 7) { + hdlc->cbin <<= 1; + hdlc->cbin++; + hdlc->data_bits++; + } + } + if (hdlc->data_bits == 8) { + /* the code is for bitreverse streams */ + if (hdlc->do_bitreverse == 0) + *dst++ = bitrev8(hdlc->cbin); + else + *dst++ = hdlc->cbin; + hdlc->data_bits = 0; + len++; + dsize--; + } + } + *count -= slen; + + return len; +} +EXPORT_SYMBOL(isdnhdlc_encode); -- To view, visit https://gerrit.osmocom.org/8114 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c58f9cb6921c2fdd0f2fcb11f622a0be88c7c63 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder From admin at opensuse.org Fri May 11 20:47:33 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 20:47:33 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af60178af3a_16495f2684157027@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 266s] [ 243.354984] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.985429] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.614851] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.285399] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.934844] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.941746] dracut-initqueue[463]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_26/root: 28225 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 35527 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/26/build/build-vm: line 458: kill: (28218) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 20:53:14 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 20:53:14 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af602c553828_16495f26841574c7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 249s] [ 231.884445] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 249s] [ 232.494389] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 250s] [ 233.124307] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 251s] [ 233.765359] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 251s] [ 234.404869] dracut-initqueue[486]: Warning: dracut-initqueue timeout - starting timeout scripts [ 251s] [ 234.407732] dracut-initqueue[486]: Warning: Could not boot. [ 251s] Starting Setup Virtual Console... [ 251s] [ OK ] Started Setup Virtual Console. [ 251s] Starting Dracut Emergency Shell... [ 251s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 251s] [ 251s] Generating "/run/initramfs/rdsosreport.txt" [ 252s] [ 252s] [ 252s] Entering emergency mode. Exit the shell to continue. [ 252s] Type "journalctl" to view system logs. [ 252s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 252s] after mounting them and attach it to a bug report. [ 252s] [ 252s] [ 321s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_17/root: 7167 [ 321s] qemu-system-aarch64: terminating on signal 15 from pid 9526 () [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (7160) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 20:54:06 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 20:54:06 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af602ffbea1b_16495f26841575d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 265s] [ 242.954881] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.615511] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.274818] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.935643] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.594727] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.601440] dracut-initqueue[466]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_31/root: 18741 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 25936 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/31/build/build-vm: line 458: kill: (18734) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 20:55:31 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 20:55:31 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6035b2309_16495f26841577b3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 266s] [ 242.954809] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.605452] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.234927] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.865354] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.514823] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.522771] dracut-initqueue[460]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_7/root: 41827 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 47958 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/7/build/build-vm: line 458: kill: (41820) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 21:00:07 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 21:00:07 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af60463cfb93_16495f268415861b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 264s] [ 242.554604] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.215291] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.884695] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.535287] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 245.184726] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 245.191430] dracut-initqueue[471]: Warning: Could not boot. [ 267s] Starting Setup Virtual Console... [ 267s] [ OK ] Started Setup Virtual Console. [ 267s] Starting Dracut Emergency Shell... [ 267s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 267s] [ 267s] Generating "/run/initramfs/rdsosreport.txt" [ 267s] [ 267s] [ 267s] Entering emergency mode. Exit the shell to continue. [ 267s] Type "journalctl" to view system logs. [ 267s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 267s] after mounting them and attach it to a bug report. [ 267s] [ 267s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_32/root: 28343 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 35882 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (28335) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 21:50:57 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 21:50:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6105c8042d_16495f268416554f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 266s] [ 240.928185] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 241.609452] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 242.267666] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 242.902327] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 243.563389] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 243.567044] dracut-initqueue[513]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_1/root: 33835 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 865 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (33828) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 21:51:31 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 21:51:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6107791b06_16495f2684165626@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 283s] [ 256.855047] dracut-initqueue[452]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 257.535642] dracut-initqueue[452]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 258.184890] dracut-initqueue[452]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 258.847342] dracut-initqueue[452]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 259.524875] dracut-initqueue[452]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 259.532223] dracut-initqueue[452]: Warning: Could not boot. [ 285s] Starting Setup Virtual Console... [ 285s] [ OK ] Started Setup Virtual Console. [ 285s] Starting Dracut Emergency Shell... [ 285s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 286s] [ 286s] Generating "/run/initramfs/rdsosreport.txt" [ 301s] [ 301s] [ 301s] Entering emergency mode. Exit the shell to continue. [ 301s] Type "journalctl" to view system logs. [ 301s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 301s] after mounting them and attach it to a bug report. [ 301s] [ 301s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_32/root: 17783 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 45038 (fuser) [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (17774) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 21:58:40 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 21:58:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6121b4640e_16495f26841658b2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 269s] [ 245.254911] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.925515] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.554895] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.215544] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.865041] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.872249] dracut-initqueue[463]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_13/root: 19600 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 39832 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/13/build/build-vm: line 458: kill: (19593) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 21:59:14 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 21:59:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6123c6c75c_16495f268416599b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 264s] [ 240.898340] dracut-initqueue[488]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 241.480718] dracut-initqueue[488]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 242.117277] dracut-initqueue[488]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 242.727845] dracut-initqueue[488]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.359300] dracut-initqueue[488]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.362421] dracut-initqueue[488]: Warning: Could not boot. [ 267s] Starting Setup Virtual Console... [ 267s] [ OK ] Started Setup Virtual Console. [ 267s] Starting Dracut Emergency Shell... [ 267s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 267s] [ 267s] Generating "/run/initramfs/rdsosreport.txt" [ 267s] [ 267s] [ 267s] Entering emergency mode. Exit the shell to continue. [ 267s] Type "journalctl" to view system logs. [ 267s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 267s] after mounting them and attach it to a bug report. [ 267s] [ 267s] [ 326s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_7/root: 22194 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 52938 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/7/build/build-vm: line 458: kill: (22187) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 22:01:31 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 22:01:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af612d48996a_16495f26841742df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 302s] [ 260.359825] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 303s] [ 261.083657] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 261.776529] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 262.460386] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 263.133666] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 263.139983] dracut-initqueue[483]: Warning: Could not boot. [ 305s] Starting Setup Virtual Console... [ 305s] [ OK ] Started Setup Virtual Console. [ 305s] Starting Dracut Emergency Shell... [ 305s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 305s] [ 305s] Generating "/run/initramfs/rdsosreport.txt" [ 306s] [ 306s] [ 306s] Entering emergency mode. Exit the shell to continue. [ 306s] Type "journalctl" to view system logs. [ 306s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 306s] after mounting them and attach it to a bug report. [ 306s] [ 306s] [ 350s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 350s] /var/cache/obs/worker/root_24/root: 25555 [ 350s] qemu-system-aarch64: terminating on signal 15 from pid 11022 () [ 351s] ### VM INTERACTION END ### [ 351s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (25545) - No such process [ 351s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 351s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Fri May 11 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 11 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#31?= In-Reply-To: <2117192340.493.1525992080681.JavaMail.jenkins@jenkins.osmocom.org> References: <2117192340.493.1525992080681.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1648018638.511.1526078480887.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-32390/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-32390/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-32390/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-32390/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-32390/ libtool: install: (cd /tmp/am-dc-32390/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-32390/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-32390/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-32390/ libtool: install: chmod 644 /tmp/am-dc-32390/ libtool: install: ranlib /tmp/am-dc-32390/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-32390/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-32390/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-32390/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-32390/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-32390/ /bin/mkdir -p '/tmp/am-dc-32390/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-32390/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-32390/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-32390/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-32390/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-32390/ libtool: uninstall: rm -f /tmp/am-dc-32390/ /tmp/am-dc-32390/ /tmp/am-dc-32390/ /tmp/am-dc-32390/ /tmp/am-dc-32390/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-32390/ && rm -f html.tar ) ( cd '/tmp/am-dc-32390/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-32390/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Fri May 11 23:08:57 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 23:08:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af622a35c0d3_16495f26841866a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 267s] [ 243.414746] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.065411] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.714784] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.355399] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.014782] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.021454] dracut-initqueue[458]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_12/root: 19773 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 24643 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (19766) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Fri May 11 23:08:23 2018 From: admin at opensuse.org (OBS Notification) Date: Fri, 11 May 2018 23:08:23 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6228634a94_16495f26841864af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 266s] [ 242.974883] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.635580] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.284869] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.935534] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.594892] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.601621] dracut-initqueue[467]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_18/root: 2401 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 8313 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/18/build/build-vm: line 458: kill: (2394) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 00:16:23 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 00:16:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6327499710_16495f26841912c2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 265s] [ 242.604749] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.245308] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.894604] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.525241] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.184823] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.191636] dracut-initqueue[469]: Warning: Could not boot. [ 267s] Starting Setup Virtual Console... [ 267s] [ OK ] Started Setup Virtual Console. [ 267s] Starting Dracut Emergency Shell... [ 267s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 267s] [ 267s] Generating "/run/initramfs/rdsosreport.txt" [ 267s] [ 267s] [ 267s] Entering emergency mode. Exit the shell to continue. [ 267s] Type "journalctl" to view system logs. [ 267s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 267s] after mounting them and attach it to a bug report. [ 267s] [ 267s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_17/root: 19084 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 20837 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (19076) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 00:16:40 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 00:16:40 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6327669568_16495f2684191546@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 260s] [ 239.064036] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 239.704558] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 262s] [ 240.333994] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 262s] [ 240.974648] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 241.574016] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 241.580466] dracut-initqueue[460]: Warning: Could not boot. [ 263s] Starting Setup Virtual Console... [ 263s] [ OK ] Started Setup Virtual Console. [ 263s] Starting Dracut Emergency Shell... [ 263s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 263s] [ 263s] Generating "/run/initramfs/rdsosreport.txt" [ 263s] [ 263s] [ 263s] Entering emergency mode. Exit the shell to continue. [ 263s] Type "journalctl" to view system logs. [ 263s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 263s] after mounting them and attach it to a bug report. [ 263s] [ 263s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_9/root: 42603 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 43420 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (42596) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 00:22:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 00:22:06 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af633c163784_16495f2684191851@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 266s] [ 243.234718] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.865452] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.494736] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.145434] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.804720] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.811372] dracut-initqueue[461]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_24/root: 31042 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 38027 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (31035) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 01:34:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 01:34:57 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af644dd9f7f8_16495f26841988d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 265s] [ 243.264878] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.905516] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.564872] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.235541] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.904976] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.911968] dracut-initqueue[469]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_16/root: 15366 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 36757 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (15359) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 01:35:31 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 01:35:31 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af644fa84387_16495f26841991c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [** ] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [* ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 316s] /var/cache/obs/worker/root_1/root: 2724 [ 316s] qemu-system-aarch64: terminating on signal 15 from pid 5111 [ 316s] ### VM INTERACTION END ### [ 316s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (2717) - No such process [ 316s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 316s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 01:47:14 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 01:47:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af647adf0143_16495f2684200647@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 270s] [ 244.625501] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.236057] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 245.885365] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 246.557134] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.245367] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.252605] dracut-initqueue[466]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_26/root: 38669 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 22004 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/26/build/build-vm: line 458: kill: (38662) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 14 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 02:55:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 02:55:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af657b8dc5a2_16495f2684204496@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 279s] [ 252.278659] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 279s] [ 252.903912] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 280s] [ 253.521366] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 281s] [ 254.237766] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 281s] [ 254.896364] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 281s] [ 254.903296] dracut-initqueue[476]: Warning: Could not boot. [ 281s] Starting Setup Virtual Console... [ 281s] [ OK ] Started Setup Virtual Console. [ 281s] Starting Dracut Emergency Shell... [ 281s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 281s] [ 281s] Generating "/run/initramfs/rdsosreport.txt" [ 282s] [ 282s] [ 282s] Entering emergency mode. Exit the shell to continue. [ 282s] Type "journalctl" to view system logs. [ 282s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 282s] after mounting them and attach it to a bug report. [ 282s] [ 282s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_6/root: 29288 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 314 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (29281) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 02:56:41 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 02:56:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af657f33320c_16495f268420495b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 324s] [ 279.606022] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 280.246702] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 280.935998] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 281.511339] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 282.106103] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 282.756814] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 283.385675] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 284.036517] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 284.695943] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 285.331554] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 285.995970] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 286.646616] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 287.316136] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 287.916839] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 288.611761] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 289.267085] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 289.916068] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 290.591439] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 291.255825] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 337s] [ 291.956613] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] /var/cache/obs/worker/root_25/root: 35264 [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 6512 () [ 337s] ### VM INTERACTION END ### [ 337s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (35257) - No such process [ 337s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 337s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sat May 12 07:35:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 May 2018 07:35:52 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#463?= Message-ID: <1841288273.523.1526110552476.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 111.24 KB...] checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... no checking whether to enable VTY tests... no CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory ' Making all in include make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in src make[2]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:975:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo CXX poll_controller.lo CXX encoding.lo CXX sba.lo CXX decoding.lo CXX llc.lo CXX rlc.lo CXX osmobts_sock.lo CC gprs_codel.lo CXX gprs_coding_scheme.lo CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## -------------------------- ## ## osmo-pcu 0.5.0 test suite. ## ## -------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1261: recipe for target 'check-local' failed make[3]: *** [check-local] Error 1 make[3]: Leaving directory ' Makefile:1095: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:461: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-12 07:35:50.967091073 +0000 +++ 2018-05-12 07:35:51.007091052 +0000 @@ -3945,6 +3945,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink (V(A)==0 .. V(S)==19) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Sending new block at BSN 19, CS=MCS-2 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Complete DL frame, len=512 +../../../src/gprs_rlcmac_meas.cpp:178:40: runtime error: left shift of negative value -999427 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Empty chunk, added LLC dummy command of size 18, drained_since=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Complete DL frame, len=18 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) data block (BSN 19, MCS-2): 10 25 01 01 01 01 01 01 01 01 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b @@ -3956,6 +3957,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-2): 07 c0 04 12 20 4a 02 02 02 02 02 02 02 02 86 80 03 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Final ACK received. +../../../src/gprs_rlcmac_meas.cpp:134:42: runtime error: left shift of negative value -999374 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to WAIT RELEASE TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) starting timer T3193 [release (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_WAIT_ACK to GPRS_RLCMAC_DL_ASS_NONE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From admin at opensuse.org Sat May 12 14:33:38 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 14:33:38 +0000 Subject: Build failure of network:osmocom:nightly/binutils-arm-osmo-eabi in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af6fb504fb4a_16495f26842793e4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/binutils-arm-osmo-eabi/Debian_9.0/aarch64 Package network:osmocom:nightly/binutils-arm-osmo-eabi failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly binutils-arm-osmo-eabi Last lines of build log: [ **] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ *] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ **] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [* ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 325s] /var/cache/obs/worker/root_1/root: 6681 [ 325s] qemu-system-aarch64: terminating on signal 15 from pid 7408 () [ 325s] ### VM INTERACTION END ### [ 325s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (6674) - No such process [ 325s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 325s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sat May 12 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#120?= In-Reply-To: <1053312976.507.1526051406835.JavaMail.jenkins@jenkins.osmocom.org> References: <1053312976.507.1526051406835.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <627335498.527.1526137806793.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From admin at opensuse.org Sat May 12 21:29:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 21:29:07 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af75cb0216da_16495f268431227@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 268s] [ 244.994793] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.645444] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.304816] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.955443] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.624978] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.631873] dracut-initqueue[458]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_13/root: 13955 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 33749 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/13/build/build-vm: line 458: kill: (13948) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 20:53:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 20:53:07 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af75444db4c5_16495f268430919d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 266s] [ 244.244910] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.895727] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.564870] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.245548] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.895001] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.902924] dracut-initqueue[457]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_19/root: 5578 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 29103 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (5571) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 20:53:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 20:53:07 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af75445a3f92_16495f26843093d7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 268s] [ 244.047196] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.725874] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.415036] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.106758] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.784996] dracut-initqueue[472]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.793709] dracut-initqueue[472]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_31/root: 24549 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 48018 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/31/build/build-vm: line 458: kill: (24542) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sat May 12 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 12 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#32?= In-Reply-To: <1648018638.511.1526078480887.JavaMail.jenkins@jenkins.osmocom.org> References: <1648018638.511.1526078480887.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1904774863.531.1526164880744.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-17364/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-17364/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-17364/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-17364/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-17364/ libtool: install: (cd /tmp/am-dc-17364/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-17364/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-17364/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-17364/ libtool: install: chmod 644 /tmp/am-dc-17364/ libtool: install: ranlib /tmp/am-dc-17364/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-17364/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-17364/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-17364/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-17364/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-17364/ /bin/mkdir -p '/tmp/am-dc-17364/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-17364/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-17364/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-17364/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-17364/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-17364/ libtool: uninstall: rm -f /tmp/am-dc-17364/ /tmp/am-dc-17364/ /tmp/am-dc-17364/ /tmp/am-dc-17364/ /tmp/am-dc-17364/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-17364/ && rm -f html.tar ) ( cd '/tmp/am-dc-17364/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-17364/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Sat May 12 22:48:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 22:48:07 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af76f34b5314_16495f268431829b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 333s] [ 283.090279] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 283.779898] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 284.464471] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 285.152179] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] [ 285.860984] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 337s] [ 286.573193] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 287.325420] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 287.971059] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 288.727618] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 289.447002] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 290.139610] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 341s] [ 290.924525] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 342s] [ 291.627186] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 292.338893] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 293.027532] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 293.734942] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 345s] [ 294.443424] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 295.142064] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 346s] [ 295.837723] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] [ 296.563935] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] /var/cache/obs/worker/root_1/root: 32730 [ 347s] qemu-system-aarch64: terminating on signal 15 from pid 5964 () [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (32723) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sat May 12 23:56:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sat, 12 May 2018 23:56:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af77f264e9af_16495f2684322453@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 270s] [ 245.925163] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.587709] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.265230] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.905728] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.575100] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.582508] dracut-initqueue[462]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_6/root: 12735 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 35460 (fuser) [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (12728) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun May 13 00:13:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 13 May 2018 00:13:16 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#464?= In-Reply-To: <1841288273.523.1526110552476.JavaMail.jenkins@jenkins.osmocom.org> References: <1841288273.523.1526110552476.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <206405392.532.1526170396995.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Sun May 13 01:09:28 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 01:09:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af790631abf2_16495f268432533c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 326s] [ 277.855985] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 278.434307] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 279.056980] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 279.827780] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 280.548368] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 280.574883] dracut-initqueue[460]: Warning: Could not boot. [ 329s] Starting Setup Virtual Console... [ 329s] [ OK ] Started Setup Virtual Console. [ 329s] Starting Dracut Emergency Shell... [ 329s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 329s] [ 329s] Generating "/run/initramfs/rdsosreport.txt" [ 330s] [ 330s] [ 330s] Entering emergency mode. Exit the shell to continue. [ 330s] Type "journalctl" to view system logs. [ 330s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 330s] after mounting them and attach it to a bug report. [ 330s] [ 330s] [ 346s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_24/root: 14530 [ 347s] qemu-system-aarch64: terminating on signal 15 from pid 43837 (fuser) [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (14478) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 01:15:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 01:15:50 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af791cb4eae9_16495f26843257f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 319s] [ 262.566705] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 263.227527] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 263.843255] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 264.543665] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 265.268895] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 265.321158] dracut-initqueue[482]: Warning: Could not boot. [ 322s] Starting Setup Virtual Console... [ 322s] [ OK ] Started Setup Virtual Console. [ 322s] Starting Dracut Emergency Shell... [ 322s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 322s] [ 322s] Generating "/run/initramfs/rdsosreport.txt" [ 323s] [ 323s] [ 323s] Entering emergency mode. Exit the shell to continue. [ 323s] Type "journalctl" to view system logs. [ 323s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 323s] after mounting them and attach it to a bug report. [ 323s] [ 323s] [ 361s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 362s] /var/cache/obs/worker/root_29/root: 19809 [ 362s] qemu-system-aarch64: terminating on signal 15 from pid 41842 () [ 362s] ### VM INTERACTION END ### [ 362s] /var/run/obs/worker/29/build/build-vm: line 458: kill: (19789) - No such process [ 362s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 362s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 02:24:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 02:24:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7a1d674c70_16495f26843338b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 309s] [ 265.965563] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 309s] [ 266.617050] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 310s] [ 267.234306] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 310s] [ 267.909270] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 311s] [ 268.555124] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 311s] [ 268.561657] dracut-initqueue[451]: Warning: Could not boot. [ 311s] Starting Setup Virtual Console... [ 311s] [ OK ] Started Setup Virtual Console. [ 311s] Starting Dracut Emergency Shell... [ 311s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 311s] [ 311s] Generating "/run/initramfs/rdsosreport.txt" [ 312s] [ 312s] [ 312s] Entering emergency mode. Exit the shell to continue. [ 312s] Type "journalctl" to view system logs. [ 312s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 312s] after mounting them and attach it to a bug report. [ 312s] [ 312s] [ 348s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 349s] /var/cache/obs/worker/root_15/root: 25917 [ 349s] qemu-system-aarch64: terminating on signal 15 from pid 9589 () [ 350s] ### VM INTERACTION END ### [ 350s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (25910) - No such process [ 350s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 350s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 02:52:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 02:52:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7a866dd044_16495f26843357c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 269s] [ 245.624988] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.275638] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.925011] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.605635] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.285028] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.291868] dracut-initqueue[461]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_1/root: 35063 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 5412 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (35056) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 03:18:57 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 03:18:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7aeb896e74_16495f26843383a0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 299s] [ 261.165130] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 300s] [ 261.810789] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 300s] [ 262.508274] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 301s] [ 263.203687] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 302s] [ 263.786864] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 302s] [ 263.815256] dracut-initqueue[477]: Warning: Could not boot. [ 302s] Starting Setup Virtual Console... [ 302s] [ OK ] Started Setup Virtual Console. [ 302s] Starting Dracut Emergency Shell... [ 302s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 302s] [ 302s] Generating "/run/initramfs/rdsosreport.txt" [ 303s] [ 303s] [ 303s] Entering emergency mode. Exit the shell to continue. [ 303s] Type "journalctl" to view system logs. [ 303s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 303s] after mounting them and attach it to a bug report. [ 303s] [ 303s] [ 343s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 344s] /var/cache/obs/worker/root_19/root: 17830 [ 344s] qemu-system-aarch64: terminating on signal 15 from pid 46666 () [ 344s] ### VM INTERACTION END ### [ 344s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (17823) - No such process [ 344s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 344s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 03:41:14 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 03:41:14 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7b3e3ccc00_16495f26843430c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 312s] [ 262.342896] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 263.075395] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 263.735606] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 264.511875] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 265.181403] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 265.213034] dracut-initqueue[466]: Warning: Could not boot. [ 315s] Starting Setup Virtual Console... [ 315s] [ OK ] Started Setup Virtual Console. [ 315s] Starting Dracut Emergency Shell... [ 315s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 315s] [ 315s] Generating "/run/initramfs/rdsosreport.txt" [ 316s] [ 316s] [ 316s] Entering emergency mode. Exit the shell to continue. [ 316s] Type "journalctl" to view system logs. [ 316s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 316s] after mounting them and attach it to a bug report. [ 316s] [ 316s] [ 354s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 354s] /var/cache/obs/worker/root_21/root: 6996 [ 354s] qemu-system-aarch64: terminating on signal 15 from pid 39828 (fuser) [ 354s] ### VM INTERACTION END ### [ 354s] /var/run/obs/worker/21/build/build-vm: line 458: kill: (6985) - No such process [ 355s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 355s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 03:45:32 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 03:45:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7b4edc53f8_16495f2684343346@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 327s] [ 273.671107] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 274.355045] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 275.089848] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 275.844014] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 276.652317] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 276.658938] dracut-initqueue[459]: Warning: Could not boot. [ 330s] Starting Setup Virtual Console... [ 330s] [ OK ] Started Setup Virtual Console. [ 330s] Starting Dracut Emergency Shell... [ 330s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 330s] [ 330s] Generating "/run/initramfs/rdsosreport.txt" [ 331s] [ 331s] [ 331s] Entering emergency mode. Exit the shell to continue. [ 331s] Type "journalctl" to view system logs. [ 331s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 331s] after mounting them and attach it to a bug report. [ 331s] [ 331s] [ 346s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_32/root: 20358 [ 347s] qemu-system-aarch64: terminating on signal 15 from pid 47377 (fuser) [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (20328) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 05:00:28 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 05:00:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7c6817995a_16495f26843518eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 341s] [ 266.638715] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 342s] [ 267.431648] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 343s] [ 268.083031] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 268.847162] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 269.501259] dracut-initqueue[485]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 269.532511] dracut-initqueue[485]: Warning: Could not boot. [ 344s] Starting Setup Virtual Console... [ 344s] [ OK ] Started Setup Virtual Console. [ 344s] Starting Dracut Emergency Shell... [ 344s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 344s] [ 344s] Generating "/run/initramfs/rdsosreport.txt" [ 345s] [ 345s] [ 345s] Entering emergency mode. Exit the shell to continue. [ 345s] Type "journalctl" to view system logs. [ 345s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 345s] after mounting them and attach it to a bug report. [ 345s] [ 345s] [ 380s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 381s] /var/cache/obs/worker/root_16/root: 13217 [ 381s] qemu-system-aarch64: terminating on signal 15 from pid 34501 () [ 381s] ### VM INTERACTION END ### [ 381s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (13183) - No such process [ 381s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 381s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 05:19:54 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 05:19:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7cb15a27c2_16495f26843524c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 317s] [ 262.882220] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 318s] [ 263.531978] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 264.167740] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 264.895132] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 265.577083] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 265.610887] dracut-initqueue[479]: Warning: Could not boot. [ 320s] Starting Setup Virtual Console... [ 320s] [ OK ] Started Setup Virtual Console. [ 320s] Starting Dracut Emergency Shell... [ 320s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 320s] [ 320s] Generating "/run/initramfs/rdsosreport.txt" [ 321s] [ 321s] [ 321s] Entering emergency mode. Exit the shell to continue. [ 321s] Type "journalctl" to view system logs. [ 321s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 321s] after mounting them and attach it to a bug report. [ 321s] [ 321s] [ 359s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 360s] /var/cache/obs/worker/root_24/root: 35497 [ 360s] qemu-system-aarch64: terminating on signal 15 from pid 8225 (fuser) [ 360s] ### VM INTERACTION END ### [ 360s] /var/run/obs/worker/24/build/build-vm: line 458: kill: (35485) - No such process [ 360s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 360s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 06:14:01 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 06:14:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7d7bd12013_16495f268436336@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 297s] [ 261.669302] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 262.422179] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 299s] [ 263.134131] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 299s] [ 263.869927] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 300s] [ 264.527234] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 300s] [ 264.537941] dracut-initqueue[470]: Warning: Could not boot. [ 300s] Starting Setup Virtual Console... [ 300s] [ OK ] Started Setup Virtual Console. [ 300s] Starting Dracut Emergency Shell... [ 300s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 300s] [ 300s] Generating "/run/initramfs/rdsosreport.txt" [ 301s] [ 301s] [ 301s] Entering emergency mode. Exit the shell to continue. [ 301s] Type "journalctl" to view system logs. [ 301s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 301s] after mounting them and attach it to a bug report. [ 301s] [ 301s] [ 340s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 341s] /var/cache/obs/worker/root_32/root: 37338 [ 341s] qemu-system-aarch64: terminating on signal 15 from pid 12266 (fuser) [ 342s] ### VM INTERACTION END ### [ 342s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (37317) - No such process [ 342s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 342s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 07:01:37 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 07:01:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7e2dfd04e1_16495f26843650ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 287s] [ 255.871166] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 287s] [ 256.512137] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 288s] [ 257.203767] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 257.812982] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 258.485703] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 258.519586] dracut-initqueue[475]: Warning: Could not boot. [ 290s] Starting Setup Virtual Console... [ 290s] [ OK ] Started Setup Virtual Console. [ 290s] Starting Dracut Emergency Shell... [ 290s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 290s] [ 290s] Generating "/run/initramfs/rdsosreport.txt" [ 290s] [ 290s] [ 290s] Entering emergency mode. Exit the shell to continue. [ 290s] Type "journalctl" to view system logs. [ 290s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 290s] after mounting them and attach it to a bug report. [ 290s] [ 290s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_4/root: 45703 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 26160 () [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (45695) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 07:55:37 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 07:55:37 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7ef8aa9f74_16495f26843710ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 269s] [ 244.795073] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.465820] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.145157] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.805697] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.475071] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.482804] dracut-initqueue[454]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_10/root: 46398 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 18747 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/10/build/build-vm: line 458: kill: (46391) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 08:13:02 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 08:13:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7f3a19b3a4_16495f26843723b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ *** ] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [* ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 319s] /var/cache/obs/worker/root_2/root: 12358 [ 319s] qemu-system-aarch64: terminating on signal 15 from pid 13829 [ 319s] ### VM INTERACTION END ### [ 319s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (12351) - No such process [ 319s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 319s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 09:01:36 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 09:01:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af7fefe696fa_16495f26843752fc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 321s] [ 275.673014] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 276.310492] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 277.013731] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 277.707697] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 278.407411] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 278.414314] dracut-initqueue[470]: Warning: Could not boot. [ 324s] Starting Setup Virtual Console... [ 324s] [ OK ] Started Setup Virtual Console. [ 324s] Starting Dracut Emergency Shell... [ 324s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 324s] [ 324s] Generating "/run/initramfs/rdsosreport.txt" [ 327s] [ 327s] [ 327s] Entering emergency mode. Exit the shell to continue. [ 327s] Type "journalctl" to view system logs. [ 327s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 327s] after mounting them and attach it to a bug report. [ 327s] [ 327s] [ 342s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 351s] /var/cache/obs/worker/root_22/root: 19293 [ 351s] qemu-system-aarch64: terminating on signal 15 from pid 548 (fuser) [ 351s] ### VM INTERACTION END ### [ 351s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (19285) - No such process [ 351s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 351s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun May 13 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 13 May 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#121?= In-Reply-To: <627335498.527.1526137806793.JavaMail.jenkins@jenkins.osmocom.org> References: <627335498.527.1526137806793.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1403736907.1.1526224207074.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.74 KB...] checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun May 13 19:29:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 19:29:44 +0000 Subject: Change in docker-playground[master]: Add Dockerfile for osmocom redmine:3.2 container Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9116 Change subject: Add Dockerfile for osmocom redmine:3.2 container ...................................................................... Add Dockerfile for osmocom redmine:3.2 container this container has mscgen + dot/graphviz, as we need it. Change-Id: I8950f74da4d2ed10f15bcbe7596f6e9c13474e58 --- A redmine/Dockerfile 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/16/9116/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile new file mode 100644 index 0000000..8c2dc6d --- /dev/null +++ b/redmine/Dockerfile @@ -0,0 +1,7 @@ +FROM redmine:3.2 + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + graphviz \ + mscgen + -- To view, visit https://gerrit.osmocom.org/9116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8950f74da4d2ed10f15bcbe7596f6e9c13474e58 Gerrit-Change-Number: 9116 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun May 13 21:03:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:03:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8a83b10b3e_16495f26845015f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 328s] [ 287.465487] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 288.103204] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 288.737117] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 289.415301] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 290.117751] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 290.126935] dracut-initqueue[460]: Warning: Could not boot. [ 331s] Starting Setup Virtual Console... [ 331s] [ OK ] Started Setup Virtual Console. [ 331s] Starting Dracut Emergency Shell... [ 331s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 331s] [ 331s] Generating "/run/initramfs/rdsosreport.txt" [ 336s] [ 336s] [ 336s] Entering emergency mode. Exit the shell to continue. [ 336s] Type "journalctl" to view system logs. [ 336s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 336s] after mounting them and attach it to a bug report. [ 336s] [ 336s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_12/root: 47135 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 29108 (fuser) [ 341s] ### VM INTERACTION END ### [ 341s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (47126) - No such process [ 341s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 341s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:05:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:05:50 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8a8b46b0f9_16495f26845019f4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 292s] [ 263.197005] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 293s] [ 263.850295] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 293s] [ 264.505726] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 294s] [ 265.214174] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 295s] [ 265.917567] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 295s] [ 265.949267] dracut-initqueue[447]: Warning: Could not boot. [ 295s] Starting Setup Virtual Console... [ 295s] [ OK ] Started Setup Virtual Console. [ 295s] Starting Dracut Emergency Shell... [ 295s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 295s] [ 295s] Generating "/run/initramfs/rdsosreport.txt" [ 296s] [ 296s] [ 296s] Entering emergency mode. Exit the shell to continue. [ 296s] Type "journalctl" to view system logs. [ 296s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 296s] after mounting them and attach it to a bug report. [ 296s] [ 296s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_2/root: 42306 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 16419 (fuser) [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (42293) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:10:06 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:10:06 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8a9bcc29cb_16495f26845023af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 269s] [ 244.354843] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 244.985674] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.644911] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.315582] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.974889] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.981724] dracut-initqueue[454]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_3/root: 36197 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 3122 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (36182) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:10:23 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:10:23 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8a9dcd783d_16495f26845024e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 311s] [ 267.879214] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 312s] [ 268.568483] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 269.305475] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 269.994289] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 270.642141] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 270.648819] dracut-initqueue[478]: Warning: Could not boot. [ 314s] Starting Setup Virtual Console... [ 314s] [ OK ] Started Setup Virtual Console. [ 314s] Starting Dracut Emergency Shell... [ 314s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 314s] [ 314s] Generating "/run/initramfs/rdsosreport.txt" [ 315s] [ 315s] [ 315s] Entering emergency mode. Exit the shell to continue. [ 315s] Type "journalctl" to view system logs. [ 315s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 315s] after mounting them and attach it to a bug report. [ 315s] [ 315s] [ 351s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 352s] /var/cache/obs/worker/root_21/root: 9121 [ 352s] qemu-system-aarch64: terminating on signal 15 from pid 28783 () [ 352s] ### VM INTERACTION END ### [ 352s] /var/run/obs/worker/21/build/build-vm: line 458: kill: (9108) - No such process [ 352s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 352s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:30:58 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:30:58 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8aeabcfe08_16495f26845063f6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 344s] [ 297.856422] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 344s] [ 298.532350] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 345s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 345s] [ 299.166001] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 299.841273] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 346s] [ 300.477958] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 347s] [ 301.145149] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 348s] [ 301.807721] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 348s] [ 302.414100] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 349s] [ 303.002760] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 349s] [ 303.648429] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 350s] [ 304.353253] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 351s] [ 305.018490] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 351s] [ 305.650532] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 352s] [ 306.336524] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 353s] [ 307.010807] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 353s] [ 307.704375] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 354s] [ 308.305075] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 308.974548] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 309.699126] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 310.392376] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] /var/cache/obs/worker/root_4/root: 43837 [ 356s] qemu-system-aarch64: terminating on signal 15 from pid 21443 (fuser) [ 357s] ### VM INTERACTION END ### [ 357s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (43830) - No such process [ 357s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 357s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:46:41 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:46:41 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b24ff2ca5_16495f2684509564@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 267s] [ 244.204918] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.865529] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.534897] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.175428] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.814837] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.821624] dracut-initqueue[453]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_1/root: 22006 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 42114 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (21999) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:46:58 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:46:58 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b26b84011_16495f2684509696@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 268s] [ 244.925020] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.575510] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.264907] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.935458] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.584978] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.592229] dracut-initqueue[463]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_12/root: 23805 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 42480 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (23798) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:47:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:47:50 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b2a6de180_16495f26845097b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 350s] [ 261.120774] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 350s] [ 261.883037] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 351s] [ 262.634055] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 352s] [ 263.288855] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 352s] [ 263.946439] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 353s] [ 264.599865] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 354s] [ 265.303030] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 266.062830] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 266.784590] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 267.512309] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 357s] [ 268.265636] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 357s] [ 268.896782] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 358s] [ 269.544075] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 359s] [ 270.168493] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 359s] [ 270.755466] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 360s] [ 271.434591] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 361s] [ 272.180279] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 361s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 361s] [ 272.872462] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 362s] [ 273.619350] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 363s] [ 274.356808] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 363s] /var/cache/obs/worker/root_5/root: 30420 [ 363s] qemu-system-aarch64: terminating on signal 15 from pid 5607 (fuser) [ 364s] ### VM INTERACTION END ### [ 364s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (30412) - No such process [ 364s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 364s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:47:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:47:50 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b2a742b47_16495f268450984@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 313s] [ 263.901718] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 264.640221] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 265.391031] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 266.038006] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 316s] [ 266.675652] dracut-initqueue[476]: Warning: dracut-initqueue timeout - starting timeout scripts [ 316s] [ 266.688537] dracut-initqueue[476]: Warning: Could not boot. [ 316s] Starting Setup Virtual Console... [ 316s] [ OK ] Started Setup Virtual Console. [ 316s] Starting Dracut Emergency Shell... [ 316s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 316s] [ 316s] Generating "/run/initramfs/rdsosreport.txt" [ 317s] [ 317s] [ 317s] Entering emergency mode. Exit the shell to continue. [ 317s] Type "journalctl" to view system logs. [ 317s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 317s] after mounting them and attach it to a bug report. [ 317s] [ 317s] [ 354s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 355s] /var/cache/obs/worker/root_29/root: 15218 [ 355s] qemu-system-aarch64: terminating on signal 15 from pid 37549 (fuser) [ 355s] ### VM INTERACTION END ### [ 355s] /var/run/obs/worker/29/build/build-vm: line 458: kill: (15211) - No such process [ 355s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 355s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 21:48:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 21:48:07 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b2a8b1304_16495f268451009@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 278s] [ 250.328341] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 278s] [ 250.976593] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 279s] [ 251.597679] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 280s] [ 252.253904] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 280s] [ 252.929047] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 280s] [ 252.936002] dracut-initqueue[461]: Warning: Could not boot. [ 280s] Starting Setup Virtual Console... [ 280s] [ OK ] Started Setup Virtual Console. [ 280s] Starting Dracut Emergency Shell... [ 280s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 280s] [ 280s] Generating "/run/initramfs/rdsosreport.txt" [ 281s] [ 281s] [ 281s] Entering emergency mode. Exit the shell to continue. [ 281s] Type "journalctl" to view system logs. [ 281s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 281s] after mounting them and attach it to a bug report. [ 281s] [ 281s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_29/root: 22798 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 44229 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/29/build/build-vm: line 458: kill: (22791) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun May 13 21:50:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 21:50:57 +0000 Subject: Change in docker-playground[master]: dockerfile for patchwork patch tracking software Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9136 Change subject: dockerfile for patchwork patch tracking software ...................................................................... dockerfile for patchwork patch tracking software Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 --- A patchwork/Dockerfile A patchwork/Dockerfile.fdo A patchwork/Dockerfile.upstream A patchwork/docker-entrypoint.sh A patchwork/production.py 5 files changed, 182 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/9136/1 diff --git a/patchwork/Dockerfile b/patchwork/Dockerfile new file mode 120000 index 0000000..dc5eff5 --- /dev/null +++ b/patchwork/Dockerfile @@ -0,0 +1 @@ +Dockerfile.fdo \ No newline at end of file diff --git a/patchwork/Dockerfile.fdo b/patchwork/Dockerfile.fdo new file mode 100644 index 0000000..228ee8c --- /dev/null +++ b/patchwork/Dockerfile.fdo @@ -0,0 +1,47 @@ +FROM debian + +# freedesktop.org version of patchwork + + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + git \ + libjs-jquery \ + python3 \ + python3-celery \ + python3-django \ + python3-django-jsonfield \ + python3-django-filters \ + python3-djangorestframework \ + python3-mysqldb \ + python3-pip \ + python3-psycopg2 \ + python3-sqlparse \ + wget && \ + apt-get clean + +RUN pip3 install drf-nested-routers + +WORKDIR /opt + +ARG VERSION_TAG=2.0.1 + +#RUN wget https://github.com/getpatchwork/patchwork/archive/v$VERSION_TAG.tar.gz && \ + #tar xzf v$VERSION_TAG.tar.gz && \ + #mv patchwork-$VERSION_TAG patchwork && \ + #rm v$VERSION_TAG.tar.gz + +RUN git clone https://github.com/dlespiau/patchwork + +WORKDIR /opt/patchwork + +COPY production.py patchwork/settings/production.py +COPY docker-entrypoint.sh /docker-entrypoint.sh + +RUN mkdir -p /var/www/patchwork +VOLUME /var/www/patchwork + +#RUN DJANGO_SECRET_KEY=foo python3 manage.py collectstatic + +CMD /docker-entrypoint.sh diff --git a/patchwork/Dockerfile.upstream b/patchwork/Dockerfile.upstream new file mode 100644 index 0000000..30dff82 --- /dev/null +++ b/patchwork/Dockerfile.upstream @@ -0,0 +1,42 @@ +FROM debian + +# upstream version of patchwork + + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + git \ + libjs-jquery \ + python3 \ + python3-celery \ + python3-django \ + python3-django-filters \ + python3-djangorestframework \ + python3-mysqldb \ + python3-psycopg2 \ + python3-sqlparse \ + wget && \ + apt-get clean + + +WORKDIR /opt + +ARG VERSION_TAG=2.0.1 + +RUN wget https://github.com/getpatchwork/patchwork/archive/v$VERSION_TAG.tar.gz && \ + tar xzf v$VERSION_TAG.tar.gz && \ + mv patchwork-$VERSION_TAG patchwork && \ + rm v$VERSION_TAG.tar.gz + +WORKDIR /opt/patchwork + +COPY production.py patchwork/settings/production.py +COPY docker-entrypoint.sh /docker-entrypoint.sh + +RUN mkdir -p /var/www/patchwork +VOLUME /var/www/patchwork + +#RUN DJANGO_SECRET_KEY=foo python3 manage.py collectstatic + +CMD /docker-entrypoint.sh diff --git a/patchwork/docker-entrypoint.sh b/patchwork/docker-entrypoint.sh new file mode 100755 index 0000000..63ba941 --- /dev/null +++ b/patchwork/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +set -x + +python3 manage.py check +python3 manage.py migrate +python3 manage.py collectstatic --noinput +python3 manage.py loaddata default_tags default_states +python3 manage.py runserver 0.0.0.0:8000 diff --git a/patchwork/production.py b/patchwork/production.py new file mode 100644 index 0000000..587c39a --- /dev/null +++ b/patchwork/production.py @@ -0,0 +1,82 @@ +""" +Sample production-ready settings for patchwork project. + +Most of these are commented out as they will be installation dependent. + +Design based on: + http://www.revsys.com/blog/2014/nov/21/recommended-django-project-layout/ +""" + +from __future__ import absolute_import + +import os + +import django + +from .base import * # noqa + +# +# Core settings +# https://docs.djangoproject.com/en/1.8/ref/settings/#core-settings +# + +# Security +# +# You'll need to replace this to a random string. The following python code can +# be used to generate a secret key: +# +# import string, random +# chars = string.letters + string.digits + string.punctuation +# print repr("".join([random.choice(chars) for i in range(0,50)])) + +SECRET_KEY = os.environ['DJANGO_SECRET_KEY'] + +# Email +# +# Replace this with your own details + +EMAIL_HOST = os.getenv('EMAIL_HOST', 'localhost') +EMAIL_PORT = os.getenv('EMAIL_PORT', 25) +EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '') +EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '') +EMAIL_USE_TLS = True + +DEFAULT_FROM_EMAIL = 'Patchwork ' +SERVER_EMAIL = DEFAULT_FROM_EMAIL +NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL + +ADMINS = ( + ('Holger Freyther', 'holger at freyther.de'), + ('Holger Freyther', 'holger+p at freyther.de'), +) + +# Database +# +# If you're using a postgres database, connecting over a local unix-domain +# socket, then the following setting should work for you. Otherwise, +# see https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': os.environ.get('DATABASE_NAME', ''), + 'USER': os.environ.get('DATABASE_USER', ''), + 'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''), + 'HOST': os.environ.get('DATABASE_HOST', ''), + 'PORT': os.environ.get('DATABASE_PORT', ''), + }, +} + +# +# Static files settings +# https://docs.djangoproject.com/en/1.8/ref/settings/#static-files +# https://docs.djangoproject.com/en/1.8/ref/contrib/staticfiles/#manifeststaticfilesstorage +# + +STATIC_ROOT = os.environ.get('STATIC_ROOT', '/var/www/patchwork') + +if django.VERSION >= (1, 7): + STATICFILES_STORAGE = \ + 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' + +ALLOWED_HOSTS = ['*'] -- To view, visit https://gerrit.osmocom.org/9136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 Gerrit-Change-Number: 9136 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 13 22:01:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 22:01:07 +0000 Subject: Change in docker-playground[master]: dockerfile for patchwork patch tracking software In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9136 ) Change subject: dockerfile for patchwork patch tracking software ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 Gerrit-Change-Number: 9136 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 13 May 2018 22:01:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 13 22:04:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 22:04:13 +0000 Subject: Change in docker-playground[master]: Add Dockerfile for osmocom redmine:3.2 container In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9116 ) Change subject: Add Dockerfile for osmocom redmine:3.2 container ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8950f74da4d2ed10f15bcbe7596f6e9c13474e58 Gerrit-Change-Number: 9116 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 13 May 2018 22:04:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 13 22:04:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 22:04:15 +0000 Subject: Change in docker-playground[master]: dockerfile for patchwork patch tracking software In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9136 ) Change subject: dockerfile for patchwork patch tracking software ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/9136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 Gerrit-Change-Number: 9136 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Sun, 13 May 2018 22:04:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 13 22:04:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 22:04:16 +0000 Subject: Change in docker-playground[master]: Add Dockerfile for osmocom redmine:3.2 container In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9116 ) Change subject: Add Dockerfile for osmocom redmine:3.2 container ...................................................................... Add Dockerfile for osmocom redmine:3.2 container this container has mscgen + dot/graphviz, as we need it. Change-Id: I8950f74da4d2ed10f15bcbe7596f6e9c13474e58 --- A redmine/Dockerfile 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile new file mode 100644 index 0000000..8c2dc6d --- /dev/null +++ b/redmine/Dockerfile @@ -0,0 +1,7 @@ +FROM redmine:3.2 + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + graphviz \ + mscgen + -- To view, visit https://gerrit.osmocom.org/9116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8950f74da4d2ed10f15bcbe7596f6e9c13474e58 Gerrit-Change-Number: 9116 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 13 22:04:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 13 May 2018 22:04:17 +0000 Subject: Change in docker-playground[master]: dockerfile for patchwork patch tracking software In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9136 ) Change subject: dockerfile for patchwork patch tracking software ...................................................................... dockerfile for patchwork patch tracking software Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 --- A patchwork/Dockerfile A patchwork/Dockerfile.fdo A patchwork/Dockerfile.upstream A patchwork/docker-entrypoint.sh A patchwork/production.py 5 files changed, 182 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/patchwork/Dockerfile b/patchwork/Dockerfile new file mode 120000 index 0000000..dc5eff5 --- /dev/null +++ b/patchwork/Dockerfile @@ -0,0 +1 @@ +Dockerfile.fdo \ No newline at end of file diff --git a/patchwork/Dockerfile.fdo b/patchwork/Dockerfile.fdo new file mode 100644 index 0000000..228ee8c --- /dev/null +++ b/patchwork/Dockerfile.fdo @@ -0,0 +1,47 @@ +FROM debian + +# freedesktop.org version of patchwork + + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + git \ + libjs-jquery \ + python3 \ + python3-celery \ + python3-django \ + python3-django-jsonfield \ + python3-django-filters \ + python3-djangorestframework \ + python3-mysqldb \ + python3-pip \ + python3-psycopg2 \ + python3-sqlparse \ + wget && \ + apt-get clean + +RUN pip3 install drf-nested-routers + +WORKDIR /opt + +ARG VERSION_TAG=2.0.1 + +#RUN wget https://github.com/getpatchwork/patchwork/archive/v$VERSION_TAG.tar.gz && \ + #tar xzf v$VERSION_TAG.tar.gz && \ + #mv patchwork-$VERSION_TAG patchwork && \ + #rm v$VERSION_TAG.tar.gz + +RUN git clone https://github.com/dlespiau/patchwork + +WORKDIR /opt/patchwork + +COPY production.py patchwork/settings/production.py +COPY docker-entrypoint.sh /docker-entrypoint.sh + +RUN mkdir -p /var/www/patchwork +VOLUME /var/www/patchwork + +#RUN DJANGO_SECRET_KEY=foo python3 manage.py collectstatic + +CMD /docker-entrypoint.sh diff --git a/patchwork/Dockerfile.upstream b/patchwork/Dockerfile.upstream new file mode 100644 index 0000000..30dff82 --- /dev/null +++ b/patchwork/Dockerfile.upstream @@ -0,0 +1,42 @@ +FROM debian + +# upstream version of patchwork + + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + git \ + libjs-jquery \ + python3 \ + python3-celery \ + python3-django \ + python3-django-filters \ + python3-djangorestframework \ + python3-mysqldb \ + python3-psycopg2 \ + python3-sqlparse \ + wget && \ + apt-get clean + + +WORKDIR /opt + +ARG VERSION_TAG=2.0.1 + +RUN wget https://github.com/getpatchwork/patchwork/archive/v$VERSION_TAG.tar.gz && \ + tar xzf v$VERSION_TAG.tar.gz && \ + mv patchwork-$VERSION_TAG patchwork && \ + rm v$VERSION_TAG.tar.gz + +WORKDIR /opt/patchwork + +COPY production.py patchwork/settings/production.py +COPY docker-entrypoint.sh /docker-entrypoint.sh + +RUN mkdir -p /var/www/patchwork +VOLUME /var/www/patchwork + +#RUN DJANGO_SECRET_KEY=foo python3 manage.py collectstatic + +CMD /docker-entrypoint.sh diff --git a/patchwork/docker-entrypoint.sh b/patchwork/docker-entrypoint.sh new file mode 100755 index 0000000..63ba941 --- /dev/null +++ b/patchwork/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +set -x + +python3 manage.py check +python3 manage.py migrate +python3 manage.py collectstatic --noinput +python3 manage.py loaddata default_tags default_states +python3 manage.py runserver 0.0.0.0:8000 diff --git a/patchwork/production.py b/patchwork/production.py new file mode 100644 index 0000000..587c39a --- /dev/null +++ b/patchwork/production.py @@ -0,0 +1,82 @@ +""" +Sample production-ready settings for patchwork project. + +Most of these are commented out as they will be installation dependent. + +Design based on: + http://www.revsys.com/blog/2014/nov/21/recommended-django-project-layout/ +""" + +from __future__ import absolute_import + +import os + +import django + +from .base import * # noqa + +# +# Core settings +# https://docs.djangoproject.com/en/1.8/ref/settings/#core-settings +# + +# Security +# +# You'll need to replace this to a random string. The following python code can +# be used to generate a secret key: +# +# import string, random +# chars = string.letters + string.digits + string.punctuation +# print repr("".join([random.choice(chars) for i in range(0,50)])) + +SECRET_KEY = os.environ['DJANGO_SECRET_KEY'] + +# Email +# +# Replace this with your own details + +EMAIL_HOST = os.getenv('EMAIL_HOST', 'localhost') +EMAIL_PORT = os.getenv('EMAIL_PORT', 25) +EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '') +EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '') +EMAIL_USE_TLS = True + +DEFAULT_FROM_EMAIL = 'Patchwork ' +SERVER_EMAIL = DEFAULT_FROM_EMAIL +NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL + +ADMINS = ( + ('Holger Freyther', 'holger at freyther.de'), + ('Holger Freyther', 'holger+p at freyther.de'), +) + +# Database +# +# If you're using a postgres database, connecting over a local unix-domain +# socket, then the following setting should work for you. Otherwise, +# see https://docs.djangoproject.com/en/1.8/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': os.environ.get('DATABASE_NAME', ''), + 'USER': os.environ.get('DATABASE_USER', ''), + 'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''), + 'HOST': os.environ.get('DATABASE_HOST', ''), + 'PORT': os.environ.get('DATABASE_PORT', ''), + }, +} + +# +# Static files settings +# https://docs.djangoproject.com/en/1.8/ref/settings/#static-files +# https://docs.djangoproject.com/en/1.8/ref/contrib/staticfiles/#manifeststaticfilesstorage +# + +STATIC_ROOT = os.environ.get('STATIC_ROOT', '/var/www/patchwork') + +if django.VERSION >= (1, 7): + STATICFILES_STORAGE = \ + 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' + +ALLOWED_HOSTS = ['*'] -- To view, visit https://gerrit.osmocom.org/9136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4095148d2c8a1b6ba9beafda053c38022b147819 Gerrit-Change-Number: 9136 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun May 13 22:17:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:17:15 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8b9744e7e5_16495f268451905b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 274s] [ 247.425797] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.067402] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 248.686129] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.376455] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 250.055843] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 250.063934] dracut-initqueue[464]: Warning: Could not boot. [ 277s] Starting Setup Virtual Console... [ 277s] [ OK ] Started Setup Virtual Console. [ 277s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 277s] [ 277s] [ 277s] Entering emergency mode. Exit the shell to continue. [ 277s] Type "journalctl" to view system logs. [ 277s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 277s] after mounting them and attach it to a bug report. [ 277s] [ 277s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_31/root: 17980 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 41367 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/31/build/build-vm: line 458: kill: (17966) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 22:24:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:24:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8bb1864ae2_16495f26845197cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 268s] [ 244.254858] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.915535] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.564806] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.225520] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.914903] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.921597] dracut-initqueue[463]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_8/root: 2977 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 17752 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/8/build/build-vm: line 458: kill: (2970) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 22:25:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:25:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8bb74c806f_16495f26845202d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 303s] [ 262.093235] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 262.763482] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 263.441525] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 264.171407] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 306s] [ 264.904391] dracut-initqueue[474]: Warning: dracut-initqueue timeout - starting timeout scripts [ 306s] [ 264.952200] dracut-initqueue[474]: Warning: Could not boot. [ 306s] Starting Setup Virtual Console... [ 306s] [ OK ] Started Setup Virtual Console. [ 306s] Starting Dracut Emergency Shell... [ 306s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 306s] [ 306s] Generating "/run/initramfs/rdsosreport.txt" [ 307s] [ 307s] [ 307s] Entering emergency mode. Exit the shell to continue. [ 307s] Type "journalctl" to view system logs. [ 307s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 307s] after mounting them and attach it to a bug report. [ 307s] [ 307s] [ 348s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 349s] /var/cache/obs/worker/root_15/root: 45226 [ 349s] qemu-system-aarch64: terminating on signal 15 from pid 18217 () [ 349s] ### VM INTERACTION END ### [ 349s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (45208) - No such process [ 349s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 349s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 22:25:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:25:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8bb754196f_16495f268452037b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 273s] [ 247.545613] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.186271] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 248.865610] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 249.546094] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 250.245588] dracut-initqueue[465]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 250.253302] dracut-initqueue[465]: Warning: Could not boot. [ 275s] Starting Setup Virtual Console... [ 275s] [ OK ] Started Setup Virtual Console. [ 275s] Starting Dracut Emergency Shell... [ 275s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 275s] [ 275s] Generating "/run/initramfs/rdsosreport.txt" [ 276s] [ 276s] [ 276s] Entering emergency mode. Exit the shell to continue. [ 276s] Type "journalctl" to view system logs. [ 276s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 276s] after mounting them and attach it to a bug report. [ 276s] [ 276s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_32/root: 14076 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 42321 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (14069) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Sun May 13 22:41:22 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 13 May 2018 22:41:22 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#33?= In-Reply-To: <1904774863.531.1526164880744.JavaMail.jenkins@jenkins.osmocom.org> References: <1904774863.531.1526164880744.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1995379463.1.1526251282792.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-23228/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-23228/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-23228/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-23228/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-23228/ libtool: install: (cd /tmp/am-dc-23228/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-23228/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-23228/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-23228/ libtool: install: chmod 644 /tmp/am-dc-23228/ libtool: install: ranlib /tmp/am-dc-23228/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-23228/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-23228/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-23228/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-23228/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-23228/ /bin/mkdir -p '/tmp/am-dc-23228/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-23228/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-23228/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-23228/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-23228/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-23228/ libtool: uninstall: rm -f /tmp/am-dc-23228/ /tmp/am-dc-23228/ /tmp/am-dc-23228/ /tmp/am-dc-23228/ /tmp/am-dc-23228/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-23228/ && rm -f html.tar ) ( cd '/tmp/am-dc-23228/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-23228/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Sun May 13 22:42:58 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:42:58 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8bf8c682bd_16495f268452347a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 267s] [ 244.374830] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.035537] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.704951] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.385479] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.064784] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.071600] dracut-initqueue[470]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_6/root: 19861 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 42584 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (19853) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 22:57:15 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 22:57:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8c2d378bef_16495f26845258f7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 286s] [ 250.645757] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 287s] [ 251.316212] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 287s] [ 251.998722] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 288s] [ 252.697285] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 253.405661] dracut-initqueue[447]: Warning: dracut-initqueue timeout - starting timeout scripts [ 289s] [ 253.413041] dracut-initqueue[447]: Warning: Could not boot. [ 289s] Starting Setup Virtual Console... [ 289s] [ OK ] Started Setup Virtual Console. [ 289s] Starting Dracut Emergency Shell... [ 289s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 289s] [ 289s] Generating "/run/initramfs/rdsosreport.txt" [ 289s] [ 289s] [ 289s] Entering emergency mode. Exit the shell to continue. [ 289s] Type "journalctl" to view system logs. [ 289s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 289s] after mounting them and attach it to a bug report. [ 289s] [ 289s] [ 341s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 341s] /var/cache/obs/worker/root_9/root: 41040 [ 341s] qemu-system-aarch64: terminating on signal 15 from pid 9376 () [ 341s] ### VM INTERACTION END ### [ 341s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (41033) - No such process [ 341s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 341s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 23:02:07 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 23:02:07 +0000 Subject: Build failure of network:osmocom:nightly/binutils-arm-osmo-eabi in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8c40224306_16495f268452648@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/binutils-arm-osmo-eabi/Debian_9.0/aarch64 Package network:osmocom:nightly/binutils-arm-osmo-eabi failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly binutils-arm-osmo-eabi Last lines of build log: [ 266s] [ 243.994804] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.645533] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.264808] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.935433] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.564842] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.571556] dracut-initqueue[477]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_4/root: 37310 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 10381 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (37303) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Mon May 14 00:00:04 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 May 2018 00:00:04 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-libosmo-netif_=C2=BB_a?= =?UTF-8?Q?1=3Ddefault,a2=3Ddefault,a3=3Ddefau?= =?UTF-8?Q?lt,osmocom-master-debian9_#579?= Message-ID: <1386312742.5.1526256004732.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Sun May 13 23:29:32 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 23:29:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8ca7245202_16495f268453062a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 268s] [ 245.314856] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.975498] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.624901] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.295493] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.965076] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.972635] dracut-initqueue[467]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_15/root: 5236 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 30861 (fuser) [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (5228) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 00:45:15 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 00:45:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8dc25c1a3e_16495f268454646d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 267s] [ 243.974867] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.635539] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.304980] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.965508] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.644938] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.651812] dracut-initqueue[454]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_3/root: 19709 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 40752 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (19694) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 00:46:24 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 00:46:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8dc7e7bf05_16495f2684547032@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 266s] [ 244.094853] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.745507] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.374855] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.035469] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.694942] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.701912] dracut-initqueue[468]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_17/root: 26253 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 43355 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (26246) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 00:48:41 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 00:48:41 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8dcf992b30_16495f2684547774@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 269s] [ 245.487897] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.155962] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.815105] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.485800] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.135087] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.142228] dracut-initqueue[460]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_14/root: 7604 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 33769 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/14/build/build-vm: line 458: kill: (7593) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 13 23:35:50 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 13 May 2018 23:35:50 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8cbdbdf32b_16495f2684531879@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 274s] [ 247.615462] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.287128] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 248.909917] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.556213] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 250.215423] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 250.222783] dracut-initqueue[457]: Warning: Could not boot. [ 277s] Starting Setup Virtual Console... [ 277s] [ OK ] Started Setup Virtual Console. [ 277s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 277s] [ 277s] [ 277s] Entering emergency mode. Exit the shell to continue. [ 277s] Type "journalctl" to view system logs. [ 277s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 277s] after mounting them and attach it to a bug report. [ 277s] [ 277s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_4/root: 29753 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 20739 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (29746) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 01:59:02 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 01:59:02 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8ed77daad2_16495f2684561824@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 270s] [ 245.857291] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.535738] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.185050] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.855627] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.485022] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.492388] dracut-initqueue[453]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_16/root: 25171 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 31338 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (25164) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 02:04:16 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 02:04:16 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8eea6e5426_16495f26845630ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 267s] [ 243.954203] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.584709] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.204163] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.845992] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.484557] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.491304] dracut-initqueue[459]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_26/root: 35527 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 48376 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/26/build/build-vm: line 458: kill: (35519) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 02:04:16 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 02:04:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8eea755b87_16495f2684563165@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 265s] [ 242.244464] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 242.875172] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.554388] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.214829] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.874285] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.881115] dracut-initqueue[468]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_21/root: 35554 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 48389 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/21/build/build-vm: line 458: kill: (35547) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 03:14:10 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 03:14:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8ff0dd6a6d_16495f2684577872@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 263s] [ 241.254942] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 241.915425] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 242.544652] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.185469] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.834467] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.841302] dracut-initqueue[463]: Warning: Could not boot. [ 266s] Starting Setup Virtual Console... [ 266s] [ OK ] Started Setup Virtual Console. [ 266s] Starting Dracut Emergency Shell... [ 266s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 266s] [ 266s] Generating "/run/initramfs/rdsosreport.txt" [ 266s] [ 266s] [ 266s] Entering emergency mode. Exit the shell to continue. [ 266s] Type "journalctl" to view system logs. [ 266s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 266s] after mounting them and attach it to a bug report. [ 266s] [ 266s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_18/root: 23488 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 37266 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/18/build/build-vm: line 458: kill: (23481) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 03:15:54 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 03:15:54 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af8ff84cc12a_16495f2684578450@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 268s] [ 244.224936] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.875536] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.504897] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.175471] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.786131] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.793235] dracut-initqueue[466]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_10/root: 8271 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 17344 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/10/build/build-vm: line 458: kill: (8254) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon May 14 10:12:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:12:34 +0000 Subject: Change in docker-playground[master]: redmine: add patch for SVG support Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9156 Change subject: redmine: add patch for SVG support ...................................................................... redmine: add patch for SVG support Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 --- M redmine/Dockerfile 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/9156/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 8c2dc6d..67b00a8 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -3,5 +3,9 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ graphviz \ - mscgen + mscgen \ + patch && \ + apt-get clean +COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff +RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff -- To view, visit https://gerrit.osmocom.org/9156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 Gerrit-Change-Number: 9156 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 10:19:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:19:28 +0000 Subject: Change in docker-playground[master]: redmine: Add OpenID Digest::HMAC fix Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9157 Change subject: redmine: Add OpenID Digest::HMAC fix ...................................................................... redmine: Add OpenID Digest::HMAC fix >From Holger: Digest: This seems a bit of the magic of ruby but I vaguely remember having seen this before. I have either patched or backported a fix. In newer Ruby versions "Digest" has been deprecated. The diff to "stock" openid 2.3.0 is: Change-Id: Idaca479140846481372ad0e1bff741bb09010847 Related: OS#3081 --- M redmine/Dockerfile A redmine/redmine-openid-hmac-digest.diff 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/9157/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 67b00a8..81976c6 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -9,3 +9,6 @@ COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff + +COPY redmine-openid-hmac-digest.diff /tmp/ +RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff diff --git a/redmine/redmine-openid-hmac-digest.diff b/redmine/redmine-openid-hmac-digest.diff new file mode 100644 index 0000000..e5b22dc --- /dev/null +++ b/redmine/redmine-openid-hmac-digest.diff @@ -0,0 +1,46 @@ +diff -Nurd lib/openid/cryptutil.rb +/usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb +--- lib/openid/cryptutil.rb 1970-01-01 00:00:00.000000000 +0000 ++++ /usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2017-07-17 +18:25:45.146746571 +0000 +@@ -2,7 +2,7 @@ + require "digest/sha1" + require "digest/sha2" + begin +- require "digest/hmac" ++ require "openssl" + rescue LoadError + begin + # Try loading the ruby-hmac files if they exist +@@ -33,27 +33,19 @@ + end + + def CryptUtil.sha1(text) +- return Digest::SHA1.digest(text) ++ return OpenSSL::Digest.new('sha1').digest(text) + end + + def CryptUtil.hmac_sha1(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA1).update(text).digest +- else +- return HMAC::SHA1.digest(key, text) +- end ++ return OpenSSL::HMAC.digest('sha1', key, text) + end + + def CryptUtil.sha256(text) +- return Digest::SHA256.digest(text) ++ return OpenSSL::Digest.new('sha256').digest(text) + end + + def CryptUtil.hmac_sha256(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA256).update(text).digest +- else +- return HMAC::SHA256.digest(key, text) +- end ++ return OpenSSL::HMAC.digest('sha256', key, text) + end + + # Generate a random string of the given length, composed of the -- To view, visit https://gerrit.osmocom.org/9157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idaca479140846481372ad0e1bff741bb09010847 Gerrit-Change-Number: 9157 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 10:20:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:20:48 +0000 Subject: Change in docker-playground[master]: redmine: Add OpenID Digest::HMAC fix In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9157 ) Change subject: redmine: Add OpenID Digest::HMAC fix ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idaca479140846481372ad0e1bff741bb09010847 Gerrit-Change-Number: 9157 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 14 May 2018 10:20:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 10:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:20:53 +0000 Subject: Change in docker-playground[master]: redmine: add patch for SVG support In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9156 ) Change subject: redmine: add patch for SVG support ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 Gerrit-Change-Number: 9156 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 14 May 2018 10:20:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 10:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:20:55 +0000 Subject: Change in docker-playground[master]: redmine: add patch for SVG support In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9156 ) Change subject: redmine: add patch for SVG support ...................................................................... redmine: add patch for SVG support Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 --- M redmine/Dockerfile 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 8c2dc6d..67b00a8 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -3,5 +3,9 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ graphviz \ - mscgen + mscgen \ + patch && \ + apt-get clean +COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff +RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff -- To view, visit https://gerrit.osmocom.org/9156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 Gerrit-Change-Number: 9156 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 10:20:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 14 May 2018 10:20:56 +0000 Subject: Change in docker-playground[master]: redmine: Add OpenID Digest::HMAC fix In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9157 ) Change subject: redmine: Add OpenID Digest::HMAC fix ...................................................................... redmine: Add OpenID Digest::HMAC fix >From Holger: Digest: This seems a bit of the magic of ruby but I vaguely remember having seen this before. I have either patched or backported a fix. In newer Ruby versions "Digest" has been deprecated. The diff to "stock" openid 2.3.0 is: Change-Id: Idaca479140846481372ad0e1bff741bb09010847 Related: OS#3081 --- M redmine/Dockerfile A redmine/redmine-openid-hmac-digest.diff 2 files changed, 49 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 67b00a8..81976c6 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -9,3 +9,6 @@ COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff + +COPY redmine-openid-hmac-digest.diff /tmp/ +RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff diff --git a/redmine/redmine-openid-hmac-digest.diff b/redmine/redmine-openid-hmac-digest.diff new file mode 100644 index 0000000..e5b22dc --- /dev/null +++ b/redmine/redmine-openid-hmac-digest.diff @@ -0,0 +1,46 @@ +diff -Nurd lib/openid/cryptutil.rb +/usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb +--- lib/openid/cryptutil.rb 1970-01-01 00:00:00.000000000 +0000 ++++ /usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2017-07-17 +18:25:45.146746571 +0000 +@@ -2,7 +2,7 @@ + require "digest/sha1" + require "digest/sha2" + begin +- require "digest/hmac" ++ require "openssl" + rescue LoadError + begin + # Try loading the ruby-hmac files if they exist +@@ -33,27 +33,19 @@ + end + + def CryptUtil.sha1(text) +- return Digest::SHA1.digest(text) ++ return OpenSSL::Digest.new('sha1').digest(text) + end + + def CryptUtil.hmac_sha1(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA1).update(text).digest +- else +- return HMAC::SHA1.digest(key, text) +- end ++ return OpenSSL::HMAC.digest('sha1', key, text) + end + + def CryptUtil.sha256(text) +- return Digest::SHA256.digest(text) ++ return OpenSSL::Digest.new('sha256').digest(text) + end + + def CryptUtil.hmac_sha256(key, text) +- if Digest.const_defined? :HMAC +- Digest::HMAC.new(key,Digest::SHA256).update(text).digest +- else +- return HMAC::SHA256.digest(key, text) +- end ++ return OpenSSL::HMAC.digest('sha256', key, text) + end + + # Generate a random string of the given length, composed of the -- To view, visit https://gerrit.osmocom.org/9157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idaca479140846481372ad0e1bff741bb09010847 Gerrit-Change-Number: 9157 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:03:35 2018 From: gerrit-no-reply at lists.osmocom.org (Holger Freyther) Date: Mon, 14 May 2018 11:03:35 +0000 Subject: Change in docker-playground[master]: redmine: add patch for SVG support In-Reply-To: References: Message-ID: Holger Freyther has posted comments on this change. ( https://gerrit.osmocom.org/9156 ) Change subject: redmine: add patch for SVG support ...................................................................... Patch Set 1: git add redmine-issue-2047-svg-image-support.diff? -- To view, visit https://gerrit.osmocom.org/9156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3bacdd4100c717ad702bc08851a8b32170610ca4 Gerrit-Change-Number: 9156 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Holger Freyther Gerrit-Comment-Date: Mon, 14 May 2018 11:03:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:49:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:49:47 +0000 Subject: Change in openbsc[refs/meta/config]: Edit Project Config In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/347 ) Change subject: Edit Project Config ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: refs/meta/config Gerrit-MessageType: abandon Gerrit-Change-Id: I2cae165bf0ff02baa8444f2f11ddf03ca726deca Gerrit-Change-Number: 347 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:50:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:50:00 +0000 Subject: Change in openbsc[refs/meta/config]: Edit Project Config In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/348 ) Change subject: Edit Project Config ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: refs/meta/config Gerrit-MessageType: abandon Gerrit-Change-Id: Id973bd611f7617ed84914c6fde207408c23c7847 Gerrit-Change-Number: 348 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:52:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:52:56 +0000 Subject: Change in osmo-bsc[master]: deprecate dyn_ts_allow_tch_f and by default allow all TCH In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/8099 ) Change subject: deprecate dyn_ts_allow_tch_f and by default allow all TCH ...................................................................... deprecate dyn_ts_allow_tch_f and by default allow all TCH In osmo-nitb, the way TCH lchans were assigned often resulted in mismatching TCH kinds, causing problems in the lack of transcoding. Hence dyn_ts_allow_tch_f was introduced as a workaround. Now however, we always assign an SDCCH to a requesting MS first, and only later assign a TCH channel, which then adheres to the codec list configured at 'msc' in the vty config. Hence it is now considerably harder to obtain a mismatch. Furthermore, forcing specific codecs is possible by simply omitting the unwanted ones from the msc config's codec-list. The equivalent of 'dyn_ts_allow_tch_f 0' could be e.g. 'codec-list hr3 hr2 hr1'. Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e --- M src/libbsc/bsc_vty.c M src/libbsc/net_init.c 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index 1efca0c..ea4c8d0 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -1001,8 +1001,8 @@ VTY_OUT_TIMER(3119); VTY_OUT_TIMER(3122); VTY_OUT_TIMER(3141); - vty_out(vty, " dyn_ts_allow_tch_f %d%s", - gsmnet->dyn_ts_allow_tch_f ? 1 : 0, VTY_NEWLINE); + if (!gsmnet->dyn_ts_allow_tch_f) + vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE); if (gsmnet->tz.override != 0) { if (gsmnet->tz.dst) vty_out(vty, " timezone %d %d %d%s", @@ -4615,7 +4615,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_net_dyn_ts_allow_tch_f, +DEFUN_DEPRECATED(cfg_net_dyn_ts_allow_tch_f, cfg_net_dyn_ts_allow_tch_f_cmd, "dyn_ts_allow_tch_f (0|1)", "Allow or disallow allocating TCH/F on TCH_F_TCH_H_PDCH timeslots\n" @@ -4624,6 +4624,8 @@ { struct gsm_network *gsmnet = gsmnet_from_vty(vty); gsmnet->dyn_ts_allow_tch_f = atoi(argv[0]) ? true : false; + vty_out(vty, "%% dyn_ts_allow_tch_f is deprecated, rather use msc/codec-list to pick codecs%s", + VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index d5ea5b2..f03a2e1 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -52,6 +52,8 @@ .mnc = 1, }; + net->dyn_ts_allow_tch_f = true; + /* Permit a compile-time default of A5/3 and A5/1 */ net->a5_encryption_mask = (1 << 3) | (1 << 1); -- To view, visit https://gerrit.osmocom.org/8099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e Gerrit-Change-Number: 8099 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:56:11 +0000 Subject: Change in osmo-bsc[master]: fix default fallbacks in audio_support_to_gsm88() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/8100 ) Change subject: fix default fallbacks in audio_support_to_gsm88() ...................................................................... fix default fallbacks in audio_support_to_gsm88() For audio->hr == true, use HR1, and for hr == false use FR1; not vice versa. Change-Id: Ifb4dba7c8e9c1d0a22a007355fbd2eda57e789d3 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3f7e4f8..dcc6b9f 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -61,7 +61,7 @@ default: LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", audio->ver); - return GSM0808_PERM_FR1; + return GSM0808_PERM_HR1; } } else { switch (audio->ver) { @@ -77,7 +77,7 @@ default: LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", audio->ver); - return GSM0808_PERM_HR1; + return GSM0808_PERM_FR1; } } } -- To view, visit https://gerrit.osmocom.org/8100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifb4dba7c8e9c1d0a22a007355fbd2eda57e789d3 Gerrit-Change-Number: 8100 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:56:13 +0000 Subject: Change in osmo-bsc[master]: log: indicate hr/fr in audio_support_to_gsm88() error In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/8101 ) Change subject: log: indicate hr/fr in audio_support_to_gsm88() error ...................................................................... log: indicate hr/fr in audio_support_to_gsm88() error Change-Id: Iaaa710d0274fe813d227cb658d82a24db68c4161 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index dcc6b9f..bfa4091 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -59,7 +59,7 @@ return GSM0808_PERM_HR3; break; default: - LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", + LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: hr%d, using hr1 instead\n", audio->ver); return GSM0808_PERM_HR1; } @@ -75,7 +75,7 @@ return GSM0808_PERM_FR3; break; default: - LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: %d\n", + LOGP(DMSC, LOGL_ERROR, "Wrong speech mode: fr%d, using fr1 instead\n", audio->ver); return GSM0808_PERM_FR1; } -- To view, visit https://gerrit.osmocom.org/8101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaaa710d0274fe813d227cb658d82a24db68c4161 Gerrit-Change-Number: 8101 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 11:56:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 11:56:14 +0000 Subject: Change in osmo-bsc[master]: cosmetic: dyn ts init: undup logging for gprs = none In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/8102 ) Change subject: cosmetic: dyn ts init: undup logging for gprs = none ...................................................................... cosmetic: dyn ts init: undup logging for gprs = none Reshuffle the decision not to activate PDCH when GPRS is off: Even though all current callers should avoid passing a PDCH activation in case GPRS is off, it's a better idea to not assert on it and crash osmo-bsc. Move the decision to omit PDCH activation and logging about it into the actual functions that do PDCH activation. If PDCH activation is skipped, the lchan then just stays as it was, and that's what it should anyway be doing. Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d --- M src/libbsc/abis_rsl.c M src/libbsc/bsc_dyn_ts.c 2 files changed, 20 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 167ef6b..ffbf630 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -2495,6 +2495,16 @@ return abis_rsl_sendmsg(msg); } +static bool check_gprs_enabled(struct gsm_bts_trx_ts *ts) +{ + if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { + LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none': not activating PDCH.\n", + gsm_ts_and_pchan_name(ts)); + return false; + } + return true; +} + int rsl_ipacc_pdch_activate(struct gsm_bts_trx_ts *ts, int act) { struct msgb *msg = rsl_msgb_alloc(); @@ -2512,8 +2522,9 @@ } if (act){ - /* Callers should heed the GPRS mode. */ - OSMO_ASSERT(ts->trx->bts->gprs.mode != BTS_GPRS_NONE); + if (!check_gprs_enabled(ts)) + return -ENOTSUP; + msg_type = RSL_MT_IPAC_PDCH_ACT; ts->flags |= TS_F_PDCH_ACT_PENDING; } else { @@ -2647,8 +2658,6 @@ int rc = -EIO; OSMO_ASSERT(ts->pchan == GSM_PCHAN_TCH_F_TCH_H_PDCH); - DEBUGP(DRSL, "%s starting switchover to %s\n", - gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan)); if (ts->dyn.pchan_is != ts->dyn.pchan_want) { LOGP(DRSL, LOGL_ERROR, @@ -2680,6 +2689,12 @@ } } + if (to_pchan == GSM_PCHAN_PDCH && !check_gprs_enabled(ts)) + return -ENOTSUP; + + DEBUGP(DRSL, "%s starting switchover to %s\n", + gsm_ts_and_pchan_name(ts), gsm_pchan_name(to_pchan)); + /* Record that we're busy switching. */ ts->dyn.pchan_want = to_pchan; diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index aa3c252..6a1cff7 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/src/libbsc/bsc_dyn_ts.c @@ -27,31 +27,14 @@ { int rc; - if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { - LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':" - " not activating PDCH.\n", - gsm_ts_and_pchan_name(ts)); - return; - } - - LOGP(DRSL, LOGL_DEBUG, "%s: trying to PDCH ACT\n", - gsm_ts_and_pchan_name(ts)); - rc = rsl_ipacc_pdch_activate(ts, 1); - if (rc != 0) + if (rc != 0 && rc != -ENOTSUP) LOGP(DRSL, LOGL_ERROR, "%s %s: PDCH ACT failed\n", gsm_ts_name(ts), gsm_pchan_name(ts->pchan)); } void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) { - if (ts->trx->bts->gprs.mode == BTS_GPRS_NONE) { - LOGP(DRSL, LOGL_NOTICE, "%s: GPRS mode is 'none':" - " not activating PDCH.\n", - gsm_ts_and_pchan_name(ts)); - return; - } - dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); } -- To view, visit https://gerrit.osmocom.org/8102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib26642f08044d71a2469e6dbabf1e6fbcb02044d Gerrit-Change-Number: 8102 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 12:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 12:22:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expected results: pass BTS_Test.TC_rll_rel_req Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9158 Change subject: expected results: pass BTS_Test.TC_rll_rel_req ...................................................................... expected results: pass BTS_Test.TC_rll_rel_req Change-Id: Ic436e89c4333b49f39e1e9c387a5a9c79abdba15 --- M bts/expected-results.xml 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/9158/1 diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 27f061e..6cebb46 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -75,9 +75,7 @@ - - Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 383, which has already terminated. - + -- To view, visit https://gerrit.osmocom.org/9158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic436e89c4333b49f39e1e9c387a5a9c79abdba15 Gerrit-Change-Number: 9158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 12:22:43 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 12:22:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expected results: pass BTS_Test.TC_rll_rel_req In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9158 ) Change subject: expected results: pass BTS_Test.TC_rll_rel_req ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic436e89c4333b49f39e1e9c387a5a9c79abdba15 Gerrit-Change-Number: 9158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 May 2018 12:22:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 12:22:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 12:22:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expected results: pass BTS_Test.TC_rll_rel_req In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/9158 ) Change subject: expected results: pass BTS_Test.TC_rll_rel_req ...................................................................... expected results: pass BTS_Test.TC_rll_rel_req Change-Id: Ic436e89c4333b49f39e1e9c387a5a9c79abdba15 --- M bts/expected-results.xml 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/bts/expected-results.xml b/bts/expected-results.xml index 27f061e..6cebb46 100644 --- a/bts/expected-results.xml +++ b/bts/expected-results.xml @@ -1,5 +1,5 @@ - + @@ -75,9 +75,7 @@ - - Dynamic test case error: Error message was received from MC: The connect operation refers to test component with component reference 383, which has already terminated. - + -- To view, visit https://gerrit.osmocom.org/9158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic436e89c4333b49f39e1e9c387a5a9c79abdba15 Gerrit-Change-Number: 9158 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 13:35:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 14 May 2018 13:35:14 +0000 Subject: Change in osmo-gsm-tester[master]: util: Fix unloading of suite lib import path Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9159 Change subject: util: Fix unloading of suite lib import path ...................................................................... util: Fix unloading of suite lib import path Change-Id: Iac81151f5baec092a3d15bbe6541b5bc007e6a03 --- M src/osmo_gsm_tester/util.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/59/9159/1 diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/util.py index c7efb77..27c71cf 100644 --- a/src/osmo_gsm_tester/util.py +++ b/src/osmo_gsm_tester/util.py @@ -119,7 +119,7 @@ def import_path_remove(pathname): dir = os.path.realpath(pathname) - if dir not in sys.path: + if dir in sys.path: sys.path.remove(dir) class listdict(dict): -- To view, visit https://gerrit.osmocom.org/9159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iac81151f5baec092a3d15bbe6541b5bc007e6a03 Gerrit-Change-Number: 9159 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 13:37:51 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 14 May 2018 13:37:51 +0000 Subject: Change in osmo-gsm-tester[master]: util: Fix unloading of suite lib import path In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9159 ) Change subject: util: Fix unloading of suite lib import path ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac81151f5baec092a3d15bbe6541b5bc007e6a03 Gerrit-Change-Number: 9159 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 14 May 2018 13:37:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 13:37:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 14 May 2018 13:37:55 +0000 Subject: Change in osmo-gsm-tester[master]: util: Fix unloading of suite lib import path In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9159 ) Change subject: util: Fix unloading of suite lib import path ...................................................................... util: Fix unloading of suite lib import path Change-Id: Iac81151f5baec092a3d15bbe6541b5bc007e6a03 --- M src/osmo_gsm_tester/util.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/util.py b/src/osmo_gsm_tester/util.py index c7efb77..27c71cf 100644 --- a/src/osmo_gsm_tester/util.py +++ b/src/osmo_gsm_tester/util.py @@ -119,7 +119,7 @@ def import_path_remove(pathname): dir = os.path.realpath(pathname) - if dir not in sys.path: + if dir in sys.path: sys.path.remove(dir) class listdict(dict): -- To view, visit https://gerrit.osmocom.org/9159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iac81151f5baec092a3d15bbe6541b5bc007e6a03 Gerrit-Change-Number: 9159 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 13:57:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 May 2018 13:57:39 +0000 Subject: Change in osmo-bsc[master]: abis-rsl: Send imm.ass messages via PCH In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/6203 ) Change subject: abis-rsl: Send imm.ass messages via PCH ...................................................................... Patch Set 3: > (1 comment) > > @dexter should we review this together before ask somebody else? We can review this together. Please get back to me when we see next time (maybe tomorrow?) -- To view, visit https://gerrit.osmocom.org/6203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a899d9c866ed09dc301694dbbcad304b1ed49e5 Gerrit-Change-Number: 6203 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 14 May 2018 13:57:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 15:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 15:10:04 +0000 Subject: Change in osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts_counter In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/8086 ) Change subject: stats: use libosmocore rate counter for in/out_stream.err_ts_counter ...................................................................... Patch Set 1: Code-Review-1 (6 comments) https://gerrit.osmocom.org/#/c/8086/1/include/osmocom/mgcp/mgcp_internal.h File include/osmocom/mgcp/mgcp_internal.h: https://gerrit.osmocom.org/#/c/8086/1/include/osmocom/mgcp/mgcp_internal.h at 31 PS1, Line 31: #include (could instead just define the opaque structs here, since this header is only using pointers) https://gerrit.osmocom.org/#/c/8086/1/include/osmocom/mgcp/mgcp_internal.h at 49 PS1, Line 49: struct rate_ctr *err_ts_ctr; is it worthwhile to keep a separate pointer? It brings trouble when a rate_ctr_group is ever freed: the code needs to take special care to also invalidate this pointer. Typically we just index into the rate_ctr_group->ctr[], see e.g. osmo-bsc/src/libbsc/abis_rsl.c:98: rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CODEC_AMR_H]); https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_conn.c File src/libosmo-mgcp/mgcp_conn.c: https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_conn.c at 32 PS1, Line 32: const static struct rate_ctr_desc rate_ctr_desc[] = { typically we define an enum for index values and later on use the names, which avoids magic numbers and index mistakes, and greatly simplifies changing this array in the future. See for example osmo-bsc/include/osmocom/bsc/gsm_data.h bts_ctr_description https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_conn.c at 34 PS1, Line 34: .name = "in_stream_err_ts_ctr", I see you essentially took over the old naming; but here is some naming nitpicking, if you care enough: * we know it is a counter from the API now, no need for "_ctr" * does it make sense to see "err_ts" as the common part, and "in" and "out" are aspects of it? I mean "err_ts_in", "err_ts_out"? * "ts" commonly means "timeslot" in osmo-bsc, I would prefer not to re-use that abbreviation. spell out "timeslot_err" completely? https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_network.c File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/#/c/8086/1/src/libosmo-mgcp/mgcp_network.c at 508 PS1, Line 508: /* FIXME: Move this initialization to mgcp.conn.c */ underscore? and what he said below https://gerrit.osmocom.org/#/c/8086/1/tests/mgcp/mgcp_test.c File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/#/c/8086/1/tests/mgcp/mgcp_test.c at 1150 PS1, Line 1150: state.out_stream.err_ts_ctr = &test_ctr_out; (re using indexes, could instead init the state.rate_ctr_group here) -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-Change-Number: 8086 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 May 2018 15:10:04 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon May 14 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#122?= In-Reply-To: <1403736907.1.1526224207074.JavaMail.jenkins@jenkins.osmocom.org> References: <1403736907.1.1526224207074.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <692916166.51.1526310606481.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon May 14 15:17:09 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 15:17:09 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/7992 ) Change subject: move creation of insert subscriber data messages to a common function ...................................................................... Patch Set 4: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/7992/4/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/#/c/7992/4/src/gsup_server.c at 370 PS4, Line 370: * \param[in] msisdn_enc A buffer large enough to store the MSISDN in encoded form. technically that's an [out] param, right? https://gerrit.osmocom.org/#/c/7992/4/src/gsup_server.c at 372 PS4, Line 372: * \param[in] apn_buf A buffer large enough to store an APN (required if cn_domain is OSMO_GSUP_CN_DOMAIN_PS). out? https://gerrit.osmocom.org/#/c/7992/4/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/7992/4/src/hlr.c at 103 PS4, Line 103: peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); unrelated change? ... ah no, the diff just makes the re-arrangement hard to spot. -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 14 May 2018 15:17:09 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 15:25:57 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 May 2018 15:25:57 +0000 Subject: Change in osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8055 to look at the new patch set (#2). Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code The function a_reset_free() is not used anywhere at the code. The reason for this is that a BSC instance is never cleared once it is started up. Also the timer number is not according to the spec. - Remove a_reset_free() - Fix timer number - use fi->priv to hold context info - Fix sourcecode formatting Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Related: OS#3102 --- M include/osmocom/bsc/a_reset.h M include/osmocom/bsc/bsc_msc_data.h M src/libbsc/a_reset.c M src/libbsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_sigtran.c 7 files changed, 73 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/8055/2 -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-Change-Number: 8055 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 15:26:07 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 May 2018 15:26:07 +0000 Subject: Change in osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8054 to look at the new patch set (#2). Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code a_reset.c/h was originally developed to be used in both, bsc and msc without changes. Unfortunately no suitable library has been found for a_reset.c/h so the file ended up as duplicated code in both split brances. Eventually we decided to specialize the generalized code again, which means some of the functions needed only by osmo-bsc are removed. - Remove dead code - Fix counter number - use fi->priv to hold context info - Minor cosmetic fixes Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Related: OS#3103 --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/a_reset.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c 5 files changed, 58 insertions(+), 148 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/8054/2 -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-Change-Number: 8054 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 15:46:20 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 14 May 2018 15:46:20 +0000 Subject: Change in osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts_counter In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8086 to look at the new patch set (#2). Change subject: stats: use libosmocore rate counter for in/out_stream.err_ts_counter ...................................................................... stats: use libosmocore rate counter for in/out_stream.err_ts_counter The two counters: in_stream.err_ts_counter and out_stream.err_ts_counter are still handcoded. To make them better accessible they should be replaced with libosmocore rate counters. - replace state.in_stream.err_ts_counter with libosmocore rate counter - replace state.out_stream.err_ts_counter with libosmocore rate counter Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Related: OS#2517 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 6 files changed, 62 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/8086/2 -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-Change-Number: 8086 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 17:50:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 17:50:07 +0000 Subject: Change in osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/8055 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... Patch Set 2: Code-Review+2 (3 comments) https://gerrit.osmocom.org/#/c/8055/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/8055/2//COMMIT_MSG at 11 PS2, Line 11: is started up. Also the timer number is not according to the spec. which timer number is not what according to which spec? https://gerrit.osmocom.org/#/c/8055/2/src/libbsc/a_reset.c File src/libbsc/a_reset.c: https://gerrit.osmocom.org/#/c/8055/2/src/libbsc/a_reset.c at 33 PS2, Line 33: #define RESET_RESEND_TIMER_NO 4 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.1 */ wow, looks like a double paste typo but the chapter nr is accurate :) https://gerrit.osmocom.org/#/c/8055/2/src/libbsc/a_reset.c at 157 PS2, Line 157: reset_fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, name); (osmo_fsm_inst_alloc() has a priv arg to which you could pass reset_ctx. On the other hand, a good talloc pattern is to allocate the reset_ctx as talloc child of the reset_fsm, so that the deallocating FSM also clears the priv struct at the same time. On the other other hand you say this never gets deallocated. none of these are important, just noting.) -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-Change-Number: 8055 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 May 2018 17:50:07 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 14 17:59:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 14 May 2018 17:59:03 +0000 Subject: Change in osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/8054 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/8054/2/src/libmsc/a_reset.c File src/libmsc/a_reset.c: https://gerrit.osmocom.org/#/c/8054/2/src/libmsc/a_reset.c at 34 PS2, Line 34: enum fsm_states { (name is too general, has always been, but not that important; same for fsm_evt) https://gerrit.osmocom.org/#/c/8054/2/src/libmsc/a_reset.c at 90 PS2, Line 90: .in_event_mask = (1 << EV_CONN_ACK), As I asked before: we allow repeated Conn ACKs? Is that a real thing? And even if yes, AFAICT this state doesn't need an action cb, because the osmo_fsm_* code already logs the event, and fsm_conn_cb() does nothing but trivial logging. https://gerrit.osmocom.org/#/c/8054/2/src/libmsc/a_reset.c at 91 PS2, Line 91: .out_state_mask = 0, ('.member = 0' can be omitted, happens implicitly) https://gerrit.osmocom.org/#/c/8054/2/src/libmsc/a_reset.c at 125 PS2, Line 125: reset_fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, name); use priv arg of osmo_fsm_inst_alloc() (unless you want to use reset_fsm as talloc parent for reset_ctx) -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-Change-Number: 8054 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 14 May 2018 17:59:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Mon May 14 21:08:33 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 21:08:33 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af9faeb5f648_16495f2684894225@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ **] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ **] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 318s] /var/cache/obs/worker/root_3/root: 4217 [ 318s] qemu-system-aarch64: terminating on signal 15 from pid 7605 [ 318s] ### VM INTERACTION END ### [ 318s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (4210) - No such process [ 318s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 318s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 21:12:34 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 21:12:34 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af9fbda47b56_16495f268489531d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 323s] [ 286.812261] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 287.465851] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 288.106662] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 288.826705] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 289.458590] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 290.106838] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 290.835253] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 291.495838] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 292.155121] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 329s] [ 292.835775] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 330s] [ 293.485189] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 294.125852] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 294.795409] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 295.456660] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 296.136468] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 296.738306] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 334s] [ 297.366504] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 298.016822] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] [ 298.666953] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 335s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 336s] [ 299.298950] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 336s] /var/cache/obs/worker/root_19/root: 36159 [ 336s] qemu-system-aarch64: terminating on signal 15 from pid 11884 (fuser) [ 336s] ### VM INTERACTION END ### [ 336s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (36145) - No such process [ 336s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 336s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 21:12:34 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 21:12:34 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af9fbdb9f06f_16495f26848955ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 273s] [ 246.206185] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 246.883608] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.520571] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.184781] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.868127] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.875144] dracut-initqueue[461]: Warning: Could not boot. [ 275s] Starting Setup Virtual Console... [ 276s] [ OK ] Started Setup Virtual Console. [ 276s] Starting Dracut Emergency Shell... [ 276s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 276s] [ 276s] Generating "/run/initramfs/rdsosreport.txt" [ 276s] [ 276s] [ 276s] Entering emergency mode. Exit the shell to continue. [ 276s] Type "journalctl" to view system logs. [ 276s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 276s] after mounting them and attach it to a bug report. [ 276s] [ 276s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_25/root: 9988 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 47061 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (9981) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 21:17:59 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 21:17:59 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af9fd26271fa_16495f268489691c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 13s] [68/71] preinstalling sysvinit-utils... [ 14s] [69/71] preinstalling e2fsprogs... [ 14s] [70/71] preinstalling sysv-rc... [ 14s] [71/71] preinstalling initscripts... [ 15s] [ 15s] [1/1] preinstalling libdevmapper1.02.1... [ 15s] copying packages... [ 18s] reordering...cycle: libc6 -> libgcc1 [ 18s] breaking dependency libgcc1 -> libc6 [ 18s] cycle: debhelper -> dh-autoreconf [ 18s] breaking dependency debhelper -> dh-autoreconf [ 18s] cycle: dh-strip-nondeterminism -> debhelper [ 18s] breaking dependency debhelper -> dh-strip-nondeterminism [ 18s] done [ 18s] objdump: /boot/Image.guest: File format not recognized [ 20s] booting kvm... [ 20s] ### VM INTERACTION START ### [ 20s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image.guest -initrd /boot/initrd.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 20s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 20s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_5/root: 1201 [ 326s] qemu-system-aarch64: terminating on signal 15 from pid 5653 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (1194) - No such process [ 326s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 326s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 21:21:07 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 21:21:07 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5af9fdd7c372e_16495f2684897389@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 276s] [ 247.005423] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 247.649231] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 248.275528] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 278s] [ 248.926977] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 278s] [ 249.587236] dracut-initqueue[455]: Warning: dracut-initqueue timeout - starting timeout scripts [ 278s] [ 249.594286] dracut-initqueue[455]: Warning: Could not boot. [ 278s] Starting Setup Virtual Console... [ 278s] [ OK ] Started Setup Virtual Console. [ 278s] Starting Dracut Emergency Shell... [ 278s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 278s] [ 278s] Generating "/run/initramfs/rdsosreport.txt" [ 279s] [ 279s] [ 279s] Entering emergency mode. Exit the shell to continue. [ 279s] Type "journalctl" to view system logs. [ 279s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 279s] after mounting them and attach it to a bug report. [ 279s] [ 279s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_12/root: 22447 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 5308 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (22440) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 22:24:33 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 22:24:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa0cbb7bbc2_16495f268491547@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 270s] [ 245.477817] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.166302] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.835282] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.495976] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.145413] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.153397] dracut-initqueue[466]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_23/root: 8386 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 47188 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (8379) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 22:25:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 22:25:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa0cf794250_16495f268491582@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 272s] [ 246.445278] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.122751] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.795456] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 248.475878] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 249.125262] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 249.132352] dracut-initqueue[461]: Warning: Could not boot. [ 275s] Starting Setup Virtual Console... [ 275s] [ OK ] Started Setup Virtual Console. [ 275s] Starting Dracut Emergency Shell... [ 275s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 275s] [ 275s] Generating "/run/initramfs/rdsosreport.txt" [ 275s] [ 275s] [ 275s] Entering emergency mode. Exit the shell to continue. [ 275s] Type "journalctl" to view system logs. [ 275s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 275s] after mounting them and attach it to a bug report. [ 275s] [ 275s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_4/root: 15814 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 6803 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (15802) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 22:29:42 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 22:29:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa0de7db0d9_16495f26849162c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 269s] [ 244.775033] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.435614] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.084931] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.745527] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.374933] dracut-initqueue[462]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.382193] dracut-initqueue[462]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_3/root: 31181 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 46168 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (31174) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Mon May 14 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 14 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#34?= In-Reply-To: <1995379463.1.1526251282792.JavaMail.jenkins@jenkins.osmocom.org> References: <1995379463.1.1526251282792.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1102575883.54.1526337680477.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1685/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-1685/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-1685/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-1685/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-1685/ libtool: install: (cd /tmp/am-dc-1685/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-1685/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-1685/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-1685/ libtool: install: chmod 644 /tmp/am-dc-1685/ libtool: install: ranlib /tmp/am-dc-1685/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-1685/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-1685/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-1685/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1685/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-1685/ /bin/mkdir -p '/tmp/am-dc-1685/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-1685/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-1685/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-1685/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-1685/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-1685/ libtool: uninstall: rm -f /tmp/am-dc-1685/ /tmp/am-dc-1685/ /tmp/am-dc-1685/ /tmp/am-dc-1685/ /tmp/am-dc-1685/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-1685/ && rm -f html.tar ) ( cd '/tmp/am-dc-1685/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-1685/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Mon May 14 22:41:07 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 22:41:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa1098a1253_16495f26849173d3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 13s] [70/71] preinstalling sysv-rc... [ 13s] [71/71] preinstalling initscripts... [ 13s] [ 13s] [1/1] preinstalling libdevmapper1.02.1... [ 13s] copying packages... [ 16s] reordering...cycle: libc6 -> libgcc1 [ 16s] breaking dependency libgcc1 -> libc6 [ 16s] cycle: dh-python -> python3 [ 16s] breaking dependency python3 -> dh-python [ 16s] cycle: debhelper -> dh-autoreconf [ 16s] breaking dependency debhelper -> dh-autoreconf [ 16s] cycle: debhelper -> dh-strip-nondeterminism [ 16s] breaking dependency debhelper -> dh-strip-nondeterminism [ 16s] done [ 17s] objdump: /boot/Image.guest: File format not recognized [ 19s] booting kvm... [ 19s] ### VM INTERACTION START ### [ 19s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image.guest -initrd /boot/initrd.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_5/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_5/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 19s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_5/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 326s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 326s] /var/cache/obs/worker/root_5/root: 22732 [ 326s] qemu-system-aarch64: terminating on signal 15 from pid 26045 () [ 326s] ### VM INTERACTION END ### [ 326s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (22725) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 22:45:25 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 22:45:25 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa11875124b_16495f2684917583@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [* ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 4s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_5/root: 27998 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 31180 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (27991) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 23:04:03 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 23:04:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa15fcdcac1_16495f2684919553@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 271s] [ 244.885123] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 245.555660] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 246.224968] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 246.875699] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.535062] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.541784] dracut-initqueue[473]: Warning: Could not boot. [ 274s] Starting Setup Virtual Console... [ 274s] [ OK ] Started Setup Virtual Console. [ 274s] Starting Dracut Emergency Shell... [ 274s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 274s] [ 274s] Generating "/run/initramfs/rdsosreport.txt" [ 274s] [ 274s] [ 274s] Entering emergency mode. Exit the shell to continue. [ 274s] Type "journalctl" to view system logs. [ 274s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 274s] after mounting them and attach it to a bug report. [ 274s] [ 274s] [ 336s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 337s] /var/cache/obs/worker/root_7/root: 47694 [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 10326 () [ 337s] ### VM INTERACTION END ### [ 337s] /var/run/obs/worker/7/build/build-vm: line 458: kill: (47687) - No such process [ 337s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 337s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 23:37:46 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 23:37:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa1dd96b140_16495f26849284eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 319s] [ 257.757053] dracut-initqueue[508]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 258.584682] dracut-initqueue[508]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 259.219004] dracut-initqueue[508]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 259.904870] dracut-initqueue[508]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 260.799079] dracut-initqueue[508]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 260.802774] dracut-initqueue[508]: Warning: Could not boot. [ 322s] Starting Setup Virtual Console... [ 322s] [ OK ] Started Setup Virtual Console. [ 322s] Starting Dracut Emergency Shell... [ 323s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 323s] [ 323s] Generating "/run/initramfs/rdsosreport.txt" [ 323s] [ 323s] [ 323s] Entering emergency mode. Exit the shell to continue. [ 323s] Type "journalctl" to view system logs. [ 323s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 323s] after mounting them and attach it to a bug report. [ 323s] [ 323s] [ 366s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 367s] /var/cache/obs/worker/root_17/root: 35081 [ 367s] qemu-system-aarch64: terminating on signal 15 from pid 54672 (fuser) [ 367s] ### VM INTERACTION END ### [ 367s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (35072) - No such process [ 367s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 367s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Mon May 14 23:55:46 2018 From: admin at opensuse.org (OBS Notification) Date: Mon, 14 May 2018 23:55:46 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa2210e67bd_16495f26849304d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 291s] [ 256.305504] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 292s] [ 257.068131] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 293s] [ 257.680178] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 293s] [ 258.401788] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 294s] [ 259.135976] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 294s] [ 259.153182] dracut-initqueue[471]: Warning: Could not boot. [ 294s] Starting Setup Virtual Console... [ 294s] [ OK ] Started Setup Virtual Console. [ 294s] Starting Dracut Emergency Shell... [ 294s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 294s] [ 294s] Generating "/run/initramfs/rdsosreport.txt" [ 295s] [ 295s] [ 295s] Entering emergency mode. Exit the shell to continue. [ 295s] Type "journalctl" to view system logs. [ 295s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 295s] after mounting them and attach it to a bug report. [ 295s] [ 295s] [ 342s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 343s] /var/cache/obs/worker/root_11/root: 25758 [ 343s] qemu-system-aarch64: terminating on signal 15 from pid 47723 () [ 343s] ### VM INTERACTION END ### [ 343s] /var/run/obs/worker/11/build/build-vm: line 458: kill: (25751) - No such process [ 343s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 343s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 01:06:13 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 01:06:13 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa329a28252_16495f268494401b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ **] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [ **] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ *] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ **] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [** ] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [* ] A start job is running for dev-disk?o\x2d0.device (5min 4s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_2/root: 510 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 3505 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (498) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 01:06:32 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 01:06:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa32bb95777_16495f2684944273@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [*** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit) [* ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 6s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 6s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 7s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 7s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_3/root: 21348 [ 322s] qemu-system-aarch64: terminating on signal 15 from pid 24798 [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (21341) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 01:06:49 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 01:06:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa32bbe65ae_16495f26849443d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 269s] [ 244.505210] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.135936] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.795292] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.475934] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.145369] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.152354] dracut-initqueue[468]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_25/root: 44839 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 32631 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (44828) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 02:31:40 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 02:31:40 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa46a6f14bc_16495f2684948346@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 266s] [ 243.554798] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.205326] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.864724] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.515868] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.144749] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.151501] dracut-initqueue[469]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_13/root: 31637 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 41792 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/13/build/build-vm: line 458: kill: (31630) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 03:13:06 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 03:13:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa504fae8d3_16495f2684949791@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 267s] [ 243.144731] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 243.805357] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.434746] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.085345] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.734714] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.741469] dracut-initqueue[456]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_22/root: 20576 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 25323 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (20568) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 03:41:41 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 03:41:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afa56faa8cc5_16495f268495034a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 262s] [ 240.244316] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 240.885082] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 241.514208] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 242.165080] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 242.834662] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 242.841321] dracut-initqueue[466]: Warning: Could not boot. [ 265s] Starting Setup Virtual Console... [ 265s] [ OK ] Started Setup Virtual Console. [ 265s] Starting Dracut Emergency Shell... [ 265s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 265s] [ 265s] Generating "/run/initramfs/rdsosreport.txt" [ 265s] [ 265s] [ 265s] Entering emergency mode. Exit the shell to continue. [ 265s] Type "journalctl" to view system logs. [ 265s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 265s] after mounting them and attach it to a bug report. [ 265s] [ 265s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_30/root: 5258 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 12741 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/30/build/build-vm: line 458: kill: (5251) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 18 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 09:53:58 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 May 2018 09:53:58 +0000 Subject: Change in libosmocore[master]: fsm: guard action callback Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9160 Change subject: fsm: guard action callback ...................................................................... fsm: guard action callback The FSM allows to set individual action callback functions for each state but it does not allow to leave the action callback pointer unpopulated. However, there are cornercases where having no callback function is desirable. - Check if action callback is popolated before executing it. Change-Id: I36d221c973d3890721ef1d376fb9be82c4311378 --- M src/fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/9160/1 diff --git a/src/fsm.c b/src/fsm.c index ae2fdc2..0370f65 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -541,7 +541,9 @@ osmo_fsm_event_name(fsm, event)); return -1; } - fs->action(fi, event, data); + + if (fs->action) + fs->action(fi, event, data); return 0; } -- To view, visit https://gerrit.osmocom.org/9160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I36d221c973d3890721ef1d376fb9be82c4311378 Gerrit-Change-Number: 9160 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 11:27:34 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 May 2018 11:27:34 +0000 Subject: Change in osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8055 to look at the new patch set (#3). Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code The function a_reset_free() is not used anywhere at the code. The reason for this is that a BSC instance is never cleared once it is started up. Also the timer number is not according to the spec. - Remove a_reset_free() - Fix timer identification number (T4) - use fi->priv to hold context info - Fix sourcecode formatting Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Related: OS#3102 --- M include/osmocom/bsc/a_reset.h M include/osmocom/bsc/bsc_msc_data.h M src/libbsc/a_reset.c M src/libbsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_sigtran.c 7 files changed, 77 insertions(+), 105 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/8055/3 -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-Change-Number: 8055 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 11:27:41 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 May 2018 11:27:41 +0000 Subject: Change in osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8054 to look at the new patch set (#3). Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code a_reset.c/h was originally developed to be used in both, bsc and msc without changes. Unfortunately no suitable library has been found for a_reset.c/h so the file ended up as duplicated code in both split brances. Eventually we decided to specialize the generalized code again, which means some of the functions needed only by osmo-bsc are removed. - Remove dead code - Fix timer identification number (T16) - use fi->priv to hold context info - Minor cosmetic fixes Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Depends: libosmocore I36d221c973d3890721ef1d376fb9be82c4311378 Related: OS#3103 --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/a_reset.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c 5 files changed, 59 insertions(+), 159 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/54/8054/3 -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-Change-Number: 8054 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 11:43:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:10 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac7e8e9944_1fe3bb6688717ba@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 268s] [ 238.219600] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 238.829444] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 239.466335] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 240.116819] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 240.720685] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 240.724220] dracut-initqueue[493]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_3/root: 60585 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 18682 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (60575) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:43:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac7e95183a_1fe3bb6688718d4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 275s] [ 237.747066] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 238.388377] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 239.027166] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 239.679342] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 240.348611] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 240.352255] dracut-initqueue[487]: Warning: Could not boot. [ 277s] Starting Setup Virtual Console... [ 277s] [ OK ] Started Setup Virtual Console. [ 277s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 278s] [ 278s] [ 278s] Entering emergency mode. Exit the shell to continue. [ 278s] Type "journalctl" to view system logs. [ 278s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 278s] after mounting them and attach it to a bug report. [ 278s] [ 278s] [ 340s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 341s] /var/cache/obs/worker/root_6/root: 60540 [ 341s] qemu-system-aarch64: terminating on signal 15 from pid 18664 (fuser) [ 342s] ### VM INTERACTION END ### [ 342s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (60533) - No such process [ 342s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 342s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:43:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:10 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac7e85f42b_1fe3bb668871510@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 273s] [ 246.404995] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.035668] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 247.695046] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 248.365911] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.015112] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 249.022220] dracut-initqueue[468]: Warning: Could not boot. [ 276s] Starting Setup Virtual Console... [ 276s] [ OK ] Started Setup Virtual Console. [ 276s] Starting Dracut Emergency Shell... [ 276s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 276s] [ 276s] Generating "/run/initramfs/rdsosreport.txt" [ 276s] [ 276s] [ 276s] Entering emergency mode. Exit the shell to continue. [ 276s] Type "journalctl" to view system logs. [ 276s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 276s] after mounting them and attach it to a bug report. [ 276s] [ 276s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_8/root: 44567 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 7172 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/8/build/build-vm: line 458: kill: (44560) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:43:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:10 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac7e9cd414_1fe3bb6688719ae@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 295s] [ 259.656999] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 260.316797] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 260.996965] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 261.647313] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 262.290986] dracut-initqueue[480]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 262.297490] dracut-initqueue[480]: Warning: Could not boot. [ 298s] Starting Setup Virtual Console... [ 298s] [ OK ] Started Setup Virtual Console. [ 298s] Starting Dracut Emergency Shell... [ 298s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 298s] [ 298s] Generating "/run/initramfs/rdsosreport.txt" [ 298s] [ 298s] [ 298s] Entering emergency mode. Exit the shell to continue. [ 298s] Type "journalctl" to view system logs. [ 298s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 298s] after mounting them and attach it to a bug report. [ 298s] [ 298s] [ 342s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 343s] /var/cache/obs/worker/root_27/root: 27136 [ 343s] qemu-system-aarch64: terminating on signal 15 from pid 5117 () [ 343s] ### VM INTERACTION END ### [ 343s] /var/run/obs/worker/27/build/build-vm: line 458: kill: (27128) - No such process [ 343s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 343s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:43:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac7ea2c14f_1fe3bb66887205f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 296s] [ 258.486659] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 259.186689] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 259.816907] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 260.468397] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 261.107501] dracut-initqueue[473]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 261.114993] dracut-initqueue[473]: Warning: Could not boot. [ 298s] Starting Setup Virtual Console... [ 298s] [ OK ] Started Setup Virtual Console. [ 298s] Starting Dracut Emergency Shell... [ 298s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 298s] [ 298s] Generating "/run/initramfs/rdsosreport.txt" [ 299s] [ 299s] [ 299s] Entering emergency mode. Exit the shell to continue. [ 299s] Type "journalctl" to view system logs. [ 299s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 299s] after mounting them and attach it to a bug report. [ 299s] [ 299s] [ 344s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 345s] /var/cache/obs/worker/root_1/root: 27272 [ 345s] qemu-system-aarch64: terminating on signal 15 from pid 5288 () [ 345s] ### VM INTERACTION END ### [ 345s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (27264) - No such process [ 345s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 345s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:43:45 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:43:45 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac800549ff_1fe3bb6688721ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 260s] [ 236.161411] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 236.785693] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 262s] [ 237.426560] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 262s] [ 238.044969] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 238.706537] dracut-initqueue[484]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 238.709688] dracut-initqueue[484]: Warning: Could not boot. [ 263s] Starting Setup Virtual Console... [ 263s] [ OK ] Started Setup Virtual Console. [ 263s] Starting Dracut Emergency Shell... [ 263s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 263s] [ 263s] Generating "/run/initramfs/rdsosreport.txt" [ 263s] [ 263s] [ 263s] Entering emergency mode. Exit the shell to continue. [ 263s] Type "journalctl" to view system logs. [ 263s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 263s] after mounting them and attach it to a bug report. [ 263s] [ 263s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_1/root: 36621 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 897 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (36608) - No such process gave up after 13 failed build attempts... [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac94b6bc80_1fe3bb668873536@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 258s] [ 234.236255] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 259s] [ 234.881280] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 235.517384] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 236.176424] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 236.845855] dracut-initqueue[493]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 236.848531] dracut-initqueue[493]: Warning: Could not boot. [ 261s] Starting Setup Virtual Console... [ 261s] [ OK ] Started Setup Virtual Console. [ 261s] Starting Dracut Emergency Shell... [ 261s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 261s] [ 261s] Generating "/run/initramfs/rdsosreport.txt" [ 261s] [ 261s] [ 261s] Entering emergency mode. Exit the shell to continue. [ 261s] Type "journalctl" to view system logs. [ 261s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 261s] after mounting them and attach it to a bug report. [ 261s] [ 261s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_18/root: 28423 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 55404 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/18/build/build-vm: line 458: kill: (28414) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:10 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:10 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac94ad7b6a_1fe3bb6688734e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 269s] [ 245.335139] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 245.985847] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.665276] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.315750] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.985642] dracut-initqueue[468]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.992939] dracut-initqueue[468]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] /var/cache/obs/worker/root_7/root: 12226 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 31431 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/7/build/build-vm: line 458: kill: (12214) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:28 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac94d76e3e_1fe3bb6688739ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 282s] [ 251.415733] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 252.076440] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 252.735480] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 253.563795] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 254.235774] dracut-initqueue[456]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 254.243294] dracut-initqueue[456]: Warning: Could not boot. [ 285s] Starting Setup Virtual Console... [ 285s] [ OK ] Started Setup Virtual Console. [ 285s] Starting Dracut Emergency Shell... [ 285s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 285s] [ 285s] Generating "/run/initramfs/rdsosreport.txt" [ 286s] [ 286s] [ 286s] Entering emergency mode. Exit the shell to continue. [ 286s] Type "journalctl" to view system logs. [ 286s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 286s] after mounting them and attach it to a bug report. [ 286s] [ 286s] [ 337s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 338s] /var/cache/obs/worker/root_15/root: 14780 [ 338s] qemu-system-aarch64: terminating on signal 15 from pid 41906 () [ 338s] ### VM INTERACTION END ### [ 338s] /var/run/obs/worker/15/build/build-vm: line 458: kill: (14772) - No such process [ 338s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 338s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:45 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac96a9daeb_1fe3bb66887402c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 258s] [ 235.129506] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 258s] [ 235.760654] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 259s] [ 236.329137] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 236.985431] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 237.667255] dracut-initqueue[513]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 237.670624] dracut-initqueue[513]: Warning: Could not boot. [ 260s] Starting Setup Virtual Console... [ 260s] [ OK ] Started Setup Virtual Console. [ 260s] Starting Dracut Emergency Shell... [ 260s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 260s] [ 260s] Generating "/run/initramfs/rdsosreport.txt" [ 261s] [ 261s] [ 261s] Entering emergency mode. Exit the shell to continue. [ 261s] Type "journalctl" to view system logs. [ 261s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 261s] after mounting them and attach it to a bug report. [ 261s] [ 261s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_22/root: 30891 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 57760 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (30884) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:45 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac96bc6a61_1fe3bb66887416f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 283s] [ 249.818333] dracut-initqueue[450]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 250.456236] dracut-initqueue[450]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 251.120584] dracut-initqueue[450]: Warning: dracut-initqueue timeout - starting timeout scripts [ 285s] [ 251.721454] dracut-initqueue[450]: Warning: dracut-initqueue timeout - starting timeout scripts [ 286s] [ 252.345743] dracut-initqueue[450]: Warning: dracut-initqueue timeout - starting timeout scripts [ 286s] [ 252.353134] dracut-initqueue[450]: Warning: Could not boot. [ 286s] Starting Setup Virtual Console... [ 286s] [ OK ] Started Setup Virtual Console. [ 286s] Starting Dracut Emergency Shell... [ 286s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 286s] [ 286s] Generating "/run/initramfs/rdsosreport.txt" [ 286s] [ 286s] [ 286s] Entering emergency mode. Exit the shell to continue. [ 286s] Type "journalctl" to view system logs. [ 286s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 286s] after mounting them and attach it to a bug report. [ 286s] [ 286s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_25/root: 17076 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 42892 () [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (17069) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:49:45 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:49:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac96ce5563_1fe3bb66887432a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [** ] A start job is running for dev-disk...2d0.device (4min 49s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 50s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 50s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 51s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 51s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 52s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 52s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 59s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 357s] /var/cache/obs/worker/root_3/root: 14880 [ 357s] qemu-system-aarch64: terminating on signal 15 from pid 16324 [ 357s] ### VM INTERACTION END ### [ 357s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (14873) - No such process [ 357s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 357s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:50:19 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:50:19 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afac989324d2_1fe3bb668874784@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 263s] [ 235.525451] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 263s] [ 236.134621] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 236.748591] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 237.369898] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 237.994711] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 238.615530] dracut-initqueue[487]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 238.618079] dracut-initqueue[487]: Warning: Could not boot. [ 266s] Starting Setup Virtual Console... [ 266s] [ OK ] Started Setup Virtual Console. [ 266s] Starting Dracut Emergency Shell... [ 266s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 266s] [ 266s] Generating "/run/initramfs/rdsosreport.txt" [ 266s] [ 266s] [ 266s] Entering emergency mode. Exit the shell to continue. [ 266s] Type "journalctl" to view system logs. [ 266s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 266s] after mounting them and attach it to a bug report. [ 266s] [ 266s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_23/root: 9186 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 37554 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (9173) - No such process gave up after 12 failed build attempts... [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 11:52:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 11:52:55 +0000 Subject: Change in osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9161 Change subject: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled ...................................................................... tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 --- M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py A suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py A suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py 4 files changed, 42 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/61/9161/1 diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index 82e357c..4fe4e46 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -16,8 +16,4 @@ bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py new file mode 100755 index 0000000..c1349ae --- /dev/null +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index 1424da8..b9b7935 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -16,8 +16,4 @@ bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py new file mode 100755 index 0000000..d80d27a --- /dev/null +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) -- To view, visit https://gerrit.osmocom.org/9161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 Gerrit-Change-Number: 9161 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 11:57:29 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:57:29 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afacb2f36660_1fe3bb668876335@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 274s] [ 245.645315] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 246.334362] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 246.995396] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 247.685933] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 248.355494] dracut-initqueue[475]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 248.363594] dracut-initqueue[475]: Warning: Could not boot. [ 277s] Starting Setup Virtual Console... [ 277s] [ OK ] Started Setup Virtual Console. [ 277s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 277s] [ 277s] [ 277s] Entering emergency mode. Exit the shell to continue. [ 277s] Type "journalctl" to view system logs. [ 277s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 277s] after mounting them and attach it to a bug report. [ 277s] [ 277s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_6/root: 28632 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 23885 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (28616) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 11:57:46 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 11:57:46 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afacb4c35c37_1fe3bb668876612@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 269s] [ 245.661646] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.305706] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.975047] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.635740] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.305032] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.311997] dracut-initqueue[470]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_16/root: 47992 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 22592 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (47984) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 12:00:20 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 12:00:20 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afacbe626edd_1fe3bb6688774ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 258s] [ 234.426177] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 259s] [ 235.051796] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 259s] [ 235.693155] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 260s] [ 236.329357] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 237.040313] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 261s] [ 237.044131] dracut-initqueue[483]: Warning: Could not boot. [ 261s] Starting Setup Virtual Console... [ 261s] [ OK ] Started Setup Virtual Console. [ 261s] Starting Dracut Emergency Shell... [ 261s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 261s] [ 261s] Generating "/run/initramfs/rdsosreport.txt" [ 261s] [ 261s] [ 261s] Entering emergency mode. Exit the shell to continue. [ 261s] Type "journalctl" to view system logs. [ 261s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 261s] after mounting them and attach it to a bug report. [ 261s] [ 261s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_4/root: 39824 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 7395 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (39809) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 12:02:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 15 May 2018 12:02:49 +0000 Subject: Change in libosmo-sccp[master]: free msgb for primitive allocated in lm_timer_cb() of lm_fsm In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8065 to look at the new patch set (#2). Change subject: free msgb for primitive allocated in lm_timer_cb() of lm_fsm ...................................................................... free msgb for primitive allocated in lm_timer_cb() of lm_fsm A primitive allocated in lm_timer_cb() with xua_xlm_prim_alloc() was never freed. Don't forget to free the msgb in osmo_xlm_sap_down(). Found by code inspection. Also, assert that allocation suceeded like we do elsewhere. Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Related: OS#2449 --- M src/xua_default_lm_fsm.c M src/xua_rkm.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/65/8065/2 -- To view, visit https://gerrit.osmocom.org/8065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Gerrit-Change-Number: 8065 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 12:03:33 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 12:03:33 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afacc98bcd25_1fe3bb6688781aa@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 271s] [ 245.475044] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 246.135686] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 246.764978] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.435604] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 248.084962] dracut-initqueue[451]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 248.091909] dracut-initqueue[451]: Warning: Could not boot. [ 274s] Starting Setup Virtual Console... [ 274s] [ OK ] Started Setup Virtual Console. [ 274s] Starting Dracut Emergency Shell... [ 274s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 274s] [ 274s] Generating "/run/initramfs/rdsosreport.txt" [ 274s] [ 274s] [ 274s] Entering emergency mode. Exit the shell to continue. [ 274s] Type "journalctl" to view system logs. [ 274s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 274s] after mounting them and attach it to a bug report. [ 274s] [ 274s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_6/root: 32955 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 3354 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (32946) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 12:03:33 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 12:03:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afacc9927c21_1fe3bb668878237@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 272s] [ 245.194987] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 245.855673] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 246.515140] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.185542] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.834883] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 274s] [ 247.841695] dracut-initqueue[471]: Warning: Could not boot. [ 274s] Starting Setup Virtual Console... [ 274s] [ OK ] Started Setup Virtual Console. [ 274s] Starting Dracut Emergency Shell... [ 274s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 274s] [ 274s] Generating "/run/initramfs/rdsosreport.txt" [ 275s] [ 275s] [ 275s] Entering emergency mode. Exit the shell to continue. [ 275s] Type "journalctl" to view system logs. [ 275s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 275s] after mounting them and attach it to a bug report. [ 275s] [ 275s] [ 337s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 337s] /var/cache/obs/worker/root_19/root: 33002 [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 3472 () [ 337s] ### VM INTERACTION END ### [ 337s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (32991) - No such process [ 337s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 337s] or the build host has a kernel or hardware problem... gave up after 18 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 12:03:50 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 12:03:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afaccb344e55_1fe3bb66887837@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 270s] [ 245.704965] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.355626] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.024937] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.665674] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.314951] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.321907] dracut-initqueue[464]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_16/root: 25847 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 30387 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/16/build/build-vm: line 458: kill: (25840) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 12:05:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 15 May 2018 12:05:44 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Hello neels, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7992 to look at the new patch set (#5). Change subject: move creation of insert subscriber data messages to a common function ...................................................................... move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 103 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/5 -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:09:53 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 12:09:53 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E16-6a9a_=E2=86=92_0=2E8=2E1?= Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9162 Change subject: Bump version: 0.8.0.16-6a9a ? 0.8.1 ...................................................................... Bump version: 0.8.0.16-6a9a ? 0.8.1 Change-Id: Idee331e94cf00dac4cff29c32453d2bc6780548a --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/9162/1 diff --git a/debian/changelog b/debian/changelog index 39409d0..09e2a83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +osmo-bts (0.8.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch + * dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDCH TS + * dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify + * dyn TS: clear TCH state upon reconnecting as PDCH + * cosmetic: dyn TS: clarify chan_nr composition + * ignore RSL RF CHAN REL for inactive lchans + * fix RSL Chan Activ Nack messages + * ip.access dyn ts: properly NACK a PDCH ACT on a still active lchan + * add/improve various logging around dyn ts + * dyn TS: be less strict on chan_nr, to allow arbitrary pchan switches + + [ Stefan Sperling ] + * send a State Changed Event Report when rf is locked/unlocked + + [ Harald Welte ] + * rsl: log errors when parsing of encryption information fails + * rsl: Make channel activation fail if encryption algorithm not supported + * rsl: Properly NACK CHAN_ACKT / MODE_MODIFY + * rsl: If CHAN ACT or MODE MODIF fails, send respective NACK + * osmo-bts-trx: Enable A5/3 cipher support + + -- Pau Espin Pedrol Tue, 15 May 2018 14:08:47 +0200 + osmo-bts (0.8.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/9162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idee331e94cf00dac4cff29c32453d2bc6780548a Gerrit-Change-Number: 9162 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 15 May 2018 12:10:52 +0000 Subject: Change in osmo-bts[master]: let osmo-bts log a special notice if OML connection is closed early In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8056 to look at the new patch set (#3). Change subject: let osmo-bts log a special notice if OML connection is closed early ...................................................................... let osmo-bts log a special notice if OML connection is closed early A frequent configuration file error is that the unit_id settings of osmo-bts and osmo-bsc don't match. The BSC already prints an error in this case. Let the BTS print an error as well. We use a heuristic for this purpose: If the OML link is dropped within 10 seconds after being established, log a special warning which alerts the user and recommend a manual configuration file check. Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Related: OS#3143 --- M include/osmo-bts/gsm_data_shared.h M src/common/abis.c 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/8056/3 -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-Change-Number: 8056 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:11:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 15 May 2018 12:11:20 +0000 Subject: Change in osmo-bts[master]: let osmo-bts log a special notice if OML connection is closed early In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/8056 ) Change subject: let osmo-bts log a special notice if OML connection is closed early ...................................................................... Patch Set 3: > (1 comment) Log level set to FATAL in patch set 3. -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-Change-Number: 8056 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 15 May 2018 12:11:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:11:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 12:11:42 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E9-a7008_=E2=86=92_1=2E2=2E1?= Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9163 Change subject: Bump version: 1.2.0.9-a7008 ? 1.2.1 ...................................................................... Bump version: 1.2.0.9-a7008 ? 1.2.1 Change-Id: I5f6135b7e16cac95c58a1bbc147234e10ee37574 --- M debian/changelog 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/9163/1 diff --git a/debian/changelog b/debian/changelog index a8e2631..461b0c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +osmo-bsc (1.2.1) unstable; urgency=medium + + [ Philipp Maier ] + * bsc_api/GSCON: prevent unnecessary channel mode modifications + + [ Neels Hofmeyr ] + * resurrect meas_feed.c: vty, vty-test + * dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK + * dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in the proper place + * dyn TS, assignment: allow switch from PDCH with associated conn + * dyn TS: init only when both RSL and the Channel OM are established + * dyn TS: allow any pchan type changes, fix for gprs mode none + * debug log: verbosely log all lchan alloc choices + * deprecate dyn_ts_allow_tch_f and by default allow all TCH + * fix default fallbacks in audio_support_to_gsm88() + * log: indicate hr/fr in audio_support_to_gsm88() error + * cosmetic: dyn ts init: undup logging for gprs = none + + [ Vadim Yanitskiy ] + * osmo_bsc_vty.c: fix: write MGW configuration + + -- Pau Espin Pedrol Tue, 15 May 2018 14:10:38 +0200 + osmo-bsc (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/9163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5f6135b7e16cac95c58a1bbc147234e10ee37574 Gerrit-Change-Number: 9163 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:28:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 12:28:12 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E9-a7008_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9163 ) Change subject: Bump version: 1.2.0.9-a7008 ? 1.2.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5f6135b7e16cac95c58a1bbc147234e10ee37574 Gerrit-Change-Number: 9163 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 12:28:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:28:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 12:28:16 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E16-6a9a_=E2=86=92_0=2E8=2E1?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9162 ) Change subject: Bump version: 0.8.0.16-6a9a ? 0.8.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idee331e94cf00dac4cff29c32453d2bc6780548a Gerrit-Change-Number: 9162 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 12:28:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:28:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 12:28:42 +0000 Subject: Change in osmo-bts[master]: let osmo-bts log a special notice if OML connection is closed early In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8056 ) Change subject: let osmo-bts log a special notice if OML connection is closed early ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-Change-Number: 8056 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 15 May 2018 12:28:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:29:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 12:29:07 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bts=5Bmaster=5D=3A_Bump_version=3A_0=2E8=2E0=2E16-6a9a_=E2=86=92_0=2E8=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9162 ) Change subject: Bump version: 0.8.0.16-6a9a ? 0.8.1 ...................................................................... Bump version: 0.8.0.16-6a9a ? 0.8.1 Change-Id: Idee331e94cf00dac4cff29c32453d2bc6780548a --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 39409d0..09e2a83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +osmo-bts (0.8.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * cosmetic: dyn TS: clarify rsl_tx_rf_rel_ack() with a switch + * dyn TS: fix TCH/F_TCH/H_PDCH: properly record release of PDCH TS + * dyn TS: rx_rf_chan_rel: properly mark PDCH rel when no PCU, clarify + * dyn TS: clear TCH state upon reconnecting as PDCH + * cosmetic: dyn TS: clarify chan_nr composition + * ignore RSL RF CHAN REL for inactive lchans + * fix RSL Chan Activ Nack messages + * ip.access dyn ts: properly NACK a PDCH ACT on a still active lchan + * add/improve various logging around dyn ts + * dyn TS: be less strict on chan_nr, to allow arbitrary pchan switches + + [ Stefan Sperling ] + * send a State Changed Event Report when rf is locked/unlocked + + [ Harald Welte ] + * rsl: log errors when parsing of encryption information fails + * rsl: Make channel activation fail if encryption algorithm not supported + * rsl: Properly NACK CHAN_ACKT / MODE_MODIFY + * rsl: If CHAN ACT or MODE MODIF fails, send respective NACK + * osmo-bts-trx: Enable A5/3 cipher support + + -- Pau Espin Pedrol Tue, 15 May 2018 14:08:47 +0200 + osmo-bts (0.8.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/9162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idee331e94cf00dac4cff29c32453d2bc6780548a Gerrit-Change-Number: 9162 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 12:29:10 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E0=2E9-a7008_=E2=86=92_1=2E2=2E1?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9163 ) Change subject: Bump version: 1.2.0.9-a7008 ? 1.2.1 ...................................................................... Bump version: 1.2.0.9-a7008 ? 1.2.1 Change-Id: I5f6135b7e16cac95c58a1bbc147234e10ee37574 --- M debian/changelog 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index a8e2631..461b0c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +osmo-bsc (1.2.1) unstable; urgency=medium + + [ Philipp Maier ] + * bsc_api/GSCON: prevent unnecessary channel mode modifications + + [ Neels Hofmeyr ] + * resurrect meas_feed.c: vty, vty-test + * dyn ts, bts_ipaccess_nanobts.c: init PDCH on Chan OPSTART ACK + * dyn TS, assignment: set lchan state to LCHAN_S_ACT_REQ in the proper place + * dyn TS, assignment: allow switch from PDCH with associated conn + * dyn TS: init only when both RSL and the Channel OM are established + * dyn TS: allow any pchan type changes, fix for gprs mode none + * debug log: verbosely log all lchan alloc choices + * deprecate dyn_ts_allow_tch_f and by default allow all TCH + * fix default fallbacks in audio_support_to_gsm88() + * log: indicate hr/fr in audio_support_to_gsm88() error + * cosmetic: dyn ts init: undup logging for gprs = none + + [ Vadim Yanitskiy ] + * osmo_bsc_vty.c: fix: write MGW configuration + + -- Pau Espin Pedrol Tue, 15 May 2018 14:10:38 +0200 + osmo-bsc (1.2.0) unstable; urgency=medium [ Neels Hofmeyr ] -- To view, visit https://gerrit.osmocom.org/9163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5f6135b7e16cac95c58a1bbc147234e10ee37574 Gerrit-Change-Number: 9163 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:30:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 12:30:12 +0000 Subject: Change in libosmo-sccp[master]: free msgb for primitive allocated in lm_timer_cb() of lm_fsm In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8065 ) Change subject: free msgb for primitive allocated in lm_timer_cb() of lm_fsm ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Gerrit-Change-Number: 8065 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 12:30:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 12:30:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 12:30:14 +0000 Subject: Change in libosmo-sccp[master]: free msgb for primitive allocated in lm_timer_cb() of lm_fsm In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8065 ) Change subject: free msgb for primitive allocated in lm_timer_cb() of lm_fsm ...................................................................... free msgb for primitive allocated in lm_timer_cb() of lm_fsm A primitive allocated in lm_timer_cb() with xua_xlm_prim_alloc() was never freed. Don't forget to free the msgb in osmo_xlm_sap_down(). Found by code inspection. Also, assert that allocation suceeded like we do elsewhere. Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Related: OS#2449 --- M src/xua_default_lm_fsm.c M src/xua_rkm.c 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index eba89c2..11a97a2 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -175,6 +175,7 @@ * let's dynamically register */ osmo_fsm_inst_state_chg(fi, S_RKM_REG, 10, T_WAIT_RK_REG_RESP); prim = xua_xlm_prim_alloc(OSMO_XLM_PRIM_M_RK_REG, PRIM_OP_REQUEST); + OSMO_ASSERT(prim); as = find_first_as_in_asp(lmp->asp); if (!as) { LOGPFSML(fi, LOGL_ERROR, "Unable to find AS!\n"); diff --git a/src/xua_rkm.c b/src/xua_rkm.c index b3c5be7..b79f7f3 100644 --- a/src/xua_rkm.c +++ b/src/xua_rkm.c @@ -545,6 +545,7 @@ break; } + msgb_free(prim->oph.msg); return 0; } -- To view, visit https://gerrit.osmocom.org/8065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie667b1b8beeda2aa4520a1413f51101435215cc0 Gerrit-Change-Number: 8065 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 12:35:19 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 12:35:19 +0000 Subject: Build failure of network:osmocom:nightly/binutils-arm-osmo-eabi in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afad41396c44_1fe3bb66889018e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/binutils-arm-osmo-eabi/Debian_9.0/aarch64 Package network:osmocom:nightly/binutils-arm-osmo-eabi failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly binutils-arm-osmo-eabi Last lines of build log: [ 270s] [ 245.674889] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.345509] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.994845] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.645514] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.304884] dracut-initqueue[464]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.312605] dracut-initqueue[464]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_4/root: 48604 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 11499 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (48597) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue May 15 13:09:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 15 May 2018 13:09:06 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#123?= In-Reply-To: <692916166.51.1526310606481.JavaMail.jenkins@jenkins.osmocom.org> References: <692916166.51.1526310606481.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <427581626.67.1526389746717.JavaMail.jenkins@jenkins.osmocom.org> See From nhofmeyr at sysmocom.de Tue May 15 13:28:07 2018 From: nhofmeyr at sysmocom.de (Neels Hofmeyr) Date: Tue, 15 May 2018 15:28:07 +0200 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: <5afacc9927c21_1fe3bb668878237@build.opensuse.org> References: <5afacc9927c21_1fe3bb668878237@build.opensuse.org> Message-ID: <20180515132807.axm44jgsd3lybf5m@ass40.sysmocom.de> Hi OBS build admins, for some days now the aarch64 builds have given us this error report, which seems like a hardware failure of sorts: > [ 274s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist I thought I'd ping you on it in case you haven't noticed yet. Thanks! ~N On Tue, May 15, 2018 at 12:03:33PM +0000, OBS Notification wrote: > Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 > > Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 > > Check out the package for editing: > osc checkout network:osmocom:nightly osmo-sgsn > > Last lines of build log: > [ 272s] [ 245.194987] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts > [ 272s] [ 245.855673] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts > [ 273s] [ 246.515140] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts > [ 274s] [ 247.185542] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts > [ 274s] [ 247.834883] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts > [ 274s] [ 247.841695] dracut-initqueue[471]: Warning: Could not boot. > [ 274s] Starting Setup Virtual Console... > [ 274s] [ OK ] Started Setup Virtual Console. > [ 274s] Starting Dracut Emergency Shell... > [ 274s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist > [ 274s] > [ 274s] Generating "/run/initramfs/rdsosreport.txt" > [ 275s] > [ 275s] > [ 275s] Entering emergency mode. Exit the shell to continue. > [ 275s] Type "journalctl" to view system logs. > [ 275s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot > [ 275s] after mounting them and attach it to a bug report. > [ 275s] > [ 275s] > [ 337s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### > [ 337s] /var/cache/obs/worker/root_19/root: 33002 > [ 337s] qemu-system-aarch64: terminating on signal 15 from pid 3472 () > [ 337s] ### VM INTERACTION END ### > [ 337s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (32991) - No such process > [ 337s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) > [ 337s] or the build host has a kernel or hardware problem... > > gave up after 18 failed build attempts... > > -- > Configure notifications at https://build.opensuse.org/user/notifications > openSUSE Build Service (https://build.opensuse.org/) -- - Neels Hofmeyr http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Gesch?ftsf?hrer / Managing Directors: Harald Welte -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:31:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:31:54 +0000 Subject: Change in osmo-pcu[master]: Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3384 to look at the new patch set (#8). Change subject: Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP ...................................................................... Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP As specified in 3GPP TS 03.60 Section 16.2.1 and 44.018 Section 3.4.15, a Class B MS is sending a "RR GPRS SUSPEND REQ" via a DCCH to the BTS if it wants to suspend GPRS services. As of Change-Id I3c1af662c8f0d3d22da200638480f6ef05c3ed1f, OsmoBTS forwards this via the PCU socket, so we need to pick it up and send it via BSSGP to the SGSN. Change-Id: I7b4beb413a6f974373a404b5a11c44d86ba695d3 Closes: OS#2249 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/84/3384/8 -- To view, visit https://gerrit.osmocom.org/3384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7b4beb413a6f974373a404b5a11c44d86ba695d3 Gerrit-Change-Number: 3384 Gerrit-PatchSet: 8 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:31:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:31:55 +0000 Subject: Change in osmo-pcu[master]: UL TBF: Actually raise V(Q) in raise_v_q() method Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9164 Change subject: UL TBF: Actually raise V(Q) in raise_v_q() method ...................................................................... UL TBF: Actually raise V(Q) in raise_v_q() method So far the method only printed that it was raising V(Q) but never actually did so. The increment statement was only in the log statement, its result never store to the actual m_v_q member variable. Change-Id: I699ebf6d1fceec655585e430711f59648b525728 --- M src/rlc.cpp 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/64/9164/1 diff --git a/src/rlc.cpp b/src/rlc.cpp index a82f550..59061f3 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -294,11 +294,13 @@ uint16_t count = 0; while (v_q() != v_r()) { + uint16_t v_q_old; if (!m_v_n.is_received(v_q())) break; + v_q_old = v_q(); + set_v_q(mod_sns(v_q() + 1)); LOGP(DRLCMACUL, LOGL_DEBUG, "- Taking block %d out, raising " - "V(Q) to %d\n", v_q(), mod_sns(v_q() + 1)); - raise_v_q(1); + "V(Q) to %d\n", v_q_old, v_q()); count += 1; } -- To view, visit https://gerrit.osmocom.org/9164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I699ebf6d1fceec655585e430711f59648b525728 Gerrit-Change-Number: 9164 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:31:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:31:55 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9165 Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Don't register SIGHUP handler without actually handling SIGHUP In libosmocore, we normally register a SIGHUP handler for log file rotation. However, the osmo-pcu code so far installed its own signal handler, which did exactly nothing in the SIGHUP case. Let's fix this by removing SIGHUP handling here, letting libosmocore take care about this. Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Closes: OS#3265 --- M src/pcu_main.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/65/9165/1 diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 84ade6f..611b2d0 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -308,12 +308,12 @@ return rc; signal(SIGINT, sighandler); - signal(SIGHUP, sighandler); signal(SIGTERM, sighandler); signal(SIGPIPE, sighandler); signal(SIGABRT, sighandler); signal(SIGUSR1, sighandler); signal(SIGUSR2, sighandler); + osmo_init_ignore_signals(); /* enable realtime priority for us */ if (rt_prio != -1) { -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (Thorsten Alteholz) Date: Tue, 15 May 2018 13:32:39 +0000 Subject: Change in libosmocore[master]: fix spelling Message-ID: Thorsten Alteholz has uploaded this change for review. ( https://gerrit.osmocom.org/9166 Change subject: fix spelling ...................................................................... fix spelling Change-Id: I3ac92217f83279d5f987ab34eb18b2e6cb1c7812 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/9166/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 5d2864f..b699080 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -316,7 +316,7 @@ GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL = 0x10, GSM0808_CAUSE_TRAFFIC_LOAD_IN_TGT_HIGHER_THAN_IN_SRC_CELL = 0x11, GSM0808_CAUSE_RELOCATION_TRIGGERED = 0x12, - GSM0808_CAUSE_REQUSTED_OPT_NOT_AUTHORISED = 0x14, + GSM0808_CAUSE_REQUESTED_OPT_NOT_AUTHORISED = 0x14, GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED = 0x15, GSM0808_CAUSE_RESP_TO_INT_HO_ENQ_MSG = 0x16, GSM0808_CAUSE_INT_HO_ENQUIRY_REJECT = 0x17, @@ -358,7 +358,7 @@ GSM0808_CAUSE_DTM_HO_INVALID_PS_IND = 0x56, GSM0808_CAUSE_CALL_ID_ALREADY_ALLOC = 0x57, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC = 96, - GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTANT = 0x61, + GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTENT = 0x61, GSM0808_CAUSE_DTM_HO_TIMER_EXPIRY = 0x62, }; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e6a581c..4743175 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -936,7 +936,7 @@ { GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL, "REDUCE LOAD IN SERVING CELL" }, { GSM0808_CAUSE_TRAFFIC_LOAD_IN_TGT_HIGHER_THAN_IN_SRC_CELL, "TRAFFIC LOAD IN TGT HIGHER THAN IN SRC CELL" }, { GSM0808_CAUSE_RELOCATION_TRIGGERED, "RELOCATION TRIGGERED" }, - { GSM0808_CAUSE_REQUSTED_OPT_NOT_AUTHORISED, "REQUSTED OPT NOT AUTHORISED" }, + { GSM0808_CAUSE_REQUESTED_OPT_NOT_AUTHORISED, "REQUESTED OPT NOT AUTHORISED" }, { GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED, "ALT CHAN CONFIG REQUESTED" }, { GSM0808_CAUSE_RESP_TO_INT_HO_ENQ_MSG, "RESP TO INT HO ENQ MSG" }, { GSM0808_CAUSE_INT_HO_ENQUIRY_REJECT, "INT HO ENQUIRY REJECT" }, @@ -978,7 +978,7 @@ { GSM0808_CAUSE_DTM_HO_INVALID_PS_IND, "DTM HO INVALID PS IND" }, { GSM0808_CAUSE_CALL_ID_ALREADY_ALLOC, "CALL ID ALREADY ALLOC" }, { GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC, "PROTOCOL ERROR BETWEEN BSS AND MSC" }, - { GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTANT, "VGCS VBS CALL NON EXISTANT" }, + { GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTENT, "VGCS VBS CALL NON EXISTENT" }, { GSM0808_CAUSE_DTM_HO_TIMER_EXPIRY, "DTM HO TIMER EXPIRY" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/9166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3ac92217f83279d5f987ab34eb18b2e6cb1c7812 Gerrit-Change-Number: 9166 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:45:49 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9165 ) Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 15 May 2018 13:45:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:46:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:46:17 +0000 Subject: Change in osmo-pcu[master]: UL TBF: Actually raise V(Q) in raise_v_q() method In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9164 ) Change subject: UL TBF: Actually raise V(Q) in raise_v_q() method ...................................................................... Patch Set 2: Code-Review-1 we need test coverage before merging this -- To view, visit https://gerrit.osmocom.org/9164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I699ebf6d1fceec655585e430711f59648b525728 Gerrit-Change-Number: 9164 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 13:46:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:46:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:46:50 +0000 Subject: Change in osmo-pcu[master]: Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/3384 ) Change subject: Forward GPRS SUSPEND REQ from BTS to SGSN using BSSGP ...................................................................... Patch Set 9: Code-Review-1 we need test coverage before merging this -- To view, visit https://gerrit.osmocom.org/3384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b4beb413a6f974373a404b5a11c44d86ba695d3 Gerrit-Change-Number: 3384 Gerrit-PatchSet: 9 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Comment-Date: Tue, 15 May 2018 13:46:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:48:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:48:55 +0000 Subject: Change in libosmocore[master]: fix spelling In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9166 ) Change subject: fix spelling ...................................................................... Patch Set 1: Code-Review+2 the question is if anyone has already used the old / wrong spelling. At least in the osmocom code base, the answer is no, so we should be safe to change it without adding a backwards-compatible #define. -- To view, visit https://gerrit.osmocom.org/9166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3ac92217f83279d5f987ab34eb18b2e6cb1c7812 Gerrit-Change-Number: 9166 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 13:48:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:49:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:49:14 +0000 Subject: Change in osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9161 ) Change subject: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 Gerrit-Change-Number: 9161 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 13:49:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:49:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:49:51 +0000 Subject: Change in libosmocore[master]: fsm: guard action callback In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9160 ) Change subject: fsm: guard action callback ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I36d221c973d3890721ef1d376fb9be82c4311378 Gerrit-Change-Number: 9160 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 13:49:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:49:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 13:49:53 +0000 Subject: Change in libosmocore[master]: fsm: guard action callback In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9160 ) Change subject: fsm: guard action callback ...................................................................... fsm: guard action callback The FSM allows to set individual action callback functions for each state but it does not allow to leave the action callback pointer unpopulated. However, there are cornercases where having no callback function is desirable. - Check if action callback is popolated before executing it. Change-Id: I36d221c973d3890721ef1d376fb9be82c4311378 --- M src/fsm.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/fsm.c b/src/fsm.c index ae2fdc2..0370f65 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -541,7 +541,9 @@ osmo_fsm_event_name(fsm, event)); return -1; } - fs->action(fi, event, data); + + if (fs->action) + fs->action(fi, event, data); return 0; } -- To view, visit https://gerrit.osmocom.org/9160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I36d221c973d3890721ef1d376fb9be82c4311378 Gerrit-Change-Number: 9160 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 13:52:44 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 15 May 2018 13:52:44 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9165 ) Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9165/2/src/pcu_main.cpp File src/pcu_main.cpp: https://gerrit.osmocom.org/#/c/9165/2/src/pcu_main.cpp at 146 PS2, Line 146: if (sigset == SIGHUP || sigset == SIGPIPE) remove SIGHUP here as well? -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 15 May 2018 13:52:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 13:54:29 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 13:54:29 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afae698322fc_1fe3bb6688130888@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 267s] [ 244.465179] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.115742] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.785212] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.415956] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.085138] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.092005] dracut-initqueue[460]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_32/root: 39565 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 5425 (fuser) [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (39558) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 13:54:29 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 13:54:29 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afae69886730_1fe3bb6688130991@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 266s] [ 242.804316] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 243.485500] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.104449] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.765588] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.404669] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.411468] dracut-initqueue[459]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_3/root: 15484 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 20879 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (15477) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 14:05:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 14:05:05 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9165 to look at the new patch set (#3). Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Don't register SIGHUP handler without actually handling SIGHUP In libosmocore, we normally register a SIGHUP handler for log file rotation. However, the osmo-pcu code so far installed its own signal handler, which did exactly nothing in the SIGHUP case. Let's fix this by removing SIGHUP handling here, letting libosmocore take care about this. Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Closes: OS#3265 --- M src/pcu_main.cpp 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/65/9165/3 -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:15:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 14:15:08 +0000 Subject: Change in osmo-bts[master]: scheduler_trx: Add reminders to use libosmocore functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8103 to look at the new patch set (#2). Change subject: scheduler_trx: Add reminders to use libosmocore functions ...................................................................... scheduler_trx: Add reminders to use libosmocore functions Let' wait until the just-merged osmo_timerfd_* functions of Change-Id Ibeffba7c997252c003723bcd5d14122c4ded2fe7 have made it into the next tagged release, and then replace the implementation here. Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/8103/2 -- To view, visit https://gerrit.osmocom.org/8103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 Gerrit-Change-Number: 8103 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:15:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 14:15:09 +0000 Subject: Change in osmo-bts[master]: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9167 Change subject: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s ...................................................................... cosmetic: it's n_r in check_for_first_ciphrd(), not n_s When we introduced the n_s verification in 2cc37035d73191b71b9ba9c0d559a0da6a5f35e5, the variable name n_s was used for what is actually n_r N(R) read from the LAPDm frame Change-Id: Iaef1648f35ceae9d7f4cd1d9d5409e05115d199a --- M src/common/l1sap.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/9167/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e7cef4e..3a40949 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -956,7 +956,7 @@ static inline int check_for_first_ciphrd(struct gsm_lchan *lchan, uint8_t *data, int len) { - uint8_t n_s; + uint8_t n_r; /* if this is the first valid message after enabling Rx * decryption, we have to enable Tx encryption */ @@ -972,8 +972,8 @@ if ((data[1] & 0x01) != 0) return 0; - n_s = data[1] >> 5; - if (lchan->ciph_ns != n_s) + n_r = data[1] >> 5; + if (lchan->ciph_ns != n_r) return 0; return 1; -- To view, visit https://gerrit.osmocom.org/9167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaef1648f35ceae9d7f4cd1d9d5409e05115d199a Gerrit-Change-Number: 9167 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:20:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 14:20:21 +0000 Subject: Change in osmo-pcu[master]: Fix "left shift of 1 by 31 places cannot be represented in type 'int'... Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9168 Change subject: Fix "left shift of 1 by 31 places cannot be represented in type 'int'" errors ...................................................................... Fix "left shift of 1 by 31 places cannot be represented in type 'int'" errors Change-Id: I88e92be37caab399fc1d55f07699d601f6ea96c0 --- M src/mslot_class.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/9168/1 diff --git a/src/mslot_class.c b/src/mslot_class.c index 2a482f1..6b311ea 100644 --- a/src/mslot_class.c +++ b/src/mslot_class.c @@ -239,7 +239,7 @@ return -1; for (tfi = 0; tfi < 32; tfi++) { - if (!(tfi_map & (1 << tfi))) + if (!(tfi_map & (1u << tfi))) return tfi; } @@ -268,8 +268,8 @@ bool mslot_test_and_set_bit(uint32_t *bits, size_t elem) { - bool was_set = bits[elem/32] & (1 << (elem % 32)); - bits[elem/32] |= (1 << (elem % 32)); + bool was_set = bits[elem/32] & (1u << (elem % 32)); + bits[elem/32] |= (1u << (elem % 32)); return was_set; } -- To view, visit https://gerrit.osmocom.org/9168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I88e92be37caab399fc1d55f07699d601f6ea96c0 Gerrit-Change-Number: 9168 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:24:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 14:24:21 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9165 ) Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Tue, 15 May 2018 14:24:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:32:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 15 May 2018 14:32:54 +0000 Subject: Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9169 Change subject: vlr_access_req_fsm: use correct cause codes ...................................................................... vlr_access_req_fsm: use correct cause codes The FSM that controls the VLR ACCESS uses cause code 9 (GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the identity of the MS is currently not known in VLR (MSC-Reboot) However, this cause code is from the GMM domain and is interpreted as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST - use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of GSM48_REJECT_IMSI_UNKNOWN_IN_VLR Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Closes: OS#3266 --- M src/libvlr/vlr_access_req_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/9169/1 diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index dd95821..79eb75f 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -381,7 +381,7 @@ if (!par->by_tmsi) { /* We couldn't find a subscriber even by IMSI, * Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } else { /* TMSI was included, are we permitted to use it? */ @@ -392,7 +392,7 @@ return; } else { /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } } @@ -411,7 +411,7 @@ vsub = vlr_subscr_find_by_imsi(vlr, par->imsi); if (!vsub) { /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } assoc_par_with_subscr(fi, vsub); @@ -687,7 +687,7 @@ case GSM_MI_TYPE_IMEI: /* TODO: IMEI (emergency call) */ default: - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_INVALID_MANDANTORY_INF); return; } -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:51:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 14:51:44 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Set some functions as static Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9170 Change subject: tests: jibuf_test: Set some functions as static ...................................................................... tests: jibuf_test: Set some functions as static Change-Id: I3af6db3fd74d55c5e659132fc542f22478a55eb7 --- M tests/jibuf/jibuf_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/70/9170/1 diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index 6e8c805..c0c24fd 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -619,7 +619,7 @@ osmo_jibuf_delete(jb); } -void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) +static void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) { int min_delay = 60; struct msgb *msg; @@ -686,7 +686,7 @@ } -void test_skew(unsigned int skew_inc_us, bool skew_compensation) { +static void test_skew(unsigned int skew_inc_us, bool skew_compensation) { int min_delay = 40; unsigned int dropped = 0; struct msgb *msg; -- To view, visit https://gerrit.osmocom.org/9170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3af6db3fd74d55c5e659132fc542f22478a55eb7 Gerrit-Change-Number: 9170 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:51:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 14:51:44 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Add scenario to show out-of-order bug Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9171 Change subject: tests: jibuf_test: Add scenario to show out-of-order bug ...................................................................... tests: jibuf_test: Add scenario to show out-of-order bug Related: OS#3262 Change-Id: I1e78cc44f8a04dcb983352b513f8de2574b2394b --- M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_test.ok 2 files changed, 83 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/71/9171/1 diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index c0c24fd..7993a65 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -619,6 +619,66 @@ osmo_jibuf_delete(jb); } +/* This test aims at testing scenarios described in OS#3262, in which syncpoint + packets can provoke a situation in which packets are stored out-of-order in + the queue. */ +static void test_rtp_marker_queue_order() +{ + int min_delay = 60; + struct msgb *msg; + struct rtp_hdr *rtph; + + printf("===test_rtp_marker_queue_order===\n"); + + clock_override_enable(true); + clock_override_set(0, 0); + rtp_init(32, 400); + jb = osmo_jibuf_alloc(NULL); + osmo_jibuf_set_dequeue_cb(jb, dequeue_cb, NULL); + osmo_jibuf_set_min_delay(jb, min_delay); + osmo_jibuf_set_max_delay(jb, 200); + + /* First rtp at t=0, should be scheduled in min_delay time */ + clock_debug("enqueue 1st packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue 2nd packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue 3rd packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + + /* We then emulate an scenario in which an Osmux queue in front of us + receives a new frame before expected time, which means the packets in + the osmux genreated rtp queue will be flushed and sent to jibuf + directly. On top, the first packet of the new frame has the RTP + Marker bit set. */ + clock_debug("enqueue 3 packets instantly"); + ENQUEUE_NEXT(jb); /* scheduled min_delay+0 */ + ENQUEUE_NEXT(jb); /* a min_delay+TIME_RTP_PKT_MS */ + ENQUEUE_NEXT(jb); /* scheduled min_delay+TIME_RTP_PKT_MS*2 */ + clock_debug("enqueue pkt with marker=1 instantly"); + msg = rtp_next(); + rtph = osmo_rtp_get_hdr(msg); + rtph->marker = 1; + OSMO_ASSERT(osmo_jibuf_enqueue(jb, msg) == 0); /* syncpoint, scheduled in min_delay+0 */ + osmo_select_main(0); + + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue pkt after syncpoint"); + ENQUEUE_NEXT(jb); /* scheduled min_delay+0 */ + + clock_debug("all packets dequeued"); + clock_override_add(0, min_delay*1000); + osmo_select_main(0); + + /* This assert shows that packets are queued out of order in this case:*/ + OSMO_ASSERT(!osmo_jibuf_empty(jb)); + + osmo_jibuf_delete(jb); +} + static void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) { int min_delay = 60; @@ -754,6 +814,7 @@ test_seq_wraparound(); test_timestamp_wraparound(); test_rtp_marker(); + test_rtp_marker_queue_order(); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 5, 5*SAMPLES_PER_PKT, true); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 6, 5*SAMPLES_PER_PKT, false); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 5, 5*SAMPLES_PER_PKT + 3, false); diff --git a/tests/jibuf/jibuf_test.ok b/tests/jibuf/jibuf_test.ok index e495435..6bf52fb 100644 --- a/tests/jibuf/jibuf_test.ok +++ b/tests/jibuf/jibuf_test.ok @@ -365,6 +365,28 @@ sys={0.200000}, mono={0.200000}: clock_override_add sys={0.200000}, mono={0.200000}: dequeue: seq=35 ts=880 INTERMEDIATE sys={0.200000}, mono={0.200000}: dequeue: seq=36 ts=1040 LATEST +===test_rtp_marker_queue_order=== +sys={0.000000}, mono={0.000000}: clock_override_set +sys={0.000000}, mono={0.000000}: enqueue 1st packet +sys={0.020000}, mono={0.020000}: clock_override_add +sys={0.020000}, mono={0.020000}: enqueue 2nd packet +sys={0.040000}, mono={0.040000}: clock_override_add +sys={0.040000}, mono={0.040000}: enqueue 3rd packet +sys={0.060000}, mono={0.060000}: clock_override_add +sys={0.060000}, mono={0.060000}: enqueue 3 packets instantly +sys={0.060000}, mono={0.060000}: enqueue pkt with marker=1 instantly +sys={0.060000}, mono={0.060000}: dequeue: seq=33 ts=560 INTERMEDIATE +sys={0.080000}, mono={0.080000}: clock_override_add +sys={0.080000}, mono={0.080000}: enqueue pkt after syncpoint +sys={0.080000}, mono={0.080000}: all packets dequeued +sys={0.140000}, mono={0.140000}: clock_override_add +sys={0.140000}, mono={0.140000}: dequeue: seq=34 ts=720 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=35 ts=880 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=36 ts=1040 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=37 ts=1200 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST +sys={0.140000}, mono={0.140000}: dequeue: seq=38 ts=1360 INTERMEDIATE ===test_rtp_out_of_sync(1600, 5, 800, 1)=== sys={0.000000}, mono={0.000000}: clock_override_set sys={0.000000}, mono={0.000000}: enqueue 1st packet (seq=33, ts=560) -- To view, visit https://gerrit.osmocom.org/9171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1e78cc44f8a04dcb983352b513f8de2574b2394b Gerrit-Change-Number: 9171 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:51:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 14:51:44 +0000 Subject: Change in libosmo-netif[master]: jibuf: Fix out-of-order seq queue around syncpoints Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9172 Change subject: jibuf: Fix out-of-order seq queue around syncpoints ...................................................................... jibuf: Fix out-of-order seq queue around syncpoints Fixes: OS#3262 Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 --- M src/jibuf.c M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_test.ok 3 files changed, 36 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/72/9172/1 diff --git a/src/jibuf.c b/src/jibuf.c index 45019ae..2632a57 100644 --- a/src/jibuf.c +++ b/src/jibuf.c @@ -119,6 +119,35 @@ } +static void enqueue_pkt(struct osmo_jibuf *jb, struct msgb *msg, bool is_syncpoint) +{ + struct msgb *cur; + struct timeval *msg_ts; + + if (!is_syncpoint) { + llist_add_sorted(msg, &jb->msg_list); + return; + } + + /* syncpoints change the reference timings, and as such they can provoke + out of order enqueuing of this packet and its followups with regards + to the already stored packets which may be scheduled for later times. + We thus need to adapt dequeue time for the already stored pkts to be + dequeued before the syncpoint pkt. See OS#3262 for related scenarios. + */ + + msg_ts = msgb_scheduled_ts(msg); + + llist_for_each_entry(cur, &jb->msg_list, list) { + struct timeval *cur_ts = msgb_scheduled_ts(cur); + if (timercmp(msg_ts, cur_ts, <)) + *cur_ts = *msg_ts; + } + /* syncpoint goes always to the end since we moved all older packets + before it */ + llist_add_tail(&msg->list, &jb->msg_list); +} + static bool msg_get_marker(struct msgb *msg) { /* TODO: make it more generic as a callback so that different types of @@ -314,11 +343,13 @@ { int rel_delay, delay; struct timeval delay_ts, sched_ts; + bool is_syncpoint; clock_gettime_timeval(CLOCK_MONOTONIC, &jb->last_enqueue_time); /* Check if it's time to sync, ie. start of talkspurt */ - if (!jb->started || msg_is_syncpoint(jb, msg)) { + is_syncpoint = !jb->started || msg_is_syncpoint(jb, msg); + if (is_syncpoint) { jb->started = true; msg_set_as_reference(jb, msg); rel_delay = 0; @@ -365,8 +396,7 @@ jbcb->ts = sched_ts; jbcb->old_cb = old_cb; - llist_add_sorted(msg, &jb->msg_list); - + enqueue_pkt(jb, msg, is_syncpoint); /* See if updating the timer is needed: */ if (!osmo_timer_pending(&jb->timer) || diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index 7993a65..ba1bb01 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -673,8 +673,7 @@ clock_override_add(0, min_delay*1000); osmo_select_main(0); - /* This assert shows that packets are queued out of order in this case:*/ - OSMO_ASSERT(!osmo_jibuf_empty(jb)); + OSMO_ASSERT(osmo_jibuf_empty(jb)); osmo_jibuf_delete(jb); } diff --git a/tests/jibuf/jibuf_test.ok b/tests/jibuf/jibuf_test.ok index 6bf52fb..b92f73c 100644 --- a/tests/jibuf/jibuf_test.ok +++ b/tests/jibuf/jibuf_test.ok @@ -383,10 +383,10 @@ sys={0.140000}, mono={0.140000}: dequeue: seq=34 ts=720 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=35 ts=880 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=36 ts=1040 INTERMEDIATE -sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=37 ts=1200 INTERMEDIATE -sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST sys={0.140000}, mono={0.140000}: dequeue: seq=38 ts=1360 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST ===test_rtp_out_of_sync(1600, 5, 800, 1)=== sys={0.000000}, mono={0.000000}: clock_override_set sys={0.000000}, mono={0.000000}: enqueue 1st packet (seq=33, ts=560) -- To view, visit https://gerrit.osmocom.org/9172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 Gerrit-Change-Number: 9172 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:55:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 14:55:39 +0000 Subject: Change in osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9161 ) Change subject: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 Gerrit-Change-Number: 9161 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 15 May 2018 14:55:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 14:55:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 14:55:41 +0000 Subject: Change in osmo-gsm-tester[master]: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9161 ) Change subject: tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled ...................................................................... tests: dyn_ts_*: Add tests to verify dyn ts with gprs disabled Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 --- M suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py A suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py M suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py A suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py 4 files changed, 42 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py index 82e357c..4fe4e46 100755 --- a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa.py @@ -16,8 +16,4 @@ bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py new file mode 100755 index 0000000..c1349ae --- /dev/null +++ b/suites/dyn_ts_ipa/mo_mt_call_dyn_ipa_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py index 1424da8..b9b7935 100755 --- a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo.py @@ -16,8 +16,4 @@ bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') bts.set_trx_phy_channel(0, 7, 'PDCH') -#FIXME: if we don't enable gprs (gprs none in BSC vty) then dyn chans are broken, see OS#3244 -# Once Fixed, add a new test with following test: -#call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) - call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=True) diff --git a/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py new file mode 100755 index 0000000..d80d27a --- /dev/null +++ b/suites/dyn_ts_osmo/mo_mt_call_dyn_osmo_no_gprs.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python3 +from osmo_gsm_tester.testenv import * + +import testlib +suite.test_import_modules_register_for_cleanup(testlib) +from testlib import call_test_setup_run + +def my_bts_setup(bts): + bts.set_num_trx(1) + bts.set_trx_phy_channel(0, 0, 'CCCH+SDCCH4') + bts.set_trx_phy_channel(0, 1, 'SDCCH8') + bts.set_trx_phy_channel(0, 2, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 3, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 4, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 5, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 6, 'TCH/F_TCH/H_PDCH') + bts.set_trx_phy_channel(0, 7, 'TCH/F_TCH/H_PDCH') + +# Check that dynamic timeslots work fine with gprs disabled. + +call_test_setup_run(bts_setup_cb=my_bts_setup, gprs_enable=False) -- To view, visit https://gerrit.osmocom.org/9161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If943ae0fb4e56787df02b09dea7387cb13eb9db3 Gerrit-Change-Number: 9161 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 15:09:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 15 May 2018 15:09:55 +0000 Subject: Change in libosmo-netif[master]: osmux: change log lvl of batch full to debug Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9173 Change subject: osmux: change log lvl of batch full to debug ...................................................................... osmux: change log lvl of batch full to debug This message is expected as all code filling batches call osmux_batch_enqueue() and checks for error to know if it must tell the user of the lib to call osmux_xfrm_input_deliver. Change-Id: I3d8227f2281f6ca92fd2502d3e328765dc7ecfe9 --- M src/osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/73/9173/1 diff --git a/src/osmux.c b/src/osmux.c index 46170ba..7a6ce60 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -356,7 +356,7 @@ static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit, uint8_t batch_factor) { - /* Too many messages per batch, discard it. The counter field of the + /* Validate amount of messages per batch. The counter field of the * osmux header is just 3 bits long, so make sure it doesn't overflow. */ if (circuit->nmsgs >= batch_factor || circuit->nmsgs >= 8) { @@ -366,7 +366,7 @@ if (rtph == NULL) return -1; - LOGP(DLMUX, LOGL_ERROR, "too many messages for this RTP " + LOGP(DLMUX, LOGL_DEBUG, "Batch is full for RTP " "ssrc=%u\n", rtph->ssrc); return -1; } -- To view, visit https://gerrit.osmocom.org/9173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3d8227f2281f6ca92fd2502d3e328765dc7ecfe9 Gerrit-Change-Number: 9173 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 15:30:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 15:30:56 +0000 Subject: Change in osmo-pcu[master]: Don't register SIGHUP handler without actually handling SIGHUP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9165 ) Change subject: Don't register SIGHUP handler without actually handling SIGHUP ...................................................................... Don't register SIGHUP handler without actually handling SIGHUP In libosmocore, we normally register a SIGHUP handler for log file rotation. However, the osmo-pcu code so far installed its own signal handler, which did exactly nothing in the SIGHUP case. Let's fix this by removing SIGHUP handling here, letting libosmocore take care about this. Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Closes: OS#3265 --- M src/pcu_main.cpp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 5b1b1be..7480842 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -143,7 +143,7 @@ void sighandler(int sigset) { - if (sigset == SIGHUP || sigset == SIGPIPE) + if (sigset == SIGPIPE) return; fprintf(stderr, "Signal %d received.\n", sigset); @@ -155,7 +155,6 @@ * is terminated without finishing shutdown process. */ signal(SIGINT, SIG_DFL); - signal(SIGHUP, SIG_DFL); signal(SIGTERM, SIG_DFL); signal(SIGPIPE, SIG_DFL); signal(SIGABRT, SIG_DFL); @@ -311,12 +310,12 @@ return rc; signal(SIGINT, sighandler); - signal(SIGHUP, sighandler); signal(SIGTERM, sighandler); signal(SIGPIPE, sighandler); signal(SIGABRT, sighandler); signal(SIGUSR1, sighandler); signal(SIGUSR2, sighandler); + osmo_init_ignore_signals(); /* enable realtime priority for us */ if (rt_prio != -1) { -- To view, visit https://gerrit.osmocom.org/9165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifa20d79770bc4d88d40601b008a3a2a79d083c04 Gerrit-Change-Number: 9165 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 15:32:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 15:32:52 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Set some functions as static In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9170 ) Change subject: tests: jibuf_test: Set some functions as static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3af6db3fd74d55c5e659132fc542f22478a55eb7 Gerrit-Change-Number: 9170 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 15:32:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 15:33:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 15:33:11 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Add scenario to show out-of-order bug In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9171 ) Change subject: tests: jibuf_test: Add scenario to show out-of-order bug ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1e78cc44f8a04dcb983352b513f8de2574b2394b Gerrit-Change-Number: 9171 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 15:33:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 16:59:19 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 15 May 2018 16:59:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix RAU_ATTACH not to interact with following testes Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9174 Change subject: sgsn: fix RAU_ATTACH not to interact with following testes ...................................................................... sgsn: fix RAU_ATTACH not to interact with following testes TC_attach_rau will interact with the following tests, because the sgsn is continuing sending RAU_ACCEPTs until it timed out or received a RAU COMPLETE Change-Id: Idac92bd61ee7145b7542e60c24e0a66b4ff7ddd4 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/9174/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index adf87f2..0b439ec 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -753,6 +753,7 @@ alt { [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); + BSSGP.send(ts_GMM_RAU_COMPL); setverdict(pass); } [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { -- To view, visit https://gerrit.osmocom.org/9174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idac92bd61ee7145b7542e60c24e0a66b4ff7ddd4 Gerrit-Change-Number: 9174 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 16:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 15 May 2018 16:59:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix a typo in comment Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9175 Change subject: sgsn: fix a typo in comment ...................................................................... sgsn: fix a typo in comment Change-Id: I061aba5af1e466b33472c9f829b982823bcff71e --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/9175/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index adf87f2..1434a67 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -460,7 +460,7 @@ BSSGP.send(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); - /* Expect MSC to perform LU with HLR */ + /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { -- To view, visit https://gerrit.osmocom.org/9175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I061aba5af1e466b33472c9f829b982823bcff71e Gerrit-Change-Number: 9175 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 17:00:28 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 15 May 2018 17:00:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9176 Change subject: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump ...................................................................... ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump Improve speed of tcpdump startup. -s 0 sets the snaplen is 256k. tcpdump will request the snaplen multiplied by the buffer as a contigous buffer in the kernel. This could lead to higher start time. Change-Id: I8a372e71798b366faa3b723573c60de6e8fd128f --- M ttcn3-tcpdump-start.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/9176/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 7321b52..395941d 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -20,7 +20,7 @@ else CMD="sudo $TCPDUMP" fi -$CMD -U -s 0 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & +$CMD -U -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & PID=$! echo $PID > $PIDFILE @@ -31,7 +31,7 @@ PID=$! i=0 while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" ] || - [ "$($TCPDUMP -r "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 2>/dev/null | wc -l)" -eq 0 ] + [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcap")" -eq 32 ] do echo "Waiting for tcpdump to start... $i" sleep 1 -- To view, visit https://gerrit.osmocom.org/9176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8a372e71798b366faa3b723573c60de6e8fd128f Gerrit-Change-Number: 9176 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:38:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:38:12 +0000 Subject: Change in docker-playground[master]: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9177 Change subject: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" ...................................................................... redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" Change-Id: Ib357ed1c847c7c3d9395b1b45a7f9b4a88dd09f8 --- A redmine/redmine-issue-2047-svg-image-support.diff 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/77/9177/1 diff --git a/redmine/redmine-issue-2047-svg-image-support.diff b/redmine/redmine-issue-2047-svg-image-support.diff new file mode 100644 index 0000000..23fc1e2 --- /dev/null +++ b/redmine/redmine-issue-2047-svg-image-support.diff @@ -0,0 +1,24 @@ +diff -ru app.orig/helpers/application_helper.rb app/helpers/application_helper.rb +--- app.orig/helpers/application_helper.rb 2018-01-08 19:37:37.000000000 +0000 ++++ app/helpers/application_helper.rb 2018-05-14 08:15:11.558390732 +0000 +@@ -637,7 +637,7 @@ + attachments = options[:attachments] || [] + attachments += obj.attachments if obj.respond_to?(:attachments) + if attachments.present? +- text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m| ++ text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png|svg))"(\s+alt="([^"]*)")?/i) do |m| + filename, ext, alt, alttext = $1.downcase, $2, $3, $4 + # search for the picture in attachments + if found = Attachment.latest_attach(attachments, CGI.unescape(filename)) +diff -ru app.orig/models/attachment.rb app/models/attachment.rb +--- app.orig/models/attachment.rb 2018-01-08 19:37:37.000000000 +0000 ++++ app/models/attachment.rb 2018-05-14 08:14:49.542526978 +0000 +@@ -193,7 +193,7 @@ + end + + def image? +- !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i) ++ !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png|svg)$/i) + end + + def thumbnailable? -- To view, visit https://gerrit.osmocom.org/9177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib357ed1c847c7c3d9395b1b45a7f9b4a88dd09f8 Gerrit-Change-Number: 9177 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:45:49 +0000 Subject: Change in docker-playground[master]: redmine: Change content-disposition of image attachments to 'inline' Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9178 Change subject: redmine: Change content-disposition of image attachments to 'inline' ...................................................................... redmine: Change content-disposition of image attachments to 'inline' Closes: OS#3264 Change-Id: Ib60a12fc4adc0ceebfed70ff14d5ae256868bb2b --- M redmine/Dockerfile A redmine/redmine-image-content-disposition.diff 2 files changed, 67 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/78/9178/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 81976c6..1d8362d 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -12,3 +12,6 @@ COPY redmine-openid-hmac-digest.diff /tmp/ RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff + +COPY redmine-image-content-disposition.diff /tmp/ +RUN patch -p1 < /tmp/redmine-image-content-disposition.diff diff --git a/redmine/redmine-image-content-disposition.diff b/redmine/redmine-image-content-disposition.diff new file mode 100644 index 0000000..50d83db --- /dev/null +++ b/redmine/redmine-image-content-disposition.diff @@ -0,0 +1,64 @@ +From 6c94d485cb3e23559da8f0356a1052a620d7a2c2 Mon Sep 17 00:00:00 2001 +From: Harald Welte +Date: Mon, 14 May 2018 23:16:51 +0200 +Subject: [PATCH] chagnge content-disposition of pdf/image/text/patch to + 'inline' + +Related: https://osmocom.org/issues/3264 +--- + app/controllers/attachments_controller.rb | 9 ++++++++- + app/models/attachment.rb | 8 ++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb +index c2b5fa9c8..f2a57c31d 100644 +--- a/app/controllers/attachments_controller.rb ++++ b/app/controllers/attachments_controller.rb +@@ -57,7 +57,7 @@ class AttachmentsController < ApplicationController + # images are sent inline + send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), + :type => detect_content_type(@attachment), +- :disposition => 'attachment' ++ :disposition => disposition(@attachment) + end + end + +@@ -188,4 +188,12 @@ class AttachmentsController < ApplicationController + end + content_type.to_s + end ++ ++ def disposition(attachment) ++ if attachment.is_pdf? || attachment.is_image? || attachment.is_diff? || attachment.is_text? ++ 'inline' ++ else ++ 'attachment' ++ end ++ end + end +diff --git a/app/models/attachment.rb b/app/models/attachment.rb +index 3d16f57cc..a2520b0d5 100644 +--- a/app/models/attachment.rb ++++ b/app/models/attachment.rb +@@ -236,10 +236,18 @@ class Attachment < ActiveRecord::Base + Redmine::MimeType.is_type?('text', filename) + end + ++ def is_image? ++ Redmine::MimeType.is_type?('image', filename) ++ end ++ + def is_diff? + self.filename =~ /\.(patch|diff)$/i + end + ++ def is_pdf? ++ Redmine::MimeType.of(filename) == "application/pdf" ++ end ++ + # Returns true if the file is readable + def readable? + File.readable?(diskfile) +-- +2.17.0 + -- To view, visit https://gerrit.osmocom.org/9178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib60a12fc4adc0ceebfed70ff14d5ae256868bb2b Gerrit-Change-Number: 9178 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:47:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:47:13 +0000 Subject: Change in docker-playground[master]: redmine: Change content-disposition of image attachments to 'inline' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9178 ) Change subject: redmine: Change content-disposition of image attachments to 'inline' ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib60a12fc4adc0ceebfed70ff14d5ae256868bb2b Gerrit-Change-Number: 9178 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 15 May 2018 18:47:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:47:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:47:18 +0000 Subject: Change in docker-playground[master]: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9177 ) Change subject: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib357ed1c847c7c3d9395b1b45a7f9b4a88dd09f8 Gerrit-Change-Number: 9177 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 15 May 2018 18:47:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:47:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:47:20 +0000 Subject: Change in docker-playground[master]: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9177 ) Change subject: redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" ...................................................................... redmine: add missing patch "redmine-issue-2047-svg-image-support.diff" Change-Id: Ib357ed1c847c7c3d9395b1b45a7f9b4a88dd09f8 --- A redmine/redmine-issue-2047-svg-image-support.diff 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/redmine-issue-2047-svg-image-support.diff b/redmine/redmine-issue-2047-svg-image-support.diff new file mode 100644 index 0000000..23fc1e2 --- /dev/null +++ b/redmine/redmine-issue-2047-svg-image-support.diff @@ -0,0 +1,24 @@ +diff -ru app.orig/helpers/application_helper.rb app/helpers/application_helper.rb +--- app.orig/helpers/application_helper.rb 2018-01-08 19:37:37.000000000 +0000 ++++ app/helpers/application_helper.rb 2018-05-14 08:15:11.558390732 +0000 +@@ -637,7 +637,7 @@ + attachments = options[:attachments] || [] + attachments += obj.attachments if obj.respond_to?(:attachments) + if attachments.present? +- text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m| ++ text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png|svg))"(\s+alt="([^"]*)")?/i) do |m| + filename, ext, alt, alttext = $1.downcase, $2, $3, $4 + # search for the picture in attachments + if found = Attachment.latest_attach(attachments, CGI.unescape(filename)) +diff -ru app.orig/models/attachment.rb app/models/attachment.rb +--- app.orig/models/attachment.rb 2018-01-08 19:37:37.000000000 +0000 ++++ app/models/attachment.rb 2018-05-14 08:14:49.542526978 +0000 +@@ -193,7 +193,7 @@ + end + + def image? +- !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i) ++ !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png|svg)$/i) + end + + def thumbnailable? -- To view, visit https://gerrit.osmocom.org/9177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib357ed1c847c7c3d9395b1b45a7f9b4a88dd09f8 Gerrit-Change-Number: 9177 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 18:47:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 18:47:20 +0000 Subject: Change in docker-playground[master]: redmine: Change content-disposition of image attachments to 'inline' In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9178 ) Change subject: redmine: Change content-disposition of image attachments to 'inline' ...................................................................... redmine: Change content-disposition of image attachments to 'inline' Closes: OS#3264 Change-Id: Ib60a12fc4adc0ceebfed70ff14d5ae256868bb2b --- M redmine/Dockerfile A redmine/redmine-image-content-disposition.diff 2 files changed, 67 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 81976c6..1d8362d 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -12,3 +12,6 @@ COPY redmine-openid-hmac-digest.diff /tmp/ RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff + +COPY redmine-image-content-disposition.diff /tmp/ +RUN patch -p1 < /tmp/redmine-image-content-disposition.diff diff --git a/redmine/redmine-image-content-disposition.diff b/redmine/redmine-image-content-disposition.diff new file mode 100644 index 0000000..50d83db --- /dev/null +++ b/redmine/redmine-image-content-disposition.diff @@ -0,0 +1,64 @@ +From 6c94d485cb3e23559da8f0356a1052a620d7a2c2 Mon Sep 17 00:00:00 2001 +From: Harald Welte +Date: Mon, 14 May 2018 23:16:51 +0200 +Subject: [PATCH] chagnge content-disposition of pdf/image/text/patch to + 'inline' + +Related: https://osmocom.org/issues/3264 +--- + app/controllers/attachments_controller.rb | 9 ++++++++- + app/models/attachment.rb | 8 ++++++++ + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb +index c2b5fa9c8..f2a57c31d 100644 +--- a/app/controllers/attachments_controller.rb ++++ b/app/controllers/attachments_controller.rb +@@ -57,7 +57,7 @@ class AttachmentsController < ApplicationController + # images are sent inline + send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), + :type => detect_content_type(@attachment), +- :disposition => 'attachment' ++ :disposition => disposition(@attachment) + end + end + +@@ -188,4 +188,12 @@ class AttachmentsController < ApplicationController + end + content_type.to_s + end ++ ++ def disposition(attachment) ++ if attachment.is_pdf? || attachment.is_image? || attachment.is_diff? || attachment.is_text? ++ 'inline' ++ else ++ 'attachment' ++ end ++ end + end +diff --git a/app/models/attachment.rb b/app/models/attachment.rb +index 3d16f57cc..a2520b0d5 100644 +--- a/app/models/attachment.rb ++++ b/app/models/attachment.rb +@@ -236,10 +236,18 @@ class Attachment < ActiveRecord::Base + Redmine::MimeType.is_type?('text', filename) + end + ++ def is_image? ++ Redmine::MimeType.is_type?('image', filename) ++ end ++ + def is_diff? + self.filename =~ /\.(patch|diff)$/i + end + ++ def is_pdf? ++ Redmine::MimeType.of(filename) == "application/pdf" ++ end ++ + # Returns true if the file is readable + def readable? + File.readable?(diskfile) +-- +2.17.0 + -- To view, visit https://gerrit.osmocom.org/9178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib60a12fc4adc0ceebfed70ff14d5ae256868bb2b Gerrit-Change-Number: 9178 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 20:45:16 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 20:45:16 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb46f3642de_1fe3bb66882293bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ *] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [*** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 336s] /var/cache/obs/worker/root_2/root: 24149 [ 336s] qemu-system-aarch64: terminating on signal 15 from pid 25622 [ 336s] ### VM INTERACTION END ### [ 336s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (24142) - No such process [ 336s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 336s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 20:50:59 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 20:50:59 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb483db53f1_1fe3bb66882309d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 275s] [ 244.955192] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 275s] [ 245.625950] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 276s] [ 246.308013] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 246.964347] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 247.585369] dracut-initqueue[458]: Warning: dracut-initqueue timeout - starting timeout scripts [ 277s] [ 247.592522] dracut-initqueue[458]: Warning: Could not boot. [ 277s] Starting Setup Virtual Console... [ 277s] [ OK ] Started Setup Virtual Console. [ 277s] Starting Dracut Emergency Shell... [ 277s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 277s] [ 277s] Generating "/run/initramfs/rdsosreport.txt" [ 277s] [ 277s] [ 277s] Entering emergency mode. Exit the shell to continue. [ 277s] Type "journalctl" to view system logs. [ 277s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 277s] after mounting them and attach it to a bug report. [ 277s] [ 277s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_3/root: 23394 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 1700 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (23387) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue May 15 20:52:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:52:49 +0000 Subject: Change in osmo-pcu[master]: Fix "left shift of 1 by 31 places cannot be represented in type 'int'... In-Reply-To: References: Message-ID: Harald Welte has abandoned this change. ( https://gerrit.osmocom.org/9168 ) Change subject: Fix "left shift of 1 by 31 places cannot be represented in type 'int'" errors ...................................................................... Abandoned fixed long ago in master -- To view, visit https://gerrit.osmocom.org/9168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I88e92be37caab399fc1d55f07699d601f6ea96c0 Gerrit-Change-Number: 9168 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9176 ) Change subject: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8a372e71798b366faa3b723573c60de6e8fd128f Gerrit-Change-Number: 9176 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:54:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix RAU_ATTACH not to interact with following testes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9174 ) Change subject: sgsn: fix RAU_ATTACH not to interact with following testes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idac92bd61ee7145b7542e60c24e0a66b4ff7ddd4 Gerrit-Change-Number: 9174 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:54:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix RAU_ATTACH not to interact with following testes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9174 ) Change subject: sgsn: fix RAU_ATTACH not to interact with following testes ...................................................................... sgsn: fix RAU_ATTACH not to interact with following testes TC_attach_rau will interact with the following tests, because the sgsn is continuing sending RAU_ACCEPTs until it timed out or received a RAU COMPLETE Change-Id: Idac92bd61ee7145b7542e60c24e0a66b4ff7ddd4 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index adf87f2..0b439ec 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -753,6 +753,7 @@ alt { [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_ACCEPT)) -> value bd { f_process_rau_accept(bd.l3_mt.msgs.gprs_mm.routingAreaUpdateAccept); + BSSGP.send(ts_GMM_RAU_COMPL); setverdict(pass); } [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_RAU_REJECT)) { -- To view, visit https://gerrit.osmocom.org/9174 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idac92bd61ee7145b7542e60c24e0a66b4ff7ddd4 Gerrit-Change-Number: 9174 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix a typo in comment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9175 ) Change subject: sgsn: fix a typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I061aba5af1e466b33472c9f829b982823bcff71e Gerrit-Change-Number: 9175 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:54:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sgsn: fix a typo in comment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9175 ) Change subject: sgsn: fix a typo in comment ...................................................................... sgsn: fix a typo in comment Change-Id: I061aba5af1e466b33472c9f829b982823bcff71e --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0b439ec..e1d35c5 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -460,7 +460,7 @@ BSSGP.send(attach_req); f_gmm_auth(umts_aka_challenge, force_gsm_sres); - /* Expect MSC to perform LU with HLR */ + /* Expect SGSN to perform LU with HLR */ f_gmm_gsup_lu_isd(); BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd { -- To view, visit https://gerrit.osmocom.org/9175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I061aba5af1e466b33472c9f829b982823bcff71e Gerrit-Change-Number: 9175 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:54:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:54:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9176 ) Change subject: ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump ...................................................................... ttcn3-tcpdump-start.sh: reduce snaplen of tcpdump Improve speed of tcpdump startup. -s 0 sets the snaplen is 256k. tcpdump will request the snaplen multiplied by the buffer as a contigous buffer in the kernel. This could lead to higher start time. Change-Id: I8a372e71798b366faa3b723573c60de6e8fd128f --- M ttcn3-tcpdump-start.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 7321b52..395941d 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -20,7 +20,7 @@ else CMD="sudo $TCPDUMP" fi -$CMD -U -s 0 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & +$CMD -U -s 1500 -n -i any -w "$TTCN3_PCAP_PATH/$TESTCASE.pcap" >$TTCN3_PCAP_PATH/$TESTCASE.pcap.stdout 2>&1 & PID=$! echo $PID > $PIDFILE @@ -31,7 +31,7 @@ PID=$! i=0 while [ ! -f "$TTCN3_PCAP_PATH/$TESTCASE.pcap" ] || - [ "$($TCPDUMP -r "$TTCN3_PCAP_PATH/$TESTCASE.pcap" 2>/dev/null | wc -l)" -eq 0 ] + [ "$(stat -c '%s' "$TTCN3_PCAP_PATH/$TESTCASE.pcap")" -eq 32 ] do echo "Waiting for tcpdump to start... $i" sleep 1 -- To view, visit https://gerrit.osmocom.org/9176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8a372e71798b366faa3b723573c60de6e8fd128f Gerrit-Change-Number: 9176 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:55:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:55:27 +0000 Subject: Change in libosmo-netif[master]: osmux: change log lvl of batch full to debug In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9173 ) Change subject: osmux: change log lvl of batch full to debug ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d8227f2281f6ca92fd2502d3e328765dc7ecfe9 Gerrit-Change-Number: 9173 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:55:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:57:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:57:24 +0000 Subject: Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9169 ) Change subject: vlr_access_req_fsm: use correct cause codes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:57:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:57:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:57:56 +0000 Subject: Change in libosmocore[master]: fix spelling In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9166 ) Change subject: fix spelling ...................................................................... fix spelling Change-Id: I3ac92217f83279d5f987ab34eb18b2e6cb1c7812 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 5d2864f..b699080 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -316,7 +316,7 @@ GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL = 0x10, GSM0808_CAUSE_TRAFFIC_LOAD_IN_TGT_HIGHER_THAN_IN_SRC_CELL = 0x11, GSM0808_CAUSE_RELOCATION_TRIGGERED = 0x12, - GSM0808_CAUSE_REQUSTED_OPT_NOT_AUTHORISED = 0x14, + GSM0808_CAUSE_REQUESTED_OPT_NOT_AUTHORISED = 0x14, GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED = 0x15, GSM0808_CAUSE_RESP_TO_INT_HO_ENQ_MSG = 0x16, GSM0808_CAUSE_INT_HO_ENQUIRY_REJECT = 0x17, @@ -358,7 +358,7 @@ GSM0808_CAUSE_DTM_HO_INVALID_PS_IND = 0x56, GSM0808_CAUSE_CALL_ID_ALREADY_ALLOC = 0x57, GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC = 96, - GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTANT = 0x61, + GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTENT = 0x61, GSM0808_CAUSE_DTM_HO_TIMER_EXPIRY = 0x62, }; diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index e6a581c..4743175 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -936,7 +936,7 @@ { GSM0808_CAUSE_REDUCE_LOAD_IN_SERVING_CELL, "REDUCE LOAD IN SERVING CELL" }, { GSM0808_CAUSE_TRAFFIC_LOAD_IN_TGT_HIGHER_THAN_IN_SRC_CELL, "TRAFFIC LOAD IN TGT HIGHER THAN IN SRC CELL" }, { GSM0808_CAUSE_RELOCATION_TRIGGERED, "RELOCATION TRIGGERED" }, - { GSM0808_CAUSE_REQUSTED_OPT_NOT_AUTHORISED, "REQUSTED OPT NOT AUTHORISED" }, + { GSM0808_CAUSE_REQUESTED_OPT_NOT_AUTHORISED, "REQUESTED OPT NOT AUTHORISED" }, { GSM0808_CAUSE_ALT_CHAN_CONFIG_REQUESTED, "ALT CHAN CONFIG REQUESTED" }, { GSM0808_CAUSE_RESP_TO_INT_HO_ENQ_MSG, "RESP TO INT HO ENQ MSG" }, { GSM0808_CAUSE_INT_HO_ENQUIRY_REJECT, "INT HO ENQUIRY REJECT" }, @@ -978,7 +978,7 @@ { GSM0808_CAUSE_DTM_HO_INVALID_PS_IND, "DTM HO INVALID PS IND" }, { GSM0808_CAUSE_CALL_ID_ALREADY_ALLOC, "CALL ID ALREADY ALLOC" }, { GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC, "PROTOCOL ERROR BETWEEN BSS AND MSC" }, - { GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTANT, "VGCS VBS CALL NON EXISTANT" }, + { GSM0808_CAUSE_VGCS_VBS_CALL_NON_EXISTENT, "VGCS VBS CALL NON EXISTENT" }, { GSM0808_CAUSE_DTM_HO_TIMER_EXPIRY, "DTM HO TIMER EXPIRY" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/9166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3ac92217f83279d5f987ab34eb18b2e6cb1c7812 Gerrit-Change-Number: 9166 Gerrit-PatchSet: 2 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:58:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:58:07 +0000 Subject: Change in osmo-bts[master]: let osmo-bts log a special notice if OML connection is closed early In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8056 ) Change subject: let osmo-bts log a special notice if OML connection is closed early ...................................................................... let osmo-bts log a special notice if OML connection is closed early A frequent configuration file error is that the unit_id settings of osmo-bts and osmo-bsc don't match. The BSC already prints an error in this case. Let the BTS print an error as well. We use a heuristic for this purpose: If the OML link is dropped within 10 seconds after being established, log a special warning which alerts the user and recommend a manual configuration file check. Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Related: OS#3143 --- M include/osmo-bts/gsm_data_shared.h M src/common/abis.c 2 files changed, 23 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 812d086..81cac3e 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -514,6 +514,10 @@ uint8_t initial_mcs; }; +/* The amount of time within which a sudden disconnect of a newly established + * OML connection will cause a special warning to be logged. */ +#define OSMO_BTS_OML_CONN_EARLY_DISCONNECT 10 /* in seconds */ + /* One BTS */ struct gsm_bts { /* list header in net->bts_list */ @@ -552,6 +556,7 @@ /* how do we talk OML with this TRX? */ uint8_t oml_tei; struct e1inp_sign_link *oml_link; + struct timespec oml_conn_established_timestamp; /* Abis network management O&M handle */ struct abis_nm_h *nmh; diff --git a/src/common/abis.c b/src/common/abis.c index 6aa2f1d..21240b8 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -108,6 +109,9 @@ sign_link = g_bts->oml_link = e1inp_sign_link_create(&line->ts[E1INP_SIGN_OML-1], E1INP_SIGN_OML, NULL, 255, 0); + if (clock_gettime(CLOCK_MONOTONIC, &g_bts->oml_conn_established_timestamp) != 0) + memset(&g_bts->oml_conn_established_timestamp, 0, + sizeof(g_bts->oml_conn_established_timestamp)); drain_oml_queue(g_bts); sign_link->trx = g_bts->c0; bts_link_estab(g_bts); @@ -140,9 +144,22 @@ LOGP(DABIS, LOGL_ERROR, "Signalling link down\n"); /* First remove the OML signalling link */ - if (g_bts->oml_link) + if (g_bts->oml_link) { + struct timespec now; + e1inp_sign_link_destroy(g_bts->oml_link); + + /* Log a special notice if the OML connection was dropped relatively quickly. */ + if (g_bts->oml_conn_established_timestamp.tv_sec != 0 && clock_gettime(CLOCK_MONOTONIC, &now) == 0 && + g_bts->oml_conn_established_timestamp.tv_sec + OSMO_BTS_OML_CONN_EARLY_DISCONNECT >= now.tv_sec) { + LOGP(DABIS, LOGL_FATAL, "OML link was closed early within %" PRIu64 " seconds. " + "If this situation persists, please check your BTS and BSC configuration files for errors. " + "A common error is a mismatch between unit_id configuration parameters of BTS and BSC.\n", + (uint64_t)(now.tv_sec - g_bts->oml_conn_established_timestamp.tv_sec)); + } + } g_bts->oml_link = NULL; + memset(&g_bts->oml_conn_established_timestamp, 0, sizeof(g_bts->oml_conn_established_timestamp)); /* Then iterate over the RSL signalling links */ llist_for_each_entry(trx, &g_bts->trx_list, list) { -- To view, visit https://gerrit.osmocom.org/8056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I476ac797458b5a46edea3ae9cfbd491fd7f77f47 Gerrit-Change-Number: 8056 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 15 20:59:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 15 May 2018 20:59:26 +0000 Subject: Change in osmo-bsc[master]: bsc_api.c: actually log with context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7996 ) Change subject: bsc_api.c: actually log with context ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/7996/1/src/libbsc/bsc_api.c File src/libbsc/bsc_api.c: https://gerrit.osmocom.org/#/c/7996/1/src/libbsc/bsc_api.c at 47 PS1, Line 47: #define LOGPLCHAN(lchan, ss, level, fmt, args...) \ I think this should go in a header file so it can be used from more code -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-Change-Number: 7996 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 15 May 2018 20:59:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Tue May 15 21:02:42 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:02:42 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb4b0cb7570_1fe3bb668823358b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 270s] [ 245.325504] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 245.995970] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 246.655424] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.296057] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.954062] dracut-initqueue[471]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 247.961045] dracut-initqueue[471]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 331s] /var/cache/obs/worker/root_20/root: 26684 [ 331s] qemu-system-aarch64: terminating on signal 15 from pid 14469 () [ 331s] ### VM INTERACTION END ### [ 331s] /var/run/obs/worker/20/build/build-vm: line 458: kill: (26675) - No such process [ 331s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 331s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue May 15 21:11:14 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 15 May 2018 21:11:14 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3002?= Message-ID: <1721044627.1.1526418674670.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Tue May 15 21:25:34 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:25:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb5055d57c5_1fe3bb66882378df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 267s] [ 244.324947] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 244.985627] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.644920] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.295663] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.945016] dracut-initqueue[466]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.951976] dracut-initqueue[466]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_29/root: 49011 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 21172 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/29/build/build-vm: line 458: kill: (49004) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 21:30:42 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:30:42 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb519ccb4f3_1fe3bb668823833a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 267s] [ 244.725002] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.355528] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.014805] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.665457] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 247.325027] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 247.331831] dracut-initqueue[463]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_9/root: 10470 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 30585 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (10463) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 21:31:34 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:31:34 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb51bbc85c1_1fe3bb6688238516@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 265s] [ 243.464979] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.105497] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.744916] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.375436] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.014909] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.021674] dracut-initqueue[467]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_25/root: 13498 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 45522 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/25/build/build-vm: line 458: kill: (13491) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 21:31:51 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:31:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb51d6e653f_1fe3bb66882386f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 267s] [ 244.675027] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.325597] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.964961] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.645519] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.294996] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.301922] dracut-initqueue[460]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_22/root: 14615 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 47232 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (14608) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 21:38:25 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:38:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb535f3ab92_1fe3bb6688240457@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 269s] [ 245.415161] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.075638] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.714958] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.365762] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.015063] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.021956] dracut-initqueue[463]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 272s] [ 272s] [ 272s] Entering emergency mode. Exit the shell to continue. [ 272s] Type "journalctl" to view system logs. [ 272s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 272s] after mounting them and attach it to a bug report. [ 272s] [ 272s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_12/root: 23435 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 41388 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (23417) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 21:56:25 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 21:56:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb579635e9d_1fe3bb66882434b0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ **] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ *] A start job is running for dev-disk...2d0.device (4min 53s / no limit) [ **] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 55s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 56s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ ***] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [ **] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 317s] /var/cache/obs/worker/root_3/root: 23429 [ 317s] qemu-system-aarch64: terminating on signal 15 from pid 24766 [ 317s] ### VM INTERACTION END ### [ 317s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (23422) - No such process [ 317s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 317s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 22:36:25 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 22:36:25 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb60f6b6fd8_1fe3bb66882515fd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 325s] [ 292.476070] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 325s] [ 293.178353] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 293.811246] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 294.467101] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 295.156317] dracut-initqueue[453]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 295.163883] dracut-initqueue[453]: Warning: Could not boot. [ 327s] Starting Setup Virtual Console... [ 327s] [ OK ] Started Setup Virtual Console. [ 327s] Starting Dracut Emergency Shell... [ 328s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 328s] [ 328s] Generating "/run/initramfs/rdsosreport.txt" [ 328s] [ 328s] [ 328s] Entering emergency mode. Exit the shell to continue. [ 328s] Type "journalctl" to view system logs. [ 328s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 328s] after mounting them and attach it to a bug report. [ 328s] [ 328s] [ 331s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 332s] /var/cache/obs/worker/root_19/root: 6943 [ 332s] qemu-system-aarch64: terminating on signal 15 from pid 15548 () [ 332s] ### VM INTERACTION END ### [ 332s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (6935) - No such process [ 332s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 332s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue May 15 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 15 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#35?= In-Reply-To: <1102575883.54.1526337680477.JavaMail.jenkins@jenkins.osmocom.org> References: <1102575883.54.1526337680477.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1037064676.1.1526424081238.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15779/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-15779/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-15779/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-15779/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-15779/ libtool: install: (cd /tmp/am-dc-15779/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-15779/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-15779/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-15779/ libtool: install: chmod 644 /tmp/am-dc-15779/ libtool: install: ranlib /tmp/am-dc-15779/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-15779/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-15779/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-15779/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15779/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-15779/ /bin/mkdir -p '/tmp/am-dc-15779/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-15779/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-15779/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-15779/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-15779/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-15779/ libtool: uninstall: rm -f /tmp/am-dc-15779/ /tmp/am-dc-15779/ /tmp/am-dc-15779/ /tmp/am-dc-15779/ /tmp/am-dc-15779/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-15779/ && rm -f html.tar ) ( cd '/tmp/am-dc-15779/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-15779/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From admin at opensuse.org Tue May 15 22:41:51 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 22:41:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb623e7d3e5_1fe3bb66882520ef@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [*** ] A start job is running for dev-disk...2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [* ] A start job is running for dev-disk...2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk...io\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 2s / no limit) [ *] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ **] A start job is running for dev-disk...x2d0.device (5min 3s / no limit) [ ***] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 4s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 5s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 6s / no limit) [* ] A start job is running for dev-disk...x2d0.device (5min 6s / no limit) [** ] A start job is running for dev-disk...x2d0.device (5min 7s / no limit) [*** ] A start job is running for dev-disk...x2d0.device (5min 7s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 8s / no limit) [ *** ] A start job is running for dev-disk...x2d0.device (5min 8s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 321s] /var/cache/obs/worker/root_2/root: 17783 [ 321s] qemu-system-aarch64: terminating on signal 15 from pid 21356 [ 321s] ### VM INTERACTION END ### [ 321s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (17776) - No such process [ 321s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 321s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Tue May 15 23:05:59 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 15 May 2018 23:05:59 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3415?= Message-ID: <174272505.2.1526425559877.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue May 15 23:06:43 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 15 May 2018 23:06:43 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3415?= Message-ID: <674986925.3.1526425603790.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Tue May 15 23:35:18 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 23:35:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb6ecf7e4bb_1fe3bb668826081f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 267s] [ 244.154798] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.806003] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.464849] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.105661] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.754893] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.761632] dracut-initqueue[460]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 270s] [ 270s] [ 270s] Entering emergency mode. Exit the shell to continue. [ 270s] Type "journalctl" to view system logs. [ 270s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 270s] after mounting them and attach it to a bug report. [ 270s] [ 270s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_6/root: 34508 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 8586 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/6/build/build-vm: line 458: kill: (34501) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 10 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 23:40:27 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 23:40:27 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb6ffd476f8_1fe3bb66882634c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 11s] [68/71] preinstalling sysvinit-utils... [ 11s] [69/71] preinstalling e2fsprogs... [ 12s] [70/71] preinstalling sysv-rc... [ 12s] [71/71] preinstalling initscripts... [ 12s] [ 12s] [1/1] preinstalling libdevmapper1.02.1... [ 12s] copying packages... [ 14s] reordering...cycle: libc6 -> libgcc1 [ 14s] breaking dependency libgcc1 -> libc6 [ 14s] cycle: debhelper -> dh-autoreconf [ 14s] breaking dependency debhelper -> dh-autoreconf [ 14s] cycle: dh-strip-nondeterminism -> debhelper [ 14s] breaking dependency debhelper -> dh-strip-nondeterminism [ 14s] done [ 14s] objdump: /boot/Image.guest: File format not recognized [ 16s] booting kvm... [ 16s] ### VM INTERACTION START ### [ 16s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image.guest -initrd /boot/initrd.guest -append root=/dev/disk/by-id/virtio-0 rootfstype=ext4 rootflags=noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_3/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 16s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_3/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 16s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_3/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 322s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 322s] /var/cache/obs/worker/root_3/root: 9753 [ 322s] qemu-system-aarch64: terminating on signal 15 from pid 11020 () [ 322s] ### VM INTERACTION END ### [ 322s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (9739) - No such process [ 322s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 322s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Tue May 15 23:46:27 2018 From: admin at opensuse.org (OBS Notification) Date: Tue, 15 May 2018 23:46:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb71636490e_1fe3bb6688264826@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 265s] [ 243.424762] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.075449] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.724733] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 245.395410] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.014873] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.021721] dracut-initqueue[478]: Warning: Could not boot. [ 268s] Starting Setup Virtual Console... [ 268s] [ OK ] Started Setup Virtual Console. [ 268s] Starting Dracut Emergency Shell... [ 268s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 268s] [ 268s] Generating "/run/initramfs/rdsosreport.txt" [ 268s] [ 268s] [ 268s] Entering emergency mode. Exit the shell to continue. [ 268s] Type "journalctl" to view system logs. [ 268s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 268s] after mounting them and attach it to a bug report. [ 268s] [ 268s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_12/root: 20669 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 23258 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (20660) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Wed May 16 00:06:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 16 May 2018 00:06:21 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3005?= Message-ID: <1984362682.8.1526429181193.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed May 16 00:06:25 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 16 May 2018 00:06:25 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pcu?= =?UTF-8?Q?_=C2=BB_v2017.01,osmocom-master-debian9,lc15,True_#473?= Message-ID: <1786808852.9.1526429185034.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Wed May 16 00:07:57 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 16 May 2018 00:07:57 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--en?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3005?= Message-ID: <1052498379.10.1526429277921.JavaMail.jenkins@jenkins.osmocom.org> See From admin at opensuse.org Wed May 16 00:44:27 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 00:44:27 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb7efefc63_1fe3bb668828467c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 322s] [ 291.425473] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 292.056599] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 292.695756] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 293.326605] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 293.975769] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 324s] [ 293.983128] dracut-initqueue[463]: Warning: Could not boot. [ 324s] Starting Setup Virtual Console... [ 324s] [ OK ] Started Setup Virtual Console. [ 324s] Starting Dracut Emergency Shell... [ 324s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 324s] [ 324s] Generating "/run/initramfs/rdsosreport.txt" [ 325s] [ 325s] [ 325s] Entering emergency mode. Exit the shell to continue. [ 325s] Type "journalctl" to view system logs. [ 325s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 325s] after mounting them and attach it to a bug report. [ 325s] [ 325s] [ 330s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_2/root: 6506 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 18315 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/2/build/build-vm: line 458: kill: (6499) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 00:56:44 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 00:56:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb81ec3fc6d_1fe3bb66882867f0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 266s] [ 243.704807] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.375374] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.044759] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 245.705470] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.364760] dracut-initqueue[445]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.371535] dracut-initqueue[445]: Warning: Could not boot. [ 269s] Starting Setup Virtual Console... [ 269s] [ OK ] Started Setup Virtual Console. [ 269s] Starting Dracut Emergency Shell... [ 269s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 269s] [ 269s] Generating "/run/initramfs/rdsosreport.txt" [ 269s] [ 269s] [ 269s] Entering emergency mode. Exit the shell to continue. [ 269s] Type "journalctl" to view system logs. [ 269s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 269s] after mounting them and attach it to a bug report. [ 269s] [ 269s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_20/root: 30473 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 37132 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/20/build/build-vm: line 458: kill: (30466) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 01:46:44 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 01:46:44 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb8da21e649_1fe3bb6688293435@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 264s] [ 242.264806] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 242.915308] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.564856] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.235320] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.914699] dracut-initqueue[460]: Warning: dracut-initqueue timeout - starting timeout scripts [ 267s] [ 244.921315] dracut-initqueue[460]: Warning: Could not boot. [ 267s] Starting Setup Virtual Console... [ 267s] [ OK ] Started Setup Virtual Console. [ 267s] Starting Dracut Emergency Shell... [ 267s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 267s] [ 267s] Generating "/run/initramfs/rdsosreport.txt" [ 267s] [ 267s] [ 267s] Entering emergency mode. Exit the shell to continue. [ 267s] Type "journalctl" to view system logs. [ 267s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 267s] after mounting them and attach it to a bug report. [ 267s] [ 267s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_32/root: 30355 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 43519 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (30348) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 01:47:18 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 01:47:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afb8dbd7c3b9_1fe3bb668829354a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 264s] [ 242.084790] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 264s] [ 242.735300] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 265s] [ 243.364733] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.005368] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.675033] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 266s] [ 244.682047] dracut-initqueue[459]: Warning: Could not boot. [ 266s] Starting Setup Virtual Console... [ 266s] [ OK ] Started Setup Virtual Console. [ 266s] Starting Dracut Emergency Shell... [ 266s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 266s] [ 266s] Generating "/run/initramfs/rdsosreport.txt" [ 267s] [ 267s] [ 267s] Entering emergency mode. Exit the shell to continue. [ 267s] Type "journalctl" to view system logs. [ 267s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 267s] after mounting them and attach it to a bug report. [ 267s] [ 267s] [ 327s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 327s] /var/cache/obs/worker/root_19/root: 47306 [ 327s] qemu-system-aarch64: terminating on signal 15 from pid 8081 () [ 327s] ### VM INTERACTION END ### [ 327s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (47299) - No such process [ 327s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 327s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed May 16 08:34:20 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 16 May 2018 08:34:20 +0000 Subject: Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9169 to look at the new patch set (#2). Change subject: vlr_access_req_fsm: use correct cause codes ...................................................................... vlr_access_req_fsm: use correct cause codes The FSM that controls the VLR ACCESS uses cause code 9 (GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the identity of the MS is currently not known in VLR (MSC-Reboot) However, this cause code is from the GMM domain and is interpreted as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST - use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of GSM48_REJECT_IMSI_UNKNOWN_IN_VLR Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Closes: OS#3266 --- M src/libvlr/vlr_access_req_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/69/9169/2 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 08:53:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 16 May 2018 08:53:26 +0000 Subject: Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9169 ) Change subject: vlr_access_req_fsm: use correct cause codes ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 16 May 2018 08:53:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 08:53:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 16 May 2018 08:53:29 +0000 Subject: Change in osmo-msc[master]: vlr_access_req_fsm: use correct cause codes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9169 ) Change subject: vlr_access_req_fsm: use correct cause codes ...................................................................... vlr_access_req_fsm: use correct cause codes The FSM that controls the VLR ACCESS uses cause code 9 (GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the identity of the MS is currently not known in VLR (MSC-Reboot) However, this cause code is from the GMM domain and is interpreted as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST - use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of GSM48_REJECT_IMSI_UNKNOWN_IN_VLR Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Closes: OS#3266 --- M src/libvlr/vlr_access_req_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index dd95821..79eb75f 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -381,7 +381,7 @@ if (!par->by_tmsi) { /* We couldn't find a subscriber even by IMSI, * Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } else { /* TMSI was included, are we permitted to use it? */ @@ -392,7 +392,7 @@ return; } else { /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } } @@ -411,7 +411,7 @@ vsub = vlr_subscr_find_by_imsi(vlr, par->imsi); if (!vsub) { /* Set User Error: Unidentified Subscriber */ - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR); return; } assoc_par_with_subscr(fi, vsub); @@ -687,7 +687,7 @@ case GSM_MI_TYPE_IMEI: /* TODO: IMEI (emergency call) */ default: - proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE); + proc_arq_fsm_done(fi, GSM48_REJECT_INVALID_MANDANTORY_INF); return; } diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 5f2d30f..e71295a 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -63,10 +63,10 @@ DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620) DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth) DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START -DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_fsm_done(MS_IDENTITY_NOT_DERVIVABLE) +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_fsm_done(IMSI_UNKNOWN_IN_VLR) DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_DONE -DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: MS_IDENTITY_NOT_DERVIVABLE -- sending CM Service Reject for unknown, cause: MS_IDENTITY_NOT_DERVIVABLE +DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: IMSI_UNKNOWN_IN_VLR +- sending CM Service Reject for unknown, cause: IMSI_UNKNOWN_IN_VLR DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release) -- To view, visit https://gerrit.osmocom.org/9169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 Gerrit-Change-Number: 9169 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 09:47:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 09:47:02 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9196 Change subject: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) ...................................................................... osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 --- M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/96/9196/1 diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 44e0f99..2d8a71f 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1b11bc808f9fe4234bb3b42965f8b7ca5c33e303" +SRCREV = "e5a9665c009f9b81bbc370480405cb91cbe99b66" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.2.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/9196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 Gerrit-Change-Number: 9196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 10:08:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 16 May 2018 10:08:55 +0000 Subject: Change in osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts_counter In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8086 to look at the new patch set (#3). Change subject: stats: use libosmocore rate counter for in/out_stream.err_ts_counter ...................................................................... stats: use libosmocore rate counter for in/out_stream.err_ts_counter The two counters: in_stream.err_ts_counter and out_stream.err_ts_counter are still handcoded. To make them better accessible they should be replaced with libosmocore rate counters. - replace state.in_stream.err_ts_counter with libosmocore rate counter - replace state.out_stream.err_ts_counter with libosmocore rate counter Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Related: OS#2517 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 6 files changed, 58 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/8086/3 -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-Change-Number: 8086 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 10:08:56 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 16 May 2018 10:08:56 +0000 Subject: Change in osmo-mgw[master]: network: independently initalize state->out_stream Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9197 Change subject: network: independently initalize state->out_stream ...................................................................... network: independently initalize state->out_stream The struct state->out_stream.ssrc is initalized by first initalizing state->in_stream and then copying state->in_stream over to state->out_stream. This works as long as no pointers to other objects are added to struct mgcp_rtp_stream_state but we may add pointers to struct mgcp_rtp_stream_state in the future. - Initalize out_stream and in_stream independently from each other Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Related: OS#2517 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/97/9197/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6923b97..49e51a1 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -511,7 +511,9 @@ state->in_stream.last_tsdelta = 0; state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); - state->out_stream = state->in_stream; + state->out_stream.last_seq = seq - 1; + state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ LOGP(DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 11:09:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 16 May 2018 11:09:50 +0000 Subject: Change in osmo-mgw[master]: network: independently initalize state->out_stream In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9197 ) Change subject: network: independently initalize state->out_stream ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 16 May 2018 11:09:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 11:11:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 16 May 2018 11:11:07 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9196 ) Change subject: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 Gerrit-Change-Number: 9196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 16 May 2018 11:11:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 11:15:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 11:15:20 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9196 ) Change subject: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/9196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 Gerrit-Change-Number: 9196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 16 May 2018 11:15:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 11:15:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 11:15:22 +0000 Subject: Change in meta-telephony[201705]: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9196 ) Change subject: osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) ...................................................................... osmo-bsc: Update 1.2.0 to 1.2.1 (dyn ts fixes) Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 --- M recipes-osmocom/osmo-bsc/osmo-bsc_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb index 44e0f99..2d8a71f 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb +++ b/recipes-osmocom/osmo-bsc/osmo-bsc_git.bb @@ -1,7 +1,7 @@ require ${PN}.inc S = "${WORKDIR}/git" -SRCREV = "1b11bc808f9fe4234bb3b42965f8b7ca5c33e303" +SRCREV = "e5a9665c009f9b81bbc370480405cb91cbe99b66" SRC_URI = "git://git.osmocom.org/osmo-bsc.git;protocol=git" -PV = "1.2.0+gitr${SRCPV}" +PV = "1.2.1+gitr${SRCPV}" PR = "${INC_PR}.0" -- To view, visit https://gerrit.osmocom.org/9196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: merged Gerrit-Change-Id: If28aaae21864dc794342525c184c6a47365d4ce1 Gerrit-Change-Number: 9196 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 12:48:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 12:48:42 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix use of wrong buffer for dest addr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9198 Change subject: tests: xua_test: Fix use of wrong buffer for dest addr ...................................................................... tests: xua_test: Fix use of wrong buffer for dest addr All the others parts use that buffer as its name indicates. Change-Id: Ide7fe148cc762153330b08f66737816ceed96cb2 --- M tests/xua/xua_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/98/9198/1 diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 3e370fe..61f21d9 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -443,7 +443,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_loc_ref_bsc), + PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), }, }, }, { -- To view, visit https://gerrit.osmocom.org/9198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide7fe148cc762153330b08f66737816ceed96cb2 Gerrit-Change-Number: 9198 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 12:48:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 12:48:43 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix array len computation Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9199 Change subject: tests: xua_test: Fix array len computation ...................................................................... tests: xua_test: Fix array len computation As warned by gcc 8.1.0: In file included from libosmo-sccp/include/osmocom/sigtran/osmo_ss7.h:7, from libosmo-sccp/include/../src/xua_internal.h:3, from libosmo-sccp/tests/xua/xua_test.c:21: /include/osmocom/core/utils.h:13:34: error: division ?sizeof (const uint8_t (*)[12] {aka const unsigned char (*)[12]}) / sizeof (const uint8_t[12] {aka const unsigned char[12]})? does not compute the number of array elements [-Werror=sizeof-pointer-div] #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ^ libosmo-sccp/tests/xua/xua_test.c:371:45: note: in expansion of macro ?ARRAY_SIZE? #define PARTARR(x, data) { .tag = x, .len = ARRAY_SIZE(data), .dat = (uint8_t *) data } Change-Id: Iad5703d68fee26fc83958741512820d2539e604e --- M tests/xua/xua_test.c 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/99/9199/1 diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 61f21d9..37ba645 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -387,8 +387,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -398,8 +398,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92), }, }, }, { @@ -409,8 +409,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92), }, }, }, { @@ -420,8 +420,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -432,7 +432,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -443,7 +443,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), }, }, }, { -- To view, visit https://gerrit.osmocom.org/9199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad5703d68fee26fc83958741512820d2539e604e Gerrit-Change-Number: 9199 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 13:23:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 13:23:20 +0000 Subject: Change in osmo-pcu[master]: tbf: Fix memset(0) on object with no trivial copy-assignment Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9200 Change subject: tbf: Fix memset(0) on object with no trivial copy-assignment ...................................................................... tbf: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0: osmo-pcu/src/tbf.cpp: In constructor ?gprs_rlcmac_tbf::gprs_rlcmac_tbf(BTS*, gprs_rlcmac_tbf_direction)?: osmo-pcu/src/tbf.cpp:222:33: error: ?void* memset(void*, int, size_t)? clearing an object of type ?struct gprs_rlc? with no trivial copy-assignment; use assignment or value-initialization instead [-Werror=class-memaccess] memset(&m_rlc, 0, sizeof(m_rlc)); ^ In file included from osmo-pcu/src/tbf.h:24, from osmo-pcu/src/bts.h:37, from osmo-pcu/src/tbf.cpp:22: osmo-pcu/src/rlc.h:234:8: note: ?struct gprs_rlc? declared here struct gprs_rlc { ^~~~~~~~ Change-Id: Ifb0529b9ae6cd4300e5cbbd9151054792edbfe06 --- M src/rlc.h M src/tbf.cpp 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/9200/1 diff --git a/src/rlc.h b/src/rlc.h index aac6b13..5b6a0dd 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -24,6 +24,7 @@ #include #include +#include #define RLC_GPRS_SNS 128 /* GPRS, must be power of 2 */ #define RLC_GPRS_WS 64 /* max window size */ @@ -232,6 +233,7 @@ * the routines to manipulate these arrays. */ struct gprs_rlc { + void init(); gprs_rlc_data *block(int bsn); gprs_rlc_data m_blocks[RLC_MAX_SNS/2]; }; @@ -647,6 +649,11 @@ return m_v_n[bsn & mod_sns_half()]; } +inline void gprs_rlc::init() +{ + memset(m_blocks, 0, sizeof(m_blocks)); +} + inline gprs_rlc_data *gprs_rlc::block(int bsn) { return &m_blocks[bsn & mod_sns_half()]; diff --git a/src/tbf.cpp b/src/tbf.cpp index d5fbb3f..14c1ee2 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -219,9 +219,9 @@ memset(&pdch, 0, sizeof(pdch)); memset(&T, 0, sizeof(T)); memset(&N, 0, sizeof(N)); - memset(&m_rlc, 0, sizeof(m_rlc)); memset(&gsm_timer, 0, sizeof(gsm_timer)); + m_rlc.init(); m_llc.init(); m_name_buf[0] = '\0'; -- To view, visit https://gerrit.osmocom.org/9200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb0529b9ae6cd4300e5cbbd9151054792edbfe06 Gerrit-Change-Number: 9200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 13:23:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 13:23:21 +0000 Subject: Change in osmo-pcu[master]: rlc: Fix memset(0) on object with no trivial copy-assignment Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9201 Change subject: rlc: Fix memset(0) on object with no trivial copy-assignment ...................................................................... rlc: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0, the cs field is a class (GprsCodingScheme) and should not be memset. Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe --- M src/rlc.cpp 1 file changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/9201/1 diff --git a/src/rlc.cpp b/src/rlc.cpp index a82f550..ee88bd9 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -326,11 +326,18 @@ unsigned int i; unsigned int padding_bits = with_padding ? cs.optionalPaddingBits() : 0; - memset(rlc, 0, sizeof(*rlc)); - rlc->cs = cs; - rlc->with_padding = with_padding; + rlc->r = 0; + rlc->si = 0; + rlc->tfi = 0; + rlc->cps = 0; + rlc->rsb = 0; + rlc->usf = 0; + rlc->es_p = 0; + rlc->rrbp = 0; + rlc->pr = 0; rlc->num_data_blocks = cs.numDataBlocks(); + rlc->with_padding = with_padding; OSMO_ASSERT(rlc->num_data_blocks <= ARRAY_SIZE(rlc->block_info)); -- To view, visit https://gerrit.osmocom.org/9201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe Gerrit-Change-Number: 9201 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 13:47:35 2018 From: gerrit-no-reply at lists.osmocom.org (Thorsten Alteholz) Date: Wed, 16 May 2018 13:47:35 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined Message-ID: Thorsten Alteholz has uploaded this change for review. ( https://gerrit.osmocom.org/9202 Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... use reasonable value if PATH_MAX is not defined In case PATH_MAX is not defined, which happens for example on non Linux systems like Hurd, use a reasonable value, like the one from Linux. Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 --- M src/plugin.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/9202/1 diff --git a/src/plugin.c b/src/plugin.c index 40de4f8..bffdc97 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -46,7 +46,12 @@ int osmo_plugin_load_all(const char *directory) { unsigned int num = 0; +/* in case PATH_MAX is not defined, use the value from linux */ +#ifdef PATH_MAX char fname[PATH_MAX]; +#else + char fname[4096]; +#endif DIR *dir; struct dirent *entry; -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 14:31:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 14:31:28 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: Code-Review-1 We probably use PATH_MAX in several places, so I think it's better to create a new OSMO_PATH_MAX in some header file, and then use that one everywhere needed. -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 16 May 2018 14:31:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 14:31:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 14:31:59 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: Have a look at ./include/osmocom/core/timer_compat.h, we do similar things for time related stuff. -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 16 May 2018 14:31:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 15:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 16 May 2018 15:59:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: fix iterator in f_init() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9203 Change subject: MSC_Tests: fix iterator in f_init() ...................................................................... MSC_Tests: fix iterator in f_init() With f_init(), the user has the option to specifiy how many bsc instances should be created. A for loop then iterates over the prepared configurations and calls f_bssap_init(). The first parameter g_bssap is tied to index 0 constantly but should be tied to the iterator i. - use i instad of 0 as iterator for g_bssap Change-Id: I490bab70224d236ab576a2ea3863f6d0afd5f22a --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/9203/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1ede8e6..edaa61b 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -227,7 +227,7 @@ for (var integer i := 0; i < num_bsc; i := i + 1) { if (isbound(mp_bssap_cfg[i])) { - f_bssap_init(g_bssap[0], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); + f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); } else { setverdict(fail, "missing BSSAP configuration"); } -- To view, visit https://gerrit.osmocom.org/9203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I490bab70224d236ab576a2ea3863f6d0afd5f22a Gerrit-Change-Number: 9203 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 15:59:08 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 16 May 2018 15:59:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: add test to try two LU from different BSCs Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9204 Change subject: MSC_Tests: add test to try two LU from different BSCs ...................................................................... MSC_Tests: add test to try two LU from different BSCs Currently we are only able to simulate a Location Update from a single BSC. However, as a preperation for inter BSC handover tests we need to be able to communicate to the MSC from two independed BSC instances. A location update is a simple operation to try out the multi-bsc functionality - Add support to create multiple BSC instances in independed ports - Add test to simulate a LU from two different BSCs Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Related: OS#1609 --- M library/BSSMAP_Emulation.ttcn M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/expected-results.xml 4 files changed, 69 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/04/9204/1 diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn index 95b39f3..74c6ed0 100644 --- a/library/BSSMAP_Emulation.ttcn +++ b/library/BSSMAP_Emulation.ttcn @@ -47,8 +47,11 @@ type component BSSAP_ConnHdlr { /* port towards MSC Emulator core / SCCP connection dispatchar */ port BSSAP_Conn_PT BSSAP; + port BSSAP_Conn_PT BSSAP_1; + /* procedure based port to register for incoming connections */ port BSSMAPEM_PROC_PT BSSAP_PROC; + port BSSMAPEM_PROC_PT BSSAP_PROC_1; } /* Auxiliary primitive that can happen on the port between per-connection client and this dispatcher */ diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index b7a4f50..69608bd 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -44,10 +44,16 @@ boolean expect_ciph } -type record BSC_ConnHdlrPars { +type record BSC_ConnHdlrBscPars { SCCP_PAR_Address sccp_addr_own, SCCP_PAR_Address sccp_addr_peer, - BSSMAP_IE_CellIdentifier cell_id, + BSSMAP_IE_CellIdentifier cell_id +} + +type record of BSC_ConnHdlrBscPars BSC_ConnHdlrBscParsTable; + +type record BSC_ConnHdlrPars { + BSC_ConnHdlrBscParsTable bsc, hexstring imei, hexstring imsi, hexstring msisdn, @@ -173,15 +179,16 @@ }; /* Encode 'l3' and ask BSSMAP_Emulation to create new connection with COMPL L3 INFO */ -function f_bssap_compl_l3(PDU_ML3_MS_NW l3) +function f_bssap_compl_l3(PDU_ML3_MS_NW l3, integer bsc_num := 0, BSSAP_Conn_PT BSSAP_PT := BSSAP) runs on BSC_ConnHdlr { log("Sending COMPL L3: ", l3); var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3); - BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own, - valueof(ts_BSSMAP_ComplL3(g_pars.cell_id, l3_enc)))); + + BSSAP_PT.send(ts_BSSAP_Conn_Req(g_pars.bsc[bsc_num].sccp_addr_peer, g_pars.bsc[bsc_num].sccp_addr_own, + valueof(ts_BSSMAP_ComplL3(g_pars.bsc[bsc_num].cell_id, l3_enc)))); alt { - [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} - [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP_PT.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} + [] BSSAP_PT.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { setverdict(fail, "DISC.ind from SCCP"); self.stop; } @@ -297,7 +304,7 @@ } } -function f_perform_lu() +function f_perform_lu(integer bsc_num := 0, BSSAP_Conn_PT BSSAP_PT := BSSAP) runs on BSC_ConnHdlr { var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) var PDU_DTAP_MT dtap_mt; @@ -306,10 +313,10 @@ f_create_gsup_expect(hex2str(g_pars.imsi)); /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ - f_bssap_compl_l3(l3_lu); + f_bssap_compl_l3(l3_lu, bsc_num, BSSAP_PT); if (g_pars.send_early_cm) { - BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); + BSSAP_PT.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3)); } f_mm_common(); @@ -321,7 +328,7 @@ GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { + [] BSSAP_PT.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) -> value dtap_mt { var PDU_ML3_LocationUpdateAccept lu_acc := dtap_mt.dtap.msgs.mm.locationUpdateAccept; if (g_pars.net.expect_tmsi) { if (not ispresent(lu_acc.mobileIdentityTLV) or @@ -330,7 +337,7 @@ self.stop; } else { g_pars.tmsi := lu_acc.mobileIdentityTLV.mobileIdentityLV.mobileIdentityV.oddEvenInd_identity.tmsi_ptmsi.octets; - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_TmsiRealloc_Cmpl)); + BSSAP_PT.send(ts_PDU_DTAP_MO(ts_ML3_MO_TmsiRealloc_Cmpl)); } } else { if (ispresent(lu_acc.mobileIdentityTLV) and @@ -340,15 +347,15 @@ } } } - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + [] BSSAP_PT.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { setverdict(fail, "Expected LU ACK, but received LU REJ"); self.stop; } } /* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */ - BSSAP.receive(tr_BSSMAP_ClearCommand); - BSSAP.send(ts_BSSMAP_ClearComplete); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + BSSAP_PT.receive(tr_BSSMAP_ClearCommand); + BSSAP_PT.send(ts_BSSMAP_ClearComplete); + BSSAP_PT.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); setverdict(pass); } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index edaa61b..ebf0081 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -434,10 +434,22 @@ expect_auth := false, expect_ciph := false }; + + var BSC_ConnHdlrBscParsTable bsc_pars := { + { + sccp_addr_own := g_bssap[0].sccp_addr_own, + sccp_addr_peer := g_bssap[0].sccp_addr_peer, + cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)) + }, + { + sccp_addr_own := g_bssap[1].sccp_addr_own, + sccp_addr_peer := g_bssap[1].sccp_addr_peer, + cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 24, 43)) + } + } + var BSC_ConnHdlrPars pars := { - sccp_addr_own := g_bssap[0].sccp_addr_own, - sccp_addr_peer := g_bssap[0].sccp_addr_peer, - cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)), + bsc := bsc_pars, imei := f_gen_imei(imsi_suffix), imsi := f_gen_imsi(imsi_suffix), msisdn := f_gen_msisdn(imsi_suffix), @@ -449,6 +461,9 @@ net := net_pars, send_early_cm := true }; + +/* ========================= */ + return pars; } @@ -460,6 +475,8 @@ /* BSSMAP part / A interface */ connect(vc_conn:BSSAP, g_bssap[0].vc_BSSMAP:CLIENT); connect(vc_conn:BSSAP_PROC, g_bssap[0].vc_BSSMAP:PROC); + connect(vc_conn:BSSAP_1, g_bssap[1].vc_BSSMAP:CLIENT); + connect(vc_conn:BSSAP_PROC_1, g_bssap[1].vc_BSSMAP:PROC); /* MNCC part */ connect(vc_conn:MNCC, vc_MNCC:MNCC_CLIENT); connect(vc_conn:MNCC_PROC, vc_MNCC:MNCC_PROC); @@ -1106,8 +1123,8 @@ f_init_handler(pars); /* Send Complete L3 Info with empty L3 frame */ - BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own, - valueof(ts_BSSMAP_ComplL3(g_pars.cell_id, ''O)))); + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.bsc[0].sccp_addr_peer, g_pars.bsc[0].sccp_addr_own, + valueof(ts_BSSMAP_ComplL3(g_pars.bsc[0].cell_id, ''O)))); timer T := 5.0; T.start; @@ -1140,8 +1157,8 @@ var octetstring payl := f_rnd_octstring(len); /* Send Complete L3 Info with empty L3 frame */ - BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own, - valueof(ts_BSSMAP_ComplL3(g_pars.cell_id, payl)))); + BSSAP.send(ts_BSSAP_Conn_Req(g_pars.bsc[0].sccp_addr_peer, g_pars.bsc[0].sccp_addr_own, + valueof(ts_BSSMAP_ComplL3(g_pars.bsc[0].cell_id, payl)))); timer T := 5.0; T.start; @@ -1847,6 +1864,23 @@ setverdict(pass); } +private function f_tc_lu_two(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + pars.net.expect_tmsi := false; + f_init_handler(pars); + f_perform_lu(0, BSSAP); + f_perform_lu(1, BSSAP_1); +} +testcase TC_lu_two() runs on MTC_CT { + /* Like TC_lu_imsi_noauth_notmsi, but with two different BSC */ + var BSC_ConnHdlr vc_conn; + f_init(2); + f_vty_config(MSCVTY, "msc", "no assign-tmsi"); + + vc_conn := f_start_handler(refers(f_tc_lu_two), 2); + vc_conn.done; +} + + /*********************************************************************** * SMS Testing ***********************************************************************/ @@ -2173,6 +2207,7 @@ execute( TC_mo_release_timeout() ); execute( TC_lu_and_mt_call_no_dlcx_resp() ); execute( TC_reset_two() ); + execute( TC_lu_two() ); execute( TC_lu_and_mt_call() ); diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 0b192d0..cade469 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -70,6 +70,7 @@ + -- To view, visit https://gerrit.osmocom.org/9204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Gerrit-Change-Number: 9204 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 18:17:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 18:17:23 +0000 Subject: Change in libosmocore[master]: tests: bitrev_test: Fix dynamic-stack-buffer-overflow Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9205 Change subject: tests: bitrev_test: Fix dynamic-stack-buffer-overflow ...................................................................... tests: bitrev_test: Fix dynamic-stack-buffer-overflow Fixes following AddressSanitizer report: ==1983==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc245f47e6 at pc 0x7f3e2deea68c bp 0x7ffc245f4750 sp 0x7ffc245f4740 WRITE of size 1 at 0x7ffc245f47e6 thread T0 #0 0x7f3e2deea68b in osmo_nibble_shift_right libosmocore/src/bits.c:92 #1 0x55c01902e1ab in sh_chk libosmocore/tests/bits/bitrev_test.c:215 #2 0x55c01902ed8f in main libosmocore/tests/bits/bitrev_test.c:305 #3 0x7f3e2c93006a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #4 0x55c01902c059 in _start (libosmocore/tests/bits/.libs/lt-bitrev_test+0x5059) This patch can be seen as a follow-up of commit 4fd6023b0383e7efa3b7b0211104a86ff5d3d4f6, which already fixed the left-shift case in the same way. Change-Id: I6e86d0164b7e982bf7b7449d5b3abfb3e1e5da46 --- M tests/bits/bitrev_test.c M tests/bits/bitrev_test.ok 2 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/9205/1 diff --git a/tests/bits/bitrev_test.c b/tests/bits/bitrev_test.c index ed3939a..4a3c1b4 100644 --- a/tests/bits/bitrev_test.c +++ b/tests/bits/bitrev_test.c @@ -299,10 +299,11 @@ for (offs = 0; offs < 13; offs++) { sh_chk(in1, ARRAY_SIZE(in1), offs, true); sh_chk(in1, ARRAY_SIZE(in1), offs, false); - sh_chk(in2, ARRAY_SIZE(in2), offs, true); /* in2 is too short to shift left 12 nibbles */ - if (offs < 12) + if (offs < 12) { + sh_chk(in2, ARRAY_SIZE(in2), offs, true); sh_chk(in2, ARRAY_SIZE(in2), offs, false); + } } return 0; } diff --git a/tests/bits/bitrev_test.ok b/tests/bits/bitrev_test.ok index d2fb12c..580fb63 100644 --- a/tests/bits/bitrev_test.ok +++ b/tests/bits/bitrev_test.ok @@ -154,5 +154,3 @@ OUT: 0f00dcafedea [8] L IN: f00dcafedeadbeef, nibble 12: OUT: 00dcafedeadb -[6] R IN: b00bbabeface, nibble 12: - OUT: 0b00bbabefac -- To view, visit https://gerrit.osmocom.org/9205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6e86d0164b7e982bf7b7449d5b3abfb3e1e5da46 Gerrit-Change-Number: 9205 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 18:17:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 18:17:27 +0000 Subject: Change in libosmocore[master]: tests: gea_test: Use correct max size for key in buffer Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9206 Change subject: tests: gea_test: Use correct max size for key in buffer ...................................................................... tests: gea_test: Use correct max size for key in buffer Expect key sizes for GEA are 64-128 bits. Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace --- M tests/gea/gea_test.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/9206/1 diff --git a/tests/gea/gea_test.c b/tests/gea/gea_test.c index ebccaaf..87020e2 100644 --- a/tests/gea/gea_test.c +++ b/tests/gea/gea_test.c @@ -23,9 +23,9 @@ static inline void test_gea(bool v4, char *kc, uint32_t iv, int dir, uint16_t len, char *res) { - uint8_t out[len], ck[256]; + uint8_t out[len], ck[16]; printf("len %d, dir %d, INPUT 0x%X -> ", len, dir, iv); - osmo_hexparse(kc, ck, len); + osmo_hexparse(kc, ck, sizeof(ck)); int t = gprs_cipher_run(out, len, v4 ? GPRS_ALGO_GEA4 : GPRS_ALGO_GEA3, ck, iv, dir); printf("%s ", t < 0 ? strerror(-t) : "OK"); -- To view, visit https://gerrit.osmocom.org/9206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace Gerrit-Change-Number: 9206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 18:17:28 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 18:17:28 +0000 Subject: Change in libosmocore[master]: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers no... Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9207 Change subject: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits Fixes following AddressSanitizer report during gea_test run with gcc 8.1.0: ==8899==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc5f1719bb at pc 0x7fe574adc5fe bp 0x7ffc5f171460 sp 0x7ffc5f171450 WRITE of size 1 at 0x7ffc5f1719bb thread T0 #0 0x7fe574adc5fd in osmo_store64be_ext ../../include/osmocom/core/bit64gen.h:75 #1 0x7fe574adc649 in osmo_store64be ../../include/osmocom/core/bit64gen.h:104 #2 0x7fe574ade936 in _kasumi_kgcore libosmocore/src/gsm/kasumi.c:186 #3 0x7fe574ae2532 in gea4 libosmocore/src/gsm/gea.c:44 #4 0x7fe574ae266c in gea3 libosmocore/src/gsm/gea.c:60 #5 0x7fe574a9b616 in gprs_cipher_run libosmocore/src/gsm/gprs_cipher_core.c:95 #6 0x56422d3fb2ee in test_gea libosmocore/tests/gea/gea_test.c:29 #7 0x56422d3fb506 in main libosmocore/tests/gea/gea_test.c:49 #8 0x7fe5730f406a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #9 0x56422d3fadf9 in _start (libosmocore/tests/gea/.libs/lt-gea_test+0x1df9) Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 --- M src/gsm/kasumi.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/9207/1 diff --git a/src/gsm/kasumi.c b/src/gsm/kasumi.c index 7de5cd0..15f564e 100644 --- a/src/gsm/kasumi.c +++ b/src/gsm/kasumi.c @@ -159,6 +159,7 @@ } } +/* co must be multiple of 8 */ void _kasumi_kgcore(uint8_t CA, uint8_t cb, uint32_t cc, uint8_t cd, const uint8_t *ck, uint8_t *co, uint16_t cl) { uint16_t KLi1[8], KLi2[8], KOi1[8], KOi2[8], KOi3[8], KIi1[8], KIi2[8], KIi3[8], i; @@ -181,8 +182,12 @@ _kasumi_key_expand(ck, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); /* i is a block counter */ - for (i = 0; i < cl / 64 + 1; i++) { + for (i = 0; i < cl / 64; i++) { BLK = _kasumi(A ^ i ^ BLK, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); osmo_store64be(BLK, co + (i * 8)); } + /* Last round */ + uint8_t reminder = cl/8%4; + BLK = _kasumi(A ^ cl / 64 ^ BLK, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); + osmo_store64be_ext(BLK, co + (cl / 64 * 8), reminder ? : 4); } -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 18:19:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 18:19:06 +0000 Subject: Change in libosmocore[master]: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers no... In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9207 ) Change subject: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... Patch Set 1: This one should not be merged yet. I need somebody else to provide feedback on this issue. After this change, the bytes to write in the output buffer don't match anymore the expected result. I'm not sure if the expected result is wrong. I had a look at the TS references described in the code but I could not find those expected result strings. -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 16 May 2018 18:19:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 19:14:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 19:14:13 +0000 Subject: Change in libosmocore[master]: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers no... In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9207 to look at the new patch set (#2). Change subject: WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... WIP: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits Fixes following AddressSanitizer report during gea_test run with gcc 8.1.0: ==8899==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc5f1719bb at pc 0x7fe574adc5fe bp 0x7ffc5f171460 sp 0x7ffc5f171450 WRITE of size 1 at 0x7ffc5f1719bb thread T0 #0 0x7fe574adc5fd in osmo_store64be_ext ../../include/osmocom/core/bit64gen.h:75 #1 0x7fe574adc649 in osmo_store64be ../../include/osmocom/core/bit64gen.h:104 #2 0x7fe574ade936 in _kasumi_kgcore libosmocore/src/gsm/kasumi.c:186 #3 0x7fe574ae2532 in gea4 libosmocore/src/gsm/gea.c:44 #4 0x7fe574ae266c in gea3 libosmocore/src/gsm/gea.c:60 #5 0x7fe574a9b616 in gprs_cipher_run libosmocore/src/gsm/gprs_cipher_core.c:95 #6 0x56422d3fb2ee in test_gea libosmocore/tests/gea/gea_test.c:29 #7 0x56422d3fb506 in main libosmocore/tests/gea/gea_test.c:49 #8 0x7fe5730f406a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #9 0x56422d3fadf9 in _start (libosmocore/tests/gea/.libs/lt-gea_test+0x1df9) Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 --- M src/gsm/kasumi.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/9207/2 -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 19:14:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 16 May 2018 19:14:13 +0000 Subject: Change in libosmocore[master]: tests: a5_test: Print wrong buffer correctly on error Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9208 Change subject: tests: a5_test: Print wrong buffer correctly on error ...................................................................... tests: a5_test: Print wrong buffer correctly on error Before this patch, osmo_hexdump is called stacked in th esame printf function. As a result, the first returned buffer is overwriten by the second, which means the printed buffers will show as the same always. Change-Id: I364328a59da31537c6c9b969e34edd360b685081 --- M tests/a5/a5_test.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/08/9208/1 diff --git a/tests/a5/a5_test.c b/tests/a5/a5_test.c index 6d7cc3c..69f1035 100644 --- a/tests/a5/a5_test.c +++ b/tests/a5/a5_test.c @@ -48,7 +48,9 @@ osmo_hexparse(block, res, len); osmo_ubit2pbit(buf, out, 114); if (0 != memcmp(buf, res, len)) { - printf("FAIL\nGOT: [%d] %s\nEXP: [%d] %s\n", k, osmo_hexdump_nospc(buf, len), k, osmo_hexdump_nospc(res, len)); + printf("FAIL:\n"); + printf("GOT: [%d] %s\n", k, osmo_hexdump_nospc(buf, len)); + printf("EXP: [%d] %s\n", k, osmo_hexdump_nospc(res, len)); return false; } printf("OK\n"); -- To view, visit https://gerrit.osmocom.org/9208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I364328a59da31537c6c9b969e34edd360b685081 Gerrit-Change-Number: 9208 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed May 16 21:25:35 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 21:25:35 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afca1d6e344d_1fe3bb6688983785@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 348s] [ 301.275330] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 348s] [ 301.946097] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 349s] [ 302.576853] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 350s] [ 303.209035] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 350s] [ 303.824833] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 351s] [ 304.487270] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 352s] [ 305.203656] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 352s] [ 305.872203] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 353s] [ 306.565521] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 353s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 354s] [ 307.195578] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 354s] [ 307.816684] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 355s] [ 308.516301] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 309.233041] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 356s] [ 309.924050] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 357s] [ 310.574121] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 358s] [ 311.207841] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 358s] [ 311.824817] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 359s] [ 312.468333] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 360s] [ 313.164714] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 360s] [ 313.825376] dracut-initqueue[461]: Warning: dracut-initqueue timeout - starting timeout scripts [ 361s] /var/cache/obs/worker/root_23/root: 35146 [ 361s] qemu-system-aarch64: terminating on signal 15 from pid 15578 (fuser) [ 361s] ### VM INTERACTION END ### [ 361s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (35130) - No such process [ 361s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 361s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 21:47:18 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 21:47:18 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afca700ba782_1fe3bb66889860c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 281s] [ 237.506060] dracut-initqueue[497]: Warning: dracut-initqueue timeout - starting timeout scripts [ 282s] [ 238.127433] dracut-initqueue[497]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 238.730312] dracut-initqueue[497]: Warning: dracut-initqueue timeout - starting timeout scripts [ 283s] [ 239.310647] dracut-initqueue[497]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 239.932435] dracut-initqueue[497]: Warning: dracut-initqueue timeout - starting timeout scripts [ 284s] [ 239.934833] dracut-initqueue[497]: Warning: Could not boot. [ 284s] Starting Setup Virtual Console... [ 284s] [ OK ] Started Setup Virtual Console. [ 284s] Starting Dracut Emergency Shell... [ 284s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 284s] [ 284s] Generating "/run/initramfs/rdsosreport.txt" [ 285s] [ 285s] [ 285s] Entering emergency mode. Exit the shell to continue. [ 285s] Type "journalctl" to view system logs. [ 285s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 285s] after mounting them and attach it to a bug report. [ 285s] [ 285s] [ 346s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 347s] /var/cache/obs/worker/root_8/root: 58507 [ 347s] qemu-system-aarch64: terminating on signal 15 from pid 8001 () [ 347s] ### VM INTERACTION END ### [ 347s] /var/run/obs/worker/8/build/build-vm: line 458: kill: (58495) - No such process [ 347s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 347s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 22:12:14 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 22:12:14 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcacdaef293_1fe3bb66889992bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 337s] [ 263.332579] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 263.976576] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 264.679829] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 265.366332] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 266.083368] dracut-initqueue[469]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 266.089558] dracut-initqueue[469]: Warning: Could not boot. [ 340s] Starting Setup Virtual Console... [ 340s] [ OK ] Started Setup Virtual Console. [ 340s] Starting Dracut Emergency Shell... [ 340s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 340s] [ 340s] Generating "/run/initramfs/rdsosreport.txt" [ 341s] [ 341s] [ 341s] Entering emergency mode. Exit the shell to continue. [ 341s] Type "journalctl" to view system logs. [ 341s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 341s] after mounting them and attach it to a bug report. [ 341s] [ 341s] [ 378s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 379s] /var/cache/obs/worker/root_5/root: 12395 [ 379s] qemu-system-aarch64: terminating on signal 15 from pid 33600 (fuser) [ 379s] ### VM INTERACTION END ### [ 379s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (12382) - No such process [ 379s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 379s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From jenkins at lists.osmocom.org Wed May 16 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 16 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#36?= In-Reply-To: <1037064676.1.1526424081238.JavaMail.jenkins@jenkins.osmocom.org> References: <1037064676.1.1526424081238.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <859882392.57.1526510481535.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-24697/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-24697/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-24697/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-24697/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-24697/ libtool: install: (cd /tmp/am-dc-24697/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-24697/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-24697/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-24697/ libtool: install: chmod 644 /tmp/am-dc-24697/ libtool: install: ranlib /tmp/am-dc-24697/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-24697/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-24697/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-24697/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-24697/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-24697/ /bin/mkdir -p '/tmp/am-dc-24697/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-24697/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-24697/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-24697/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-24697/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-24697/ libtool: uninstall: rm -f /tmp/am-dc-24697/ /tmp/am-dc-24697/ /tmp/am-dc-24697/ /tmp/am-dc-24697/ /tmp/am-dc-24697/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-24697/ && rm -f html.tar ) ( cd '/tmp/am-dc-24697/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-24697/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Wed May 16 22:48:27 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 May 2018 22:48:27 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9202/1/src/plugin.c File src/plugin.c: https://gerrit.osmocom.org/#/c/9202/1/src/plugin.c at 53 PS1, Line 53: char fname[4096]; And also, it is better to define a macro once if it isn't defined, instead of checking this each location... -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 May 2018 22:48:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed May 16 22:50:31 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 22:50:31 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcb5c59db3a_1fe3bb668810040ab@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 317s] [ 280.326907] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 318s] [ 280.979081] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 318s] [ 281.560383] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 282.226315] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 282.935171] dracut-initqueue[457]: Warning: dracut-initqueue timeout - starting timeout scripts [ 320s] [ 282.966306] dracut-initqueue[457]: Warning: Could not boot. [ 320s] Starting Setup Virtual Console... [ 320s] [ OK ] Started Setup Virtual Console. [ 320s] Starting Dracut Emergency Shell... [ 320s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 320s] [ 320s] Generating "/run/initramfs/rdsosreport.txt" [ 328s] [ 328s] [ 328s] Entering emergency mode. Exit the shell to continue. [ 328s] Type "journalctl" to view system logs. [ 328s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 328s] after mounting them and attach it to a bug report. [ 328s] [ 328s] [ 342s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 348s] /var/cache/obs/worker/root_19/root: 36264 [ 348s] qemu-system-aarch64: terminating on signal 15 from pid 13840 () [ 348s] ### VM INTERACTION END ### [ 348s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (36257) - No such process [ 348s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 348s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed May 16 23:03:23 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 May 2018 23:03:23 +0000 Subject: Change in libosmocore[master]: tests: gea_test: Use correct max size for key in buffer In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9206 ) Change subject: tests: gea_test: Use correct max size for key in buffer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace Gerrit-Change-Number: 9206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 May 2018 23:03:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 16 23:05:20 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 16 May 2018 23:05:20 +0000 Subject: Change in libosmocore[master]: tests: a5_test: Print wrong buffer correctly on error In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9208 ) Change subject: tests: a5_test: Print wrong buffer correctly on error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I364328a59da31537c6c9b969e34edd360b685081 Gerrit-Change-Number: 9208 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 16 May 2018 23:05:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Wed May 16 23:12:52 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 23:12:52 +0000 Subject: Build failure of network:osmocom:nightly/libgtpnl in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcbb07e97b1_1fe3bb668810081c0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Debian_9.0/aarch64 Package network:osmocom:nightly/libgtpnl failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log: [ 312s] [ 259.073476] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 259.766599] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 313s] [ 260.407816] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 261.086725] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 261.707353] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 261.713917] dracut-initqueue[481]: Warning: Could not boot. [ 315s] Starting Setup Virtual Console... [ 315s] [ OK ] Started Setup Virtual Console. [ 315s] Starting Dracut Emergency Shell... [ 315s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 315s] [ 315s] Generating "/run/initramfs/rdsosreport.txt" [ 315s] [ 315s] [ 315s] Entering emergency mode. Exit the shell to continue. [ 315s] Type "journalctl" to view system logs. [ 315s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 315s] after mounting them and attach it to a bug report. [ 315s] [ 315s] [ 361s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 362s] /var/cache/obs/worker/root_31/root: 40157 [ 362s] qemu-system-aarch64: terminating on signal 15 from pid 15990 () [ 362s] ### VM INTERACTION END ### [ 362s] /var/run/obs/worker/31/build/build-vm: line 458: kill: (40140) - No such process [ 362s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 362s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 23:23:43 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 23:23:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcbd9c63a40_1fe3bb66881009863@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 320s] [ 263.861518] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 264.556325] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 321s] [ 265.274028] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 322s] [ 265.996913] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 266.653102] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 323s] [ 266.659677] dracut-initqueue[483]: Warning: Could not boot. [ 323s] Starting Setup Virtual Console... [ 323s] [ OK ] Started Setup Virtual Console. [ 323s] Starting Dracut Emergency Shell... [ 323s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 323s] [ 323s] Generating "/run/initramfs/rdsosreport.txt" [ 323s] [ 323s] [ 323s] Entering emergency mode. Exit the shell to continue. [ 323s] Type "journalctl" to view system logs. [ 323s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 323s] after mounting them and attach it to a bug report. [ 323s] [ 323s] [ 360s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 361s] /var/cache/obs/worker/root_3/root: 33627 [ 361s] qemu-system-aarch64: terminating on signal 15 from pid 18703 (fuser) [ 361s] ### VM INTERACTION END ### [ 361s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (33619) - No such process [ 361s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 361s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Wed May 16 23:54:35 2018 From: admin at opensuse.org (OBS Notification) Date: Wed, 16 May 2018 23:54:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcap in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcc4c4b105a_1fe3bb668810140c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcap/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcap failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcap Last lines of build log: [ 302s] [ 260.343579] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 303s] [ 261.011885] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 261.715876] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 304s] [ 262.443343] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 263.081092] dracut-initqueue[479]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 263.087707] dracut-initqueue[479]: Warning: Could not boot. [ 305s] Starting Setup Virtual Console... [ 305s] [ OK ] Started Setup Virtual Console. [ 305s] Starting Dracut Emergency Shell... [ 305s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 305s] [ 305s] Generating "/run/initramfs/rdsosreport.txt" [ 306s] [ 306s] [ 306s] Entering emergency mode. Exit the shell to continue. [ 306s] Type "journalctl" to view system logs. [ 306s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 306s] after mounting them and attach it to a bug report. [ 306s] [ 306s] [ 347s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 348s] /var/cache/obs/worker/root_17/root: 21782 [ 348s] qemu-system-aarch64: terminating on signal 15 from pid 4345 () [ 349s] ### VM INTERACTION END ### [ 349s] /var/run/obs/worker/17/build/build-vm: line 458: kill: (21763) - No such process [ 349s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 349s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 00:16:39 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 00:16:39 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-netif in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcc9ec1796d_1fe3bb66881016923@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-netif failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 270s] [ 245.625220] dracut-initqueue[443]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.275657] dracut-initqueue[443]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.925246] dracut-initqueue[443]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.585748] dracut-initqueue[443]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.255085] dracut-initqueue[443]: Warning: dracut-initqueue timeout - starting timeout scripts [ 273s] [ 248.261909] dracut-initqueue[443]: Warning: Could not boot. [ 273s] Starting Setup Virtual Console... [ 273s] [ OK ] Started Setup Virtual Console. [ 273s] Starting Dracut Emergency Shell... [ 273s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 273s] [ 273s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 334s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 335s] /var/cache/obs/worker/root_1/root: 39372 [ 335s] qemu-system-aarch64: terminating on signal 15 from pid 8185 () [ 335s] ### VM INTERACTION END ### [ 335s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (39365) - No such process [ 335s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 335s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 00:49:50 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 00:49:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcd1c6a1196_1fe3bb6688102141@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 326s] [ 267.808622] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 326s] [ 268.525880] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 327s] [ 269.188979] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 269.893921] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 270.622783] dracut-initqueue[454]: Warning: dracut-initqueue timeout - starting timeout scripts [ 328s] [ 270.628945] dracut-initqueue[454]: Warning: Could not boot. [ 329s] Starting Setup Virtual Console... [ 329s] [ OK ] Started Setup Virtual Console. [ 329s] Starting Dracut Emergency Shell... [ 329s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 329s] [ 329s] Generating "/run/initramfs/rdsosreport.txt" [ 329s] [ 329s] [ 329s] Entering emergency mode. Exit the shell to continue. [ 329s] Type "journalctl" to view system logs. [ 329s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 329s] after mounting them and attach it to a bug report. [ 329s] [ 329s] [ 362s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 364s] /var/cache/obs/worker/root_19/root: 37796 [ 364s] qemu-system-aarch64: terminating on signal 15 from pid 10506 (fuser) [ 364s] ### VM INTERACTION END ### [ 364s] /var/run/obs/worker/19/build/build-vm: line 458: kill: (37778) - No such process [ 364s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 364s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 00:53:00 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 00:53:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcd27c48276_1fe3bb668810224d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 28s] cycle: debhelper -> dh-autoreconf [ 28s] breaking dependency debhelper -> dh-autoreconf [ 28s] cycle: debhelper -> dh-strip-nondeterminism [ 28s] breaking dependency debhelper -> dh-strip-nondeterminism [ 28s] done [ 29s] objdump: /boot/Image: File format not recognized [ 32s] booting kvm... [ 32s] ### VM INTERACTION START ### [ 32s] mkfifo: cannot create fifo '/var/cache/obs/worker/root_22/root.qemu/monitor': File exists [ 32s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image -initrd /boot/initrd -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_22/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_22/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_22/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 32s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_22/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 32s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_22/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 272s] [ TIME ] Timed out waiting for device dev-sda2.device. [ 272s] [DEPEND] Dependency failed for /kdump/mnt0. [ 272s] [DEPEND] Dependency failed for Local File Systems. [ 272s] [ SKIP ] Ordering cycle found, skipping dracut pre-pivot and cleanup hook [ 272s] [ SKIP ] Ordering cycle found, skipping dracut mount hook [ 272s] [DEPEND] Dependency failed for File System Check on /dev/sda2. [ 272s] [ OK ] Reached target System Initialization. [ 272s] [ OK ] Reached target Basic System. [ 339s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_22/root: 14324 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 34476 (fuser) [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/22/build/build-vm: line 458: kill: (14317) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 01:22:25 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 01:22:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcd9642b952_1fe3bb6688102683@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 337s] [ 266.452935] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 338s] [ 267.159732] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 267.864669] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 339s] [ 268.566922] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 269.178882] dracut-initqueue[477]: Warning: dracut-initqueue timeout - starting timeout scripts [ 340s] [ 269.193358] dracut-initqueue[477]: Warning: Could not boot. [ 340s] Starting Setup Virtual Console... [ 340s] [ OK ] Started Setup Virtual Console. [ 340s] Starting Dracut Emergency Shell... [ 340s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 340s] [ 340s] Generating "/run/initramfs/rdsosreport.txt" [ 341s] [ 341s] [ 341s] Entering emergency mode. Exit the shell to continue. [ 341s] Type "journalctl" to view system logs. [ 341s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 341s] after mounting them and attach it to a bug report. [ 341s] [ 341s] [ 375s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 377s] /var/cache/obs/worker/root_12/root: 24574 [ 377s] qemu-system-aarch64: terminating on signal 15 from pid 1957 () [ 377s] ### VM INTERACTION END ### [ 377s] /var/run/obs/worker/12/build/build-vm: line 458: kill: (24550) - No such process [ 377s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 377s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 01:34:26 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 01:34:26 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcdc34eeb8c_1fe3bb66881028351@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 314s] [ 262.832864] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 314s] [ 263.526572] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 315s] [ 264.292496] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 316s] [ 264.950415] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 317s] [ 265.641942] dracut-initqueue[467]: Warning: dracut-initqueue timeout - starting timeout scripts [ 317s] [ 265.650250] dracut-initqueue[467]: Warning: Could not boot. [ 317s] Starting Setup Virtual Console... [ 317s] [ OK ] Started Setup Virtual Console. [ 317s] Starting Dracut Emergency Shell... [ 317s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 317s] [ 317s] Generating "/run/initramfs/rdsosreport.txt" [ 317s] [ 317s] [ 317s] Entering emergency mode. Exit the shell to continue. [ 317s] Type "journalctl" to view system logs. [ 317s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 317s] after mounting them and attach it to a bug report. [ 317s] [ 317s] [ 359s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 361s] /var/cache/obs/worker/root_9/root: 46599 [ 361s] qemu-system-aarch64: terminating on signal 15 from pid 19104 () [ 361s] ### VM INTERACTION END ### [ 361s] /var/run/obs/worker/9/build/build-vm: line 458: kill: (46592) - No such process [ 361s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 361s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 01:39:17 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 01:39:17 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcdd6130db3_1fe3bb66881029432@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 304s] [ 259.163053] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 305s] [ 259.807434] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 306s] [ 260.446576] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 306s] [ 261.189772] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 307s] [ 261.953738] dracut-initqueue[490]: Warning: dracut-initqueue timeout - starting timeout scripts [ 307s] [ 261.960271] dracut-initqueue[490]: Warning: Could not boot. [ 307s] Starting Setup Virtual Console... [ 307s] [ OK ] Started Setup Virtual Console. [ 307s] Starting Dracut Emergency Shell... [ 307s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 307s] [ 307s] Generating "/run/initramfs/rdsosreport.txt" [ 308s] [ 308s] [ 308s] Entering emergency mode. Exit the shell to continue. [ 308s] Type "journalctl" to view system logs. [ 308s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 308s] after mounting them and attach it to a bug report. [ 308s] [ 308s] [ 353s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 354s] /var/cache/obs/worker/root_23/root: 18331 [ 354s] qemu-system-aarch64: terminating on signal 15 from pid 45357 (fuser) [ 354s] ### VM INTERACTION END ### [ 354s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (18324) - No such process [ 354s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 354s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 17 02:15:28 2018 From: gerrit-no-reply at lists.osmocom.org (Nikos Balkanas) Date: Thu, 17 May 2018 02:15:28 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Fixes Message-ID: Nikos Balkanas has uploaded this change for review. ( https://gerrit.osmocom.org/9209 Change subject: Minor Typo Fixes ...................................................................... Minor Typo Fixes Change-Id: Ie5b1e0f23df23d5831059a1c3c9b16ee89963612 --- M src/README.building A src/shared/libosmocore/configure 2 files changed, 14,818 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/9209/1 -- To view, visit https://gerrit.osmocom.org/9209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5b1e0f23df23d5831059a1c3c9b16ee89963612 Gerrit-Change-Number: 9209 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu May 17 02:31:00 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 02:31:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afce97262069_1fe3bb668810410b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 293s] [ 255.020497] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 294s] [ 255.631100] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 294s] [ 256.288745] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 295s] [ 257.006817] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 257.683210] dracut-initqueue[483]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 257.689508] dracut-initqueue[483]: Warning: Could not boot. [ 296s] Starting Setup Virtual Console... [ 296s] [ OK ] Started Setup Virtual Console. [ 296s] Starting Dracut Emergency Shell... [ 296s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 296s] [ 296s] Generating "/run/initramfs/rdsosreport.txt" [ 297s] [ 297s] [ 297s] Entering emergency mode. Exit the shell to continue. [ 297s] Type "journalctl" to view system logs. [ 297s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 297s] after mounting them and attach it to a bug report. [ 297s] [ 297s] [ 344s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 345s] /var/cache/obs/worker/root_1/root: 13230 [ 345s] qemu-system-aarch64: terminating on signal 15 from pid 6583 () [ 345s] ### VM INTERACTION END ### [ 345s] /var/run/obs/worker/1/build/build-vm: line 458: kill: (13223) - No such process [ 345s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 345s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 02:05:50 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 02:05:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afce3928d3b0_1fe3bb668810349b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 295s] [ 258.537136] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 259.206244] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 259.840743] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 260.476660] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 261.145516] dracut-initqueue[481]: Warning: dracut-initqueue timeout - starting timeout scripts [ 298s] [ 261.153420] dracut-initqueue[481]: Warning: Could not boot. [ 298s] Starting Setup Virtual Console... [ 298s] [ OK ] Started Setup Virtual Console. [ 298s] Starting Dracut Emergency Shell... [ 298s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 298s] [ 298s] Generating "/run/initramfs/rdsosreport.txt" [ 299s] [ 299s] [ 299s] Entering emergency mode. Exit the shell to continue. [ 299s] Type "journalctl" to view system logs. [ 299s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 299s] after mounting them and attach it to a bug report. [ 299s] [ 299s] [ 345s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 346s] /var/cache/obs/worker/root_23/root: 31260 [ 346s] qemu-system-aarch64: terminating on signal 15 from pid 11732 (fuser) [ 346s] ### VM INTERACTION END ### [ 346s] /var/run/obs/worker/23/build/build-vm: line 458: kill: (31235) - No such process [ 346s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 346s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 02:53:16 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 02:53:16 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afceeb387b57_1fe3bb668810451fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 270s] [ 245.475106] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.135728] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 246.785224] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 247.465810] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.115111] dracut-initqueue[449]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.122802] dracut-initqueue[449]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 329s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 330s] /var/cache/obs/worker/root_10/root: 39851 [ 330s] qemu-system-aarch64: terminating on signal 15 from pid 9670 () [ 330s] ### VM INTERACTION END ### [ 330s] /var/run/obs/worker/10/build/build-vm: line 458: kill: (39840) - No such process [ 330s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 330s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 03:02:08 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 03:02:08 +0000 Subject: Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcf0bc76fe3_1fe3bb668810482d8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 316s] [ 261.910729] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 317s] [ 262.677074] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 318s] [ 263.349421] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 264.057435] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 264.745252] dracut-initqueue[478]: Warning: dracut-initqueue timeout - starting timeout scripts [ 319s] [ 264.760551] dracut-initqueue[478]: Warning: Could not boot. [ 319s] Starting Setup Virtual Console... [ 319s] [ OK ] Started Setup Virtual Console. [ 319s] Starting Dracut Emergency Shell... [ 319s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 319s] [ 319s] Generating "/run/initramfs/rdsosreport.txt" [ 320s] [ 320s] [ 320s] Entering emergency mode. Exit the shell to continue. [ 320s] Type "journalctl" to view system logs. [ 320s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 320s] after mounting them and attach it to a bug report. [ 320s] [ 320s] [ 359s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 360s] /var/cache/obs/worker/root_7/root: 4359 [ 360s] qemu-system-aarch64: terminating on signal 15 from pid 33379 () [ 360s] ### VM INTERACTION END ### [ 360s] /var/run/obs/worker/7/build/build-vm: line 458: kill: (4349) - No such process [ 360s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 360s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 03:08:12 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 03:08:12 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcf22299334_1fe3bb6688104957a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 31s] /usr/bin/qemu-system-aarch64 -nodefaults -no-reboot -nographic -vga none -enable-kvm -cpu host -M virt,gic-version=host -object rng-random,filename=/dev/hwrng,id=rng0 -device virtio-rng-device,rng=rng0 -runas qemu -net none -kernel /boot/Image -initrd /boot/initrd -append root=/dev/disk/by-id/virtio-0 rootfstype=ext3 rootflags=data=writeback,nobarrier,commit=150,noatime panic=1 quiet no-kvmclock nmi_watchdog=0 rw rd.driver.pre=binfmt_misc elevator=noop console=ttyAMA0 init=/.build/build -m 2048 -drive file=/var/cache/obs/worker/root_32/root,format=raw,if=none,id=disk,serial=0,cache=unsafe -device virtio-blk-device,drive=disk -drive file=/var/cache/obs/worker/root_32/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe -device virtio-blk-device,drive=swap -serial stdio -chardev socket,id=monitor,server,nowait,path=/var/cache/obs/worker/root_32/root.qemu/monitor -mon chardev=monitor,mode=readline -smp 4 [ 32s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_32/root,format=raw,if=none,id=disk,serial=0,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 32s] qemu-system-aarch64: -drive file=/var/cache/obs/worker/root_32/swap,format=raw,if=none,id=swap,serial=1,cache=unsafe: 'serial' is deprecated, please use the corresponding option of '-device' instead [ 314s] [ OK ] Started dracut pre-udev hook. [ 314s] Starting udev Kernel Device Manager... [ 314s] [ OK ] Started udev Kernel Device Manager. [ 314s] Starting dracut pre-trigger hook... [ 314s] [ OK ] Found device /dev/disk/by-id/virtio-0. [ 314s] [ OK ] Reached target Initrd Root Device. [ 314s] [ OK ] Started dracut pre-trigger hook. [ 314s] Starting udev Coldplug all Devices... [ 315s] Mounting Kernel Configuration File System... [ 315s] [ OK ] Mounted Kernel Configuration File System. [ 315s] [ OK ] Started udev Coldplug all Devices. [ 315s] Starting udev Wait for Complete Device Initialization... [ 315s] Starting dracut initqueue hook... [ 315s] [ OK ] Started udev Wait for Complete Device Initialization. [ 315s] Starting Device-Mapper Multipath Device Controller... [ 315s] [ OK ] Started Device-Mapper Multipath Device Controller. [ 315s] [ OK ] Reached target Local File Systems (Pre). [ 338s] ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_32/root: 47568 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 16334 () [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/32/build/build-vm: line 458: kill: (47553) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 04:04:34 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 04:04:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afcff58442d5_1fe3bb6688105673c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 294s] [ 264.732256] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 295s] [ 265.395565] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 266.141228] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 296s] [ 266.867272] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 267.564587] dracut-initqueue[482]: Warning: dracut-initqueue timeout - starting timeout scripts [ 297s] [ 267.587986] dracut-initqueue[482]: Warning: Could not boot. [ 297s] Starting Setup Virtual Console... [ 297s] [ OK ] Started Setup Virtual Console. [ 297s] Starting Dracut Emergency Shell... [ 297s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 297s] [ 297s] Generating "/run/initramfs/rdsosreport.txt" [ 298s] [ 298s] [ 298s] Entering emergency mode. Exit the shell to continue. [ 298s] Type "journalctl" to view system logs. [ 298s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 298s] after mounting them and attach it to a bug report. [ 298s] [ 298s] [ 339s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 340s] /var/cache/obs/worker/root_10/root: 44708 [ 340s] qemu-system-aarch64: terminating on signal 15 from pid 20813 () [ 340s] ### VM INTERACTION END ### [ 340s] /var/run/obs/worker/10/build/build-vm: line 458: kill: (44700) - No such process [ 340s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 340s] or the build host has a kernel or hardware problem... gave up after 11 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 04:14:17 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 04:14:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afd01af74f82_1fe3bb66881059390@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 270s] [ 246.305184] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 246.975868] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.635096] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.306502] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.915127] dracut-initqueue[463]: Warning: dracut-initqueue timeout - starting timeout scripts [ 272s] [ 248.922036] dracut-initqueue[463]: Warning: Could not boot. [ 272s] Starting Setup Virtual Console... [ 272s] [ OK ] Started Setup Virtual Console. [ 272s] Starting Dracut Emergency Shell... [ 272s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 272s] [ 272s] Generating "/run/initramfs/rdsosreport.txt" [ 273s] [ 273s] [ 273s] Entering emergency mode. Exit the shell to continue. [ 273s] Type "journalctl" to view system logs. [ 273s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 273s] after mounting them and attach it to a bug report. [ 273s] [ 273s] [ 333s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 334s] /var/cache/obs/worker/root_11/root: 17858 [ 334s] qemu-system-aarch64: terminating on signal 15 from pid 34401 () [ 334s] ### VM INTERACTION END ### [ 334s] /var/run/obs/worker/11/build/build-vm: line 458: kill: (17851) - No such process [ 334s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 334s] or the build host has a kernel or hardware problem... gave up after 13 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 17 07:11:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:11:10 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Fixes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9209 ) Change subject: Minor Typo Fixes ...................................................................... Patch Set 1: Code-Review-1 The "./configure" script is *generated* during the build process from configure.ac. We (like anyone) don't check-in generated code but simply the original input file. Please re-submit without the "configure" file. -- To view, visit https://gerrit.osmocom.org/9209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5b1e0f23df23d5831059a1c3c9b16ee89963612 Gerrit-Change-Number: 9209 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:11:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:11:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:11:56 +0000 Subject: Change in libosmocore[master]: tests: bitrev_test: Fix dynamic-stack-buffer-overflow In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9205 ) Change subject: tests: bitrev_test: Fix dynamic-stack-buffer-overflow ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6e86d0164b7e982bf7b7449d5b3abfb3e1e5da46 Gerrit-Change-Number: 9205 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:11:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:12:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:12:12 +0000 Subject: Change in libosmocore[master]: tests: gea_test: Use correct max size for key in buffer In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9206 ) Change subject: tests: gea_test: Use correct max size for key in buffer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace Gerrit-Change-Number: 9206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 May 2018 07:12:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:12:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:12:21 +0000 Subject: Change in libosmocore[master]: tests: a5_test: Print wrong buffer correctly on error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9208 ) Change subject: tests: a5_test: Print wrong buffer correctly on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I364328a59da31537c6c9b969e34edd360b685081 Gerrit-Change-Number: 9208 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 17 May 2018 07:12:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:12:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:12:24 +0000 Subject: Change in libosmocore[master]: tests: bitrev_test: Fix dynamic-stack-buffer-overflow In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9205 ) Change subject: tests: bitrev_test: Fix dynamic-stack-buffer-overflow ...................................................................... tests: bitrev_test: Fix dynamic-stack-buffer-overflow Fixes following AddressSanitizer report: ==1983==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc245f47e6 at pc 0x7f3e2deea68c bp 0x7ffc245f4750 sp 0x7ffc245f4740 WRITE of size 1 at 0x7ffc245f47e6 thread T0 #0 0x7f3e2deea68b in osmo_nibble_shift_right libosmocore/src/bits.c:92 #1 0x55c01902e1ab in sh_chk libosmocore/tests/bits/bitrev_test.c:215 #2 0x55c01902ed8f in main libosmocore/tests/bits/bitrev_test.c:305 #3 0x7f3e2c93006a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #4 0x55c01902c059 in _start (libosmocore/tests/bits/.libs/lt-bitrev_test+0x5059) This patch can be seen as a follow-up of commit 4fd6023b0383e7efa3b7b0211104a86ff5d3d4f6, which already fixed the left-shift case in the same way. Change-Id: I6e86d0164b7e982bf7b7449d5b3abfb3e1e5da46 --- M tests/bits/bitrev_test.c M tests/bits/bitrev_test.ok 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/bits/bitrev_test.c b/tests/bits/bitrev_test.c index ed3939a..4a3c1b4 100644 --- a/tests/bits/bitrev_test.c +++ b/tests/bits/bitrev_test.c @@ -299,10 +299,11 @@ for (offs = 0; offs < 13; offs++) { sh_chk(in1, ARRAY_SIZE(in1), offs, true); sh_chk(in1, ARRAY_SIZE(in1), offs, false); - sh_chk(in2, ARRAY_SIZE(in2), offs, true); /* in2 is too short to shift left 12 nibbles */ - if (offs < 12) + if (offs < 12) { + sh_chk(in2, ARRAY_SIZE(in2), offs, true); sh_chk(in2, ARRAY_SIZE(in2), offs, false); + } } return 0; } diff --git a/tests/bits/bitrev_test.ok b/tests/bits/bitrev_test.ok index d2fb12c..580fb63 100644 --- a/tests/bits/bitrev_test.ok +++ b/tests/bits/bitrev_test.ok @@ -154,5 +154,3 @@ OUT: 0f00dcafedea [8] L IN: f00dcafedeadbeef, nibble 12: OUT: 00dcafedeadb -[6] R IN: b00bbabeface, nibble 12: - OUT: 0b00bbabefac -- To view, visit https://gerrit.osmocom.org/9205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6e86d0164b7e982bf7b7449d5b3abfb3e1e5da46 Gerrit-Change-Number: 9205 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:12:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:12:24 +0000 Subject: Change in libosmocore[master]: tests: gea_test: Use correct max size for key in buffer In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9206 ) Change subject: tests: gea_test: Use correct max size for key in buffer ...................................................................... tests: gea_test: Use correct max size for key in buffer Expect key sizes for GEA are 64-128 bits. Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace --- M tests/gea/gea_test.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/tests/gea/gea_test.c b/tests/gea/gea_test.c index ebccaaf..87020e2 100644 --- a/tests/gea/gea_test.c +++ b/tests/gea/gea_test.c @@ -23,9 +23,9 @@ static inline void test_gea(bool v4, char *kc, uint32_t iv, int dir, uint16_t len, char *res) { - uint8_t out[len], ck[256]; + uint8_t out[len], ck[16]; printf("len %d, dir %d, INPUT 0x%X -> ", len, dir, iv); - osmo_hexparse(kc, ck, len); + osmo_hexparse(kc, ck, sizeof(ck)); int t = gprs_cipher_run(out, len, v4 ? GPRS_ALGO_GEA4 : GPRS_ALGO_GEA3, ck, iv, dir); printf("%s ", t < 0 ? strerror(-t) : "OK"); -- To view, visit https://gerrit.osmocom.org/9206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaf81992a2901733b630e3046b0c4bdc1fb9a8ace Gerrit-Change-Number: 9206 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:12:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:12:24 +0000 Subject: Change in libosmocore[master]: tests: a5_test: Print wrong buffer correctly on error In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9208 ) Change subject: tests: a5_test: Print wrong buffer correctly on error ...................................................................... tests: a5_test: Print wrong buffer correctly on error Before this patch, osmo_hexdump is called stacked in th esame printf function. As a result, the first returned buffer is overwriten by the second, which means the printed buffers will show as the same always. Change-Id: I364328a59da31537c6c9b969e34edd360b685081 --- M tests/a5/a5_test.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/tests/a5/a5_test.c b/tests/a5/a5_test.c index 6d7cc3c..69f1035 100644 --- a/tests/a5/a5_test.c +++ b/tests/a5/a5_test.c @@ -48,7 +48,9 @@ osmo_hexparse(block, res, len); osmo_ubit2pbit(buf, out, 114); if (0 != memcmp(buf, res, len)) { - printf("FAIL\nGOT: [%d] %s\nEXP: [%d] %s\n", k, osmo_hexdump_nospc(buf, len), k, osmo_hexdump_nospc(res, len)); + printf("FAIL:\n"); + printf("GOT: [%d] %s\n", k, osmo_hexdump_nospc(buf, len)); + printf("EXP: [%d] %s\n", k, osmo_hexdump_nospc(res, len)); return false; } printf("OK\n"); -- To view, visit https://gerrit.osmocom.org/9208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I364328a59da31537c6c9b969e34edd360b685081 Gerrit-Change-Number: 9208 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:16:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:16:00 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: slightly off-topic: PATH_MAX doesn't seem to be such a great idea to beg in with :/ http://insanecoding.blogspot.de/2007/11/pathmax-simply-isnt.html -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 May 2018 07:16:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:17:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:17:49 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: or well, it is actually, if we are about to pass that path into a syscall: https://eklitzke.org/path-max-is-tricky (both links just general FYI, not requiring/requesting any change to the current patch) -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 May 2018 07:17:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:18:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:18:20 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix use of wrong buffer for dest addr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9198 ) Change subject: tests: xua_test: Fix use of wrong buffer for dest addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide7fe148cc762153330b08f66737816ceed96cb2 Gerrit-Change-Number: 9198 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:18:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:18:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:18:51 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix array len computation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9199 ) Change subject: tests: xua_test: Fix array len computation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad5703d68fee26fc83958741512820d2539e604e Gerrit-Change-Number: 9199 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:18:51 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:18:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:18:52 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix use of wrong buffer for dest addr In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9198 ) Change subject: tests: xua_test: Fix use of wrong buffer for dest addr ...................................................................... tests: xua_test: Fix use of wrong buffer for dest addr All the others parts use that buffer as its name indicates. Change-Id: Ide7fe148cc762153330b08f66737816ceed96cb2 --- M tests/xua/xua_test.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 3e370fe..61f21d9 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -443,7 +443,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_loc_ref_bsc), + PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), }, }, }, { -- To view, visit https://gerrit.osmocom.org/9198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide7fe148cc762153330b08f66737816ceed96cb2 Gerrit-Change-Number: 9198 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:18:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:18:53 +0000 Subject: Change in libosmo-sccp[master]: tests: xua_test: Fix array len computation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9199 ) Change subject: tests: xua_test: Fix array len computation ...................................................................... tests: xua_test: Fix array len computation As warned by gcc 8.1.0: In file included from libosmo-sccp/include/osmocom/sigtran/osmo_ss7.h:7, from libosmo-sccp/include/../src/xua_internal.h:3, from libosmo-sccp/tests/xua/xua_test.c:21: /include/osmocom/core/utils.h:13:34: error: division ?sizeof (const uint8_t (*)[12] {aka const unsigned char (*)[12]}) / sizeof (const uint8_t[12] {aka const unsigned char[12]})? does not compute the number of array elements [-Werror=sizeof-pointer-div] #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) ^ libosmo-sccp/tests/xua/xua_test.c:371:45: note: in expansion of macro ?ARRAY_SIZE? #define PARTARR(x, data) { .tag = x, .len = ARRAY_SIZE(data), .dat = (uint8_t *) data } Change-Id: Iad5703d68fee26fc83958741512820d2539e604e --- M tests/xua/xua_test.c 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index 61f21d9..37ba645 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -387,8 +387,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -398,8 +398,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92), }, }, }, { @@ -409,8 +409,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap_pc1), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap_pc92), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap_pc1), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap_pc92), }, }, }, { @@ -420,8 +420,8 @@ .hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT), .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class0), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), - PARTARR(SUA_IEI_SRC_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_SRC_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -432,7 +432,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_bsc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), }, }, }, { @@ -443,7 +443,7 @@ .parts = { PARTU32(SUA_IEI_PROTO_CLASS, &sua_proto_class2), PARTU32(SUA_IEI_SRC_REF, &sua_loc_ref_msc), - PARTARR(SUA_IEI_DEST_ADDR, &sua_addr_ssn_bssmap), + PARTARR(SUA_IEI_DEST_ADDR, sua_addr_ssn_bssmap), }, }, }, { -- To view, visit https://gerrit.osmocom.org/9199 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iad5703d68fee26fc83958741512820d2539e604e Gerrit-Change-Number: 9199 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Assignee: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:22:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:22:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: add test to try two LU from different BSCs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9204 ) Change subject: MSC_Tests: add test to try two LU from different BSCs ...................................................................... Patch Set 1: I need to spend some time on this to check if we can somehow avoid having to pass the port referecnce as argument into each test function. -- To view, visit https://gerrit.osmocom.org/9204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib3eabf8537066f43faed8fb983d9e1f4092ec515 Gerrit-Change-Number: 9204 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 May 2018 07:22:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:23:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:23:09 +0000 Subject: Change in osmo-mgw[master]: network: independently initalize state->out_stream In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9197 ) Change subject: network: independently initalize state->out_stream ...................................................................... network: independently initalize state->out_stream The struct state->out_stream.ssrc is initalized by first initalizing state->in_stream and then copying state->in_stream over to state->out_stream. This works as long as no pointers to other objects are added to struct mgcp_rtp_stream_state but we may add pointers to struct mgcp_rtp_stream_state in the future. - Initalize out_stream and in_stream independently from each other Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Related: OS#2517 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 6923b97..49e51a1 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -511,7 +511,9 @@ state->in_stream.last_tsdelta = 0; state->packet_duration = mgcp_rtp_packet_duration(endp, rtp_end); - state->out_stream = state->in_stream; + state->out_stream.last_seq = seq - 1; + state->out_stream.ssrc = state->patch.orig_ssrc = ssrc; + state->out_stream.last_tsdelta = 0; state->out_stream.last_timestamp = timestamp; state->out_stream.ssrc = ssrc - 1; /* force output SSRC change */ LOGP(DRTP, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/9197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5deb27e609448ee0b9f7034e644ae96f1e57887a Gerrit-Change-Number: 9197 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:23:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:23:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: fix iterator in f_init() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9203 ) Change subject: MSC_Tests: fix iterator in f_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I490bab70224d236ab576a2ea3863f6d0afd5f22a Gerrit-Change-Number: 9203 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:23:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:23:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:23:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: fix iterator in f_init() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9203 ) Change subject: MSC_Tests: fix iterator in f_init() ...................................................................... MSC_Tests: fix iterator in f_init() With f_init(), the user has the option to specifiy how many bsc instances should be created. A for loop then iterates over the prepared configurations and calls f_bssap_init(). The first parameter g_bssap is tied to index 0 constantly but should be tied to the iterator i. - use i instad of 0 as iterator for g_bssap Change-Id: I490bab70224d236ab576a2ea3863f6d0afd5f22a --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1ede8e6..edaa61b 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -227,7 +227,7 @@ for (var integer i := 0; i < num_bsc; i := i + 1) { if (isbound(mp_bssap_cfg[i])) { - f_bssap_init(g_bssap[0], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); + f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); } else { setverdict(fail, "missing BSSAP configuration"); } -- To view, visit https://gerrit.osmocom.org/9203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I490bab70224d236ab576a2ea3863f6d0afd5f22a Gerrit-Change-Number: 9203 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:25:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:25:31 +0000 Subject: Change in osmo-pcu[master]: rlc: Fix memset(0) on object with no trivial copy-assignment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9201 ) Change subject: rlc: Fix memset(0) on object with no trivial copy-assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe Gerrit-Change-Number: 9201 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:25:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:25:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:25:49 +0000 Subject: Change in osmo-pcu[master]: tbf: Fix memset(0) on object with no trivial copy-assignment In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9200 ) Change subject: tbf: Fix memset(0) on object with no trivial copy-assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifb0529b9ae6cd4300e5cbbd9151054792edbfe06 Gerrit-Change-Number: 9200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 07:25:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:25:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:25:53 +0000 Subject: Change in osmo-pcu[master]: tbf: Fix memset(0) on object with no trivial copy-assignment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9200 ) Change subject: tbf: Fix memset(0) on object with no trivial copy-assignment ...................................................................... tbf: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0: osmo-pcu/src/tbf.cpp: In constructor ?gprs_rlcmac_tbf::gprs_rlcmac_tbf(BTS*, gprs_rlcmac_tbf_direction)?: osmo-pcu/src/tbf.cpp:222:33: error: ?void* memset(void*, int, size_t)? clearing an object of type ?struct gprs_rlc? with no trivial copy-assignment; use assignment or value-initialization instead [-Werror=class-memaccess] memset(&m_rlc, 0, sizeof(m_rlc)); ^ In file included from osmo-pcu/src/tbf.h:24, from osmo-pcu/src/bts.h:37, from osmo-pcu/src/tbf.cpp:22: osmo-pcu/src/rlc.h:234:8: note: ?struct gprs_rlc? declared here struct gprs_rlc { ^~~~~~~~ Change-Id: Ifb0529b9ae6cd4300e5cbbd9151054792edbfe06 --- M src/rlc.h M src/tbf.cpp 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/rlc.h b/src/rlc.h index aac6b13..5b6a0dd 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -24,6 +24,7 @@ #include #include +#include #define RLC_GPRS_SNS 128 /* GPRS, must be power of 2 */ #define RLC_GPRS_WS 64 /* max window size */ @@ -232,6 +233,7 @@ * the routines to manipulate these arrays. */ struct gprs_rlc { + void init(); gprs_rlc_data *block(int bsn); gprs_rlc_data m_blocks[RLC_MAX_SNS/2]; }; @@ -647,6 +649,11 @@ return m_v_n[bsn & mod_sns_half()]; } +inline void gprs_rlc::init() +{ + memset(m_blocks, 0, sizeof(m_blocks)); +} + inline gprs_rlc_data *gprs_rlc::block(int bsn) { return &m_blocks[bsn & mod_sns_half()]; diff --git a/src/tbf.cpp b/src/tbf.cpp index d5fbb3f..14c1ee2 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -219,9 +219,9 @@ memset(&pdch, 0, sizeof(pdch)); memset(&T, 0, sizeof(T)); memset(&N, 0, sizeof(N)); - memset(&m_rlc, 0, sizeof(m_rlc)); memset(&gsm_timer, 0, sizeof(gsm_timer)); + m_rlc.init(); m_llc.init(); m_name_buf[0] = '\0'; -- To view, visit https://gerrit.osmocom.org/9200 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifb0529b9ae6cd4300e5cbbd9151054792edbfe06 Gerrit-Change-Number: 9200 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:25:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:25:54 +0000 Subject: Change in osmo-pcu[master]: rlc: Fix memset(0) on object with no trivial copy-assignment In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9201 ) Change subject: rlc: Fix memset(0) on object with no trivial copy-assignment ...................................................................... rlc: Fix memset(0) on object with no trivial copy-assignment As warned by gcc 8.1.0, the cs field is a class (GprsCodingScheme) and should not be memset. Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe --- M src/rlc.cpp 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/rlc.cpp b/src/rlc.cpp index a82f550..ee88bd9 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -326,11 +326,18 @@ unsigned int i; unsigned int padding_bits = with_padding ? cs.optionalPaddingBits() : 0; - memset(rlc, 0, sizeof(*rlc)); - rlc->cs = cs; - rlc->with_padding = with_padding; + rlc->r = 0; + rlc->si = 0; + rlc->tfi = 0; + rlc->cps = 0; + rlc->rsb = 0; + rlc->usf = 0; + rlc->es_p = 0; + rlc->rrbp = 0; + rlc->pr = 0; rlc->num_data_blocks = cs.numDataBlocks(); + rlc->with_padding = with_padding; OSMO_ASSERT(rlc->num_data_blocks <= ARRAY_SIZE(rlc->block_info)); -- To view, visit https://gerrit.osmocom.org/9201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id742f82aa856e696b5fb414991dfd0883d0ac7fe Gerrit-Change-Number: 9201 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:26:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:26:13 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Set some functions as static In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9170 ) Change subject: tests: jibuf_test: Set some functions as static ...................................................................... tests: jibuf_test: Set some functions as static Change-Id: I3af6db3fd74d55c5e659132fc542f22478a55eb7 --- M tests/jibuf/jibuf_test.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index 6e8c805..c0c24fd 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -619,7 +619,7 @@ osmo_jibuf_delete(jb); } -void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) +static void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) { int min_delay = 60; struct msgb *msg; @@ -686,7 +686,7 @@ } -void test_skew(unsigned int skew_inc_us, bool skew_compensation) { +static void test_skew(unsigned int skew_inc_us, bool skew_compensation) { int min_delay = 40; unsigned int dropped = 0; struct msgb *msg; -- To view, visit https://gerrit.osmocom.org/9170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3af6db3fd74d55c5e659132fc542f22478a55eb7 Gerrit-Change-Number: 9170 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:26:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 07:26:14 +0000 Subject: Change in libosmo-netif[master]: tests: jibuf_test: Add scenario to show out-of-order bug In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9171 ) Change subject: tests: jibuf_test: Add scenario to show out-of-order bug ...................................................................... tests: jibuf_test: Add scenario to show out-of-order bug Related: OS#3262 Change-Id: I1e78cc44f8a04dcb983352b513f8de2574b2394b --- M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_test.ok 2 files changed, 83 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index c0c24fd..7993a65 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -619,6 +619,66 @@ osmo_jibuf_delete(jb); } +/* This test aims at testing scenarios described in OS#3262, in which syncpoint + packets can provoke a situation in which packets are stored out-of-order in + the queue. */ +static void test_rtp_marker_queue_order() +{ + int min_delay = 60; + struct msgb *msg; + struct rtp_hdr *rtph; + + printf("===test_rtp_marker_queue_order===\n"); + + clock_override_enable(true); + clock_override_set(0, 0); + rtp_init(32, 400); + jb = osmo_jibuf_alloc(NULL); + osmo_jibuf_set_dequeue_cb(jb, dequeue_cb, NULL); + osmo_jibuf_set_min_delay(jb, min_delay); + osmo_jibuf_set_max_delay(jb, 200); + + /* First rtp at t=0, should be scheduled in min_delay time */ + clock_debug("enqueue 1st packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue 2nd packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue 3rd packet"); + ENQUEUE_NEXT(jb); + clock_override_add(0, TIME_RTP_PKT_MS*1000); + + /* We then emulate an scenario in which an Osmux queue in front of us + receives a new frame before expected time, which means the packets in + the osmux genreated rtp queue will be flushed and sent to jibuf + directly. On top, the first packet of the new frame has the RTP + Marker bit set. */ + clock_debug("enqueue 3 packets instantly"); + ENQUEUE_NEXT(jb); /* scheduled min_delay+0 */ + ENQUEUE_NEXT(jb); /* a min_delay+TIME_RTP_PKT_MS */ + ENQUEUE_NEXT(jb); /* scheduled min_delay+TIME_RTP_PKT_MS*2 */ + clock_debug("enqueue pkt with marker=1 instantly"); + msg = rtp_next(); + rtph = osmo_rtp_get_hdr(msg); + rtph->marker = 1; + OSMO_ASSERT(osmo_jibuf_enqueue(jb, msg) == 0); /* syncpoint, scheduled in min_delay+0 */ + osmo_select_main(0); + + clock_override_add(0, TIME_RTP_PKT_MS*1000); + clock_debug("enqueue pkt after syncpoint"); + ENQUEUE_NEXT(jb); /* scheduled min_delay+0 */ + + clock_debug("all packets dequeued"); + clock_override_add(0, min_delay*1000); + osmo_select_main(0); + + /* This assert shows that packets are queued out of order in this case:*/ + OSMO_ASSERT(!osmo_jibuf_empty(jb)); + + osmo_jibuf_delete(jb); +} + static void test_rtp_out_of_sync(unsigned int time_inc_ms, uint16_t seq_nosync_inc, uint32_t ts_nosync_inc, bool expect_drop) { int min_delay = 60; @@ -754,6 +814,7 @@ test_seq_wraparound(); test_timestamp_wraparound(); test_rtp_marker(); + test_rtp_marker_queue_order(); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 5, 5*SAMPLES_PER_PKT, true); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 6, 5*SAMPLES_PER_PKT, false); test_rtp_out_of_sync(80*TIME_RTP_PKT_MS, 5, 5*SAMPLES_PER_PKT + 3, false); diff --git a/tests/jibuf/jibuf_test.ok b/tests/jibuf/jibuf_test.ok index e495435..6bf52fb 100644 --- a/tests/jibuf/jibuf_test.ok +++ b/tests/jibuf/jibuf_test.ok @@ -365,6 +365,28 @@ sys={0.200000}, mono={0.200000}: clock_override_add sys={0.200000}, mono={0.200000}: dequeue: seq=35 ts=880 INTERMEDIATE sys={0.200000}, mono={0.200000}: dequeue: seq=36 ts=1040 LATEST +===test_rtp_marker_queue_order=== +sys={0.000000}, mono={0.000000}: clock_override_set +sys={0.000000}, mono={0.000000}: enqueue 1st packet +sys={0.020000}, mono={0.020000}: clock_override_add +sys={0.020000}, mono={0.020000}: enqueue 2nd packet +sys={0.040000}, mono={0.040000}: clock_override_add +sys={0.040000}, mono={0.040000}: enqueue 3rd packet +sys={0.060000}, mono={0.060000}: clock_override_add +sys={0.060000}, mono={0.060000}: enqueue 3 packets instantly +sys={0.060000}, mono={0.060000}: enqueue pkt with marker=1 instantly +sys={0.060000}, mono={0.060000}: dequeue: seq=33 ts=560 INTERMEDIATE +sys={0.080000}, mono={0.080000}: clock_override_add +sys={0.080000}, mono={0.080000}: enqueue pkt after syncpoint +sys={0.080000}, mono={0.080000}: all packets dequeued +sys={0.140000}, mono={0.140000}: clock_override_add +sys={0.140000}, mono={0.140000}: dequeue: seq=34 ts=720 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=35 ts=880 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=36 ts=1040 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=37 ts=1200 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST +sys={0.140000}, mono={0.140000}: dequeue: seq=38 ts=1360 INTERMEDIATE ===test_rtp_out_of_sync(1600, 5, 800, 1)=== sys={0.000000}, mono={0.000000}: clock_override_set sys={0.000000}, mono={0.000000}: enqueue 1st packet (seq=33, ts=560) -- To view, visit https://gerrit.osmocom.org/9171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1e78cc44f8a04dcb983352b513f8de2574b2394b Gerrit-Change-Number: 9171 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 07:43:40 2018 From: gerrit-no-reply at lists.osmocom.org (Nikos Balkanas) Date: Thu, 17 May 2018 07:43:40 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Changes Message-ID: Nikos Balkanas has uploaded this change for review. ( https://gerrit.osmocom.org/9210 Change subject: Minor Typo Changes ...................................................................... Minor Typo Changes Change-Id: I69126638d81d98ce8236cae543515c8dc743f404 --- M src/shared/libosmocore/configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/9210/1 diff --git a/src/shared/libosmocore/configure.ac b/src/shared/libosmocore/configure.ac index 24ddd0c..0ceb8e6 100644 --- a/src/shared/libosmocore/configure.ac +++ b/src/shared/libosmocore/configure.ac @@ -1,6 +1,6 @@ AC_INIT([libosmocore], m4_esyscmd([./git-version-gen .tarball-version]), - [openbsc at lists.osmocom.org]) + [baseband-devel at lists.osmocom.org]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) AC_CONFIG_TESTDIR(tests) -- To view, visit https://gerrit.osmocom.org/9210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I69126638d81d98ce8236cae543515c8dc743f404 Gerrit-Change-Number: 9210 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:08:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 09:08:48 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9210 ) Change subject: Minor Typo Changes ...................................................................... Patch Set 1: Code-Review-1 Please, describe the context in which the change is done (ie. the file/section modified) and provide more accurate description. Something like this would make more sense here: "configure.ac: Update mailing list info to point to baseband-devel" -- To view, visit https://gerrit.osmocom.org/9210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I69126638d81d98ce8236cae543515c8dc743f404 Gerrit-Change-Number: 9210 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 09:08:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:10:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 09:10:30 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Fixes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9209 ) Change subject: Minor Typo Fixes ...................................................................... Patch Set 1: Same here, if possible add the file name modified when pushing again: "README.building: Update link describing how to install ARM toolchain" -- To view, visit https://gerrit.osmocom.org/9209 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie5b1e0f23df23d5831059a1c3c9b16ee89963612 Gerrit-Change-Number: 9209 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 09:10:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:14:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 09:14:43 +0000 Subject: Change in libosmo-netif[master]: jibuf: Fix out-of-order seq queue around syncpoints In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9172 ) Change subject: jibuf: Fix out-of-order seq queue around syncpoints ...................................................................... Patch Set 1: I'll +2 this in a few hours if nobody finds an issue. -- To view, visit https://gerrit.osmocom.org/9172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 Gerrit-Change-Number: 9172 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 09:14:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:37:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 09:37:34 +0000 Subject: Change in libosmo-netif[master]: jibuf: Fix out-of-order seq queue around syncpoints In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9172 ) Change subject: jibuf: Fix out-of-order seq queue around syncpoints ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 Gerrit-Change-Number: 9172 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 09:37:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:39:10 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 09:39:10 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9211 Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err 7 files changed, 273 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/1 diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 16e1037..50b4a23 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -18,6 +18,7 @@ /* gprs_sgsn.h defines additional flags including and above bit 16 (0x10000) */ #define GSM_SUBSCRIBER_NO_EXPIRATION 0x0 +#define GSM_SUBSCRIBER_LU_EXPIRATION_INTERVAL 60 /* in seconds */ enum gsm_subscriber_field { GSM_SUBSCRIBER_IMSI, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 0a9ef6f..c647ddc 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -148,6 +148,7 @@ struct osmo_fsm_inst *proc_arq_fsm; bool lu_complete; + time_t expire_lu; void *msc_conn_ref; @@ -237,6 +238,7 @@ struct llist_head operations; struct gsup_client *gsup_client; struct vlr_ops ops; + struct osmo_timer_list lu_expire_timer; struct { bool retrieve_imeisv_early; bool retrieve_imeisv_ciphered; @@ -379,6 +381,7 @@ enum osmo_fsm_term_cause fsm_cause, uint8_t gsm48_cause); +void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub); /* Process Acccess Request FSM */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 1b3b240..50d7be6 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -202,6 +202,11 @@ static void subscr_conn_fsm_accepted_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { + struct gsm_subscriber_connection *conn = fi->priv; + + /* Stop location update expiry for this subscriber. */ + conn->vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; + if (!subscr_conn_fsm_has_active_transactions(fi)) osmo_fsm_inst_dispatch(fi, SUBSCR_CONN_E_UNUSED, NULL); } @@ -278,6 +283,11 @@ /* Cancel all VLR FSMs, if any */ vlr_subscr_cancel_attach_fsm(conn->vsub, OSMO_FSM_TERM_ERROR, GSM48_REJECT_CONGESTION); + if (conn->vsub) { + /* Restart LU expiry for this subscriber. */ + vlr_subscr_enable_expire_lu(conn->vsub); + } + /* If we're closing in a middle of a trans, we need to clean up */ trans_conn_closed(conn); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2d232be..b5274ba 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -460,6 +461,54 @@ return 0; } +void +vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) +{ + struct gsm_network *net = vsub->vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ + struct timeval now; + + /* Table 10.5.33: The T3212 timeout value is coded as the + * binary representation of the timeout value for + * periodic updating in decihours. Mark the subscriber as + * inactive if it missed two consecutive location updates. + * Timeout is twice the t3212 value plus one minute */ + if (osmo_gettimeofday(&now, NULL) == 0) { + vsub->expire_lu = now.tv_sec + (net->t3212 * 60 * 6 * 2) + 60; + } else { + LOGP(DVLR, LOGL_ERROR, + "IMSI=%s id=%llu: Could not enable Location Update expiry: unable to read current time\n", + vsub->imsi, vsub->id); + vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; /* XXX */ + } +} + +void +vlr_subscr_expire_lu(void *data) +{ + struct vlr_instance *vlr = data; + struct vlr_subscr *vsub, *vsub_tmp; + struct timeval now; + + if (llist_empty(&vlr->subscribers)) + goto done; + + if (osmo_gettimeofday(&now, NULL) != 0) { + LOGP(DVLR, LOGL_ERROR, "Skipping Location Update expiry: Could not read current time\n"); + goto done; + } + + llist_for_each_entry_safe(vsub, vsub_tmp, &vlr->subscribers, list) { + if (vsub->expire_lu == GSM_SUBSCRIBER_NO_EXPIRATION || vsub->expire_lu > now.tv_sec) + continue; + + LOGP(DVLR, LOGL_DEBUG, "IMSI=%s id=%llu: Location Update expired\n", vsub->imsi, vsub->id); + vlr_subscr_rx_imsi_detach(vsub); + } + +done: + osmo_timer_schedule(&vlr->lu_expire_timer, GSM_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); +} + /*********************************************************************** * PDP context data ***********************************************************************/ @@ -1093,12 +1142,14 @@ return false; } +/* See TS 32.012 version 9.10.0 4.3.2.1 "Process Detach_IMSI_VLR" */ int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub) { /* paranoia: should any LU or PARQ FSMs still be running, stop them. */ vlr_subscr_cancel_attach_fsm(vsub, OSMO_FSM_TERM_ERROR, GSM48_REJECT_CONGESTION); vsub->imsi_detached_flag = true; + vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; /* balancing the get from vlr_lu_compl_fsm_success() */ vlr_subscr_expire(vsub); @@ -1139,6 +1190,8 @@ INIT_LLIST_HEAD(&vlr->operations); memcpy(&vlr->ops, ops, sizeof(vlr->ops)); + osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); + /* defaults */ vlr->cfg.assign_tmsi = true; @@ -1165,6 +1218,7 @@ return -ENOMEM; vlr->gsup_client->data = vlr; + osmo_timer_schedule(&vlr->lu_expire_timer, GSM_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); return 0; } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 3073bd6..a713fcb 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -356,7 +356,7 @@ struct vlr_subscr *vsub = lcvp->vsub; if (!vsub->lu_complete) { vsub->lu_complete = true; - /* Balanced by vlr_subscr_rx_imsi_detach() */ + /* Balanced by vlr_subscr_rx_imsi_detach() or Location Update expiry */ vlr_subscr_get(vsub); } _vlr_lu_compl_fsm_done(fi, VLR_FSM_RESULT_SUCCESS, 0); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index cd61fa1..ebbdb0a 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -917,6 +917,71 @@ comment_end(); } +static void test_no_authen_subscr_expire() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + /* No auth only works on GERAN */ + rx_from_ran = RAN_GERAN_A; + + comment_start(); + + fake_time_start(); + + /* The test framework has already started the VLR before fake time was active. + * Manually schedule this timeout in fake time. */ + osmo_timer_del(&net->vlr->lu_expire_timer); + osmo_timer_schedule(&net->vlr->lu_expire_timer, GSM_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); + + /* Let the LU expiration timer tick once */ + fake_time_passes(GSM_SUBSCRIBER_LU_EXPIRATION_INTERVAL + 1, 0); + + btw("Location Update request causes a GSUP LU request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804036470f1", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("having received subscriber data does not mean acceptance"); + EXPECT_ACCEPTED(false); + + thwart_rx_non_initial_requests(); + + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + vlr_subscr_put(vsub); + + /* Let T3212 (periodic Location update timer) expire */ + fake_time_passes((net->t3212 * 60 * 6 * 2) + 60*4, 0); + + /* The subscriber should now be gone. */ + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub == NULL); + + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} msc_vlr_test_func_t msc_vlr_tests[] = { test_no_authen, @@ -927,5 +992,6 @@ test_no_authen_imeisv_imei, test_no_authen_imeisv_tmsi, test_no_authen_imeisv_tmsi_imei, + test_no_authen_subscr_expire, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 2890e96..b95306d 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -2270,6 +2270,144 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 +===== test_no_authen_subscr_expire +- Total time passed: 0.000000 s +- Total time passed: 61.000000 s +- Location Update request causes a GSUP LU request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804036470f1 +DVLR GSUP rx 17: 10010809710000004026f00804036470f1 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:46071 +DVLR SUBSCR(MSISDN:46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- having received subscriber data does not mean acceptance +msc_subscr_conn_is_accepted() == false + requests shall be thwarted +DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5) +DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_CC_SETUP +DRLL Dispatching 04.08 message unknown 0x33 (0x5:0x33) +DRLL subscr MSISDN:46071: Message not permitted for initial conn: unknown 0x33 +DRLL Dispatching 04.08 message GSM48_MT_RR_SYSINFO_1 (0x6:0x19) +DRLL subscr MSISDN:46071: Message not permitted for initial conn: GSM48_MT_RR_SYSINFO_1 +DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1) +DRLL subscr MSISDN:46071: Message not permitted for initial conn: SMS:0x01 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:46071 +DREF VLR subscr MSISDN:46071 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 +- BSSAP Clear --RAN_GERAN_A--> MS +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL MSISDN:46071: Freeing subscriber connection +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +- Total time passed: 3901.000000 s +DVLR IMSI=901700000004620 id=901700000004620: Location Update expired +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +DREF VLR subscr MSISDN:46071 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:46071 + llist_count(&net->subscr_conns) == 0 +===== test_no_authen_subscr_expire: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:39:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 09:39:50 +0000 Subject: Change in libosmocore[master]: use reasonable value if PATH_MAX is not defined In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9202 ) Change subject: use reasonable value if PATH_MAX is not defined ...................................................................... Patch Set 1: Actually, I think this ultimately belongs into autoconf: # Some Unix systems, like Gnu Hurd, don't define PATH_MAX AC_MSG_CHECKING([for PATH_MAX]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include ]], [[char dummy[PATH_MAX];]])], [ AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED([HAVE_PATH_MAX], 1, [Define to 1 if you have the PATH_MAX macro.]) ], [ AC_MSG_RESULT([no]) AC_DEFINE_UNQUOTED([HAVE_PATH_MAX], 0, [Define to 1 if you have the PATH_MAX macro.]) ] ) and then we can have (in a shared header) #if HAVE_PATH_MAX=0 #define PATH_MAX 4096 #endif -- To view, visit https://gerrit.osmocom.org/9202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia884f4c96b4c4eaa1a1be256e3ccda0b4dec4099 Gerrit-Change-Number: 9202 Gerrit-PatchSet: 1 Gerrit-Owner: Thorsten Alteholz Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Harald Welte Gerrit-Comment-Date: Thu, 17 May 2018 09:39:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:41:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 09:41:24 +0000 Subject: Change in osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts_counter In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8086 ) Change subject: stats: use libosmocore rate counter for in/out_stream.err_ts_counter ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-Change-Number: 8086 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 09:41:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:41:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 09:41:25 +0000 Subject: Change in osmo-mgw[master]: stats: use libosmocore rate counter for in/out_stream.err_ts_counter In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8086 ) Change subject: stats: use libosmocore rate counter for in/out_stream.err_ts_counter ...................................................................... stats: use libosmocore rate counter for in/out_stream.err_ts_counter The two counters: in_stream.err_ts_counter and out_stream.err_ts_counter are still handcoded. To make them better accessible they should be replaced with libosmocore rate counters. - replace state.in_stream.err_ts_counter with libosmocore rate counter - replace state.out_stream.err_ts_counter with libosmocore rate counter Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Related: OS#2517 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 6 files changed, 58 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index 0da2c56..ff02768 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -28,6 +28,7 @@ #include #include #include +#include #define CI_UNUSED 0 @@ -45,7 +46,7 @@ uint32_t ssrc; uint16_t last_seq; uint32_t last_timestamp; - uint32_t err_ts_counter; + struct rate_ctr *err_ts_ctr; int32_t last_tsdelta; uint32_t last_arrival_time; }; @@ -202,6 +203,8 @@ uint32_t octets; } stats; } osmux; + + struct rate_ctr_group *rate_ctr_group; }; /*! Connection type, specifies which member of the union "u" in mgcp_conn diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 998dbc5..280ee8b 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -26,8 +26,29 @@ #include #include #include +#include #include +enum { + IN_STREAM_ERR_TSTMP_CTR, + OUT_STREAM_ERR_TSTMP_CTR, +}; + +static const struct rate_ctr_desc rate_ctr_desc[] = { + [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."}, + [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."}, +}; + + +const static struct rate_ctr_group_desc rate_ctr_group_desc = { + .group_name_prefix = "conn_rtp", + .group_description = "rtp connection statistics", + .class_id = 1, + .num_ctr = 2, + .ctr_desc = rate_ctr_desc +}; + + /* Allocate a new connection identifier. According to RFC3435, they must * be unique only within the scope of the endpoint. (Caller must provide * memory for id) */ @@ -87,6 +108,10 @@ static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn) { struct mgcp_rtp_end *end = &conn_rtp->end; + /* FIXME: Each new rate counter group requires an unique index. At the + * moment we generate this index using this counter, but perhaps there + * is a more concious way to assign the indexes. */ + static unsigned int rate_ctr_index = 0; conn_rtp->type = MGCP_RTP_DEFAULT; conn_rtp->osmux.allocated_cid = -1; @@ -108,6 +133,11 @@ mgcp_rtp_codec_init(&end->codec); mgcp_rtp_codec_init(&end->alt_codec); + + conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index); + conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR]; + conn_rtp->state.out_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[OUT_STREAM_ERR_TSTMP_CTR]; + rate_ctr_index++; } /* Cleanup rtp connection struct */ @@ -116,6 +146,7 @@ osmux_disable_conn(conn_rtp); osmux_release_cid(conn_rtp); mgcp_free_rtp_port(&conn_rtp->end); + rate_ctr_group_free(conn_rtp->rate_ctr_group); } /*! allocate a new connection list entry. diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 49e51a1..4144382 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -222,7 +222,7 @@ if (seq == sstate->last_seq) { if (timestamp != sstate->last_timestamp) { - sstate->err_ts_counter += 1; + rate_ctr_inc(sstate->err_ts_ctr); LOGP(DRTP, LOGL_ERROR, "The %s timestamp delta is != 0 but the sequence " "number %d is the same, " @@ -272,7 +272,7 @@ ts_alignment_error(sstate, state->packet_duration, timestamp); if (timestamp_error) { - sstate->err_ts_counter += 1; + rate_ctr_inc(sstate->err_ts_ctr); LOGP(DRTP, LOGL_NOTICE, "The %s timestamp has an alignment error of %d " "on 0x%x SSRC: %u " diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c index 581130c..cc723bb 100644 --- a/src/libosmo-mgcp/mgcp_stat.c +++ b/src/libosmo-mgcp/mgcp_stat.c @@ -87,9 +87,9 @@ if (conn->conn->endp->cfg->osmux != OSMUX_USAGE_OFF) { /* Error Counter */ nchars = snprintf(str, str_len, - "\r\nX-Osmo-CP: EC TI=%u, TO=%u", - conn->state.in_stream.err_ts_counter, - conn->state.out_stream.err_ts_counter); + "\r\nX-Osmo-CP: EC TI=%lu, TO=%lu", + conn->state.in_stream.err_ts_ctr->current, + conn->state.out_stream.err_ts_ctr->current); if (nchars < 0 || nchars >= str_len) goto truncate; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 14ecd17..392a176 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -160,15 +160,16 @@ struct mgcp_rtp_codec *codec = &end->codec; vty_out(vty, - " Timestamp Errs: %d->%d%s" + " Timestamp Errs: %lu->%lu%s" " Dropped Packets: %d%s" " Payload Type: %d Rate: %u Channels: %d %s" " Frame Duration: %u Frame Denominator: %u%s" " FPP: %d Packet Duration: %u%s" " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", - state->in_stream.err_ts_counter, - state->out_stream.err_ts_counter, VTY_NEWLINE, + state->in_stream.err_ts_ctr->current, + state->out_stream.err_ts_ctr->current, + VTY_NEWLINE, end->stats.dropped_packets, VTY_NEWLINE, codec->payload_type, codec->rate, codec->channels, VTY_NEWLINE, codec->frame_duration_num, codec->frame_duration_den, diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index f6c421a..67c5f66 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1129,10 +1129,12 @@ uint32_t last_ssrc = 0; uint32_t last_timestamp = 0; uint32_t last_seqno = 0; - int last_in_ts_err_cnt = 0; - int last_out_ts_err_cnt = 0; + uint64_t last_in_ts_err_cnt = 0; + uint64_t last_out_ts_err_cnt = 0; struct mgcp_conn_rtp *conn = NULL; struct mgcp_conn *_conn = NULL; + struct rate_ctr test_ctr_in; + struct rate_ctr test_ctr_out; printf("Testing packet error detection%s%s.\n", patch_ssrc ? ", patch SSRC" : "", @@ -1142,6 +1144,11 @@ memset(&endp, 0, sizeof(endp)); memset(&state, 0, sizeof(state)); + memset(&test_ctr_in, 0, sizeof(test_ctr_in)); + memset(&test_ctr_out, 0, sizeof(test_ctr_out)); + state.in_stream.err_ts_ctr = &test_ctr_in; + state.out_stream.err_ts_ctr = &test_ctr_out; + endp.type = &ep_typeset.rtp; trunk.vty_number_endpoints = 1; @@ -1186,18 +1193,18 @@ state.in_stream.last_tsdelta, state.in_stream.last_seq); printf("Out TS change: %d, dTS: %d, Seq change: %d, " - "TS Err change: in %+d, out %+d\n", + "TS Err change: in +%u, out +%u\n", state.out_stream.last_timestamp - last_timestamp, state.out_stream.last_tsdelta, state.out_stream.last_seq - last_seqno, - state.in_stream.err_ts_counter - last_in_ts_err_cnt, - state.out_stream.err_ts_counter - last_out_ts_err_cnt); + (unsigned int) (state.in_stream.err_ts_ctr->current - last_in_ts_err_cnt), + (unsigned int) (state.out_stream.err_ts_ctr->current - last_out_ts_err_cnt)); printf("Stats: Jitter = %u, Transit = %d\n", calc_jitter(&state), state.stats.transit); - last_in_ts_err_cnt = state.in_stream.err_ts_counter; - last_out_ts_err_cnt = state.out_stream.err_ts_counter; + last_in_ts_err_cnt = state.in_stream.err_ts_ctr->current; + last_out_ts_err_cnt = state.out_stream.err_ts_ctr->current; last_timestamp = state.out_stream.last_timestamp; last_seqno = state.out_stream.last_seq; } -- To view, visit https://gerrit.osmocom.org/8086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9fbd65bf2f4d1e015a05996db4c1f7ff20be2c95 Gerrit-Change-Number: 8086 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 09:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 09:46:14 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 1: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/9211/1/src/libmsc/subscr_conn.c File src/libmsc/subscr_conn.c: https://gerrit.osmocom.org/#/c/9211/1/src/libmsc/subscr_conn.c at 207 PS1, Line 207: /* Stop location update expiry for this subscriber. */ the comment states what's easily deducted from the line below. What the comment doesn't say (and I don't understand): Why are we stopping expiration here? https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 465 PS1, Line 465: vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) we don't generally break lines ahead of the function name https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 475 PS1, Line 475: if (osmo_gettimeofday(&now, NULL) == 0) { I think we had the discussion about gettimeofday already (think of time adjustments due to ntpdate, ...), especially on embedded systems without RTC, where at boot time we don't have a valid wall-clock time. https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 481 PS1, Line 481: vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; /* XXX */ what does the XXX mean here? -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 09:46:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 10:13:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 10:13:16 +0000 Subject: Change in libosmocore[master]: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not mul... In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9207 to look at the new patch set (#3). Change subject: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits Fixes following AddressSanitizer report during gea_test run with gcc 8.1.0: ==8899==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc5f1719bb at pc 0x7fe574adc5fe bp 0x7ffc5f171460 sp 0x7ffc5f171450 WRITE of size 1 at 0x7ffc5f1719bb thread T0 #0 0x7fe574adc5fd in osmo_store64be_ext ../../include/osmocom/core/bit64gen.h:75 #1 0x7fe574adc649 in osmo_store64be ../../include/osmocom/core/bit64gen.h:104 #2 0x7fe574ade936 in _kasumi_kgcore libosmocore/src/gsm/kasumi.c:186 #3 0x7fe574ae2532 in gea4 libosmocore/src/gsm/gea.c:44 #4 0x7fe574ae266c in gea3 libosmocore/src/gsm/gea.c:60 #5 0x7fe574a9b616 in gprs_cipher_run libosmocore/src/gsm/gprs_cipher_core.c:95 #6 0x56422d3fb2ee in test_gea libosmocore/tests/gea/gea_test.c:29 #7 0x56422d3fb506 in main libosmocore/tests/gea/gea_test.c:49 #8 0x7fe5730f406a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #9 0x56422d3fadf9 in _start (libosmocore/tests/gea/.libs/lt-gea_test+0x1df9) The kasumi_test is updated to calculate the entire array of bits according to expected result. Before this commit it worked by writing the entire last 64bit block, and addressSanitizer cannot catch it because the allocated buffer is 64bit aligned too. Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 --- M src/gsm/kasumi.c M tests/kasumi/kasumi_test.c 2 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/07/9207/3 -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 10:25:59 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 10:25:59 +0000 Subject: Change in osmo-bsc[master]: separate reporting of RSL link status and OML link status In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/7574 ) Change subject: separate reporting of RSL link status and OML link status ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4bd0821503fc4407dbee8cb489675c19384de5cb Gerrit-Change-Number: 7574 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 10:58:14 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 10:58:14 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9211 to look at the new patch set (#2). Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 285 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/2 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:01:29 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 11:01:29 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/9211/1/src/libmsc/subscr_conn.c File src/libmsc/subscr_conn.c: https://gerrit.osmocom.org/#/c/9211/1/src/libmsc/subscr_conn.c at 207 PS1, Line 207: /* Stop location update expiry for this subscriber. */ > the comment states what's easily deducted from the line below. [?] Next patch contains has a better comment. We want to prevent LU expiry from interfering with subscribers with active connections. https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 465 PS1, Line 465: vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) > we don't generally break lines ahead of the function name Indeed. Fixed in next patch set. https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 475 PS1, Line 475: if (osmo_gettimeofday(&now, NULL) == 0) { > I think we had the discussion about gettimeofday already (think of time adjustments due to ntpdate, [?] I was using gettimeofday only because the msc_vlr tests didn't support fake time with clock_gettime() yet. Fixed in next patch set. Adding support for this to the test suite was pretty straightforward. https://gerrit.osmocom.org/#/c/9211/1/src/libvlr/vlr.c at 481 PS1, Line 481: vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; /* XXX */ > what does the XXX mean here? This subscriber will have LU expiry disabled. Better comment in next patch set. -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 17 May 2018 11:01:29 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:21:55 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 11:21:55 +0000 Subject: Change in libosmo-netif[master]: jibuf: Fix out-of-order seq queue around syncpoints In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9172 ) Change subject: jibuf: Fix out-of-order seq queue around syncpoints ...................................................................... jibuf: Fix out-of-order seq queue around syncpoints Fixes: OS#3262 Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 --- M src/jibuf.c M tests/jibuf/jibuf_test.c M tests/jibuf/jibuf_test.ok 3 files changed, 36 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/jibuf.c b/src/jibuf.c index 45019ae..2632a57 100644 --- a/src/jibuf.c +++ b/src/jibuf.c @@ -119,6 +119,35 @@ } +static void enqueue_pkt(struct osmo_jibuf *jb, struct msgb *msg, bool is_syncpoint) +{ + struct msgb *cur; + struct timeval *msg_ts; + + if (!is_syncpoint) { + llist_add_sorted(msg, &jb->msg_list); + return; + } + + /* syncpoints change the reference timings, and as such they can provoke + out of order enqueuing of this packet and its followups with regards + to the already stored packets which may be scheduled for later times. + We thus need to adapt dequeue time for the already stored pkts to be + dequeued before the syncpoint pkt. See OS#3262 for related scenarios. + */ + + msg_ts = msgb_scheduled_ts(msg); + + llist_for_each_entry(cur, &jb->msg_list, list) { + struct timeval *cur_ts = msgb_scheduled_ts(cur); + if (timercmp(msg_ts, cur_ts, <)) + *cur_ts = *msg_ts; + } + /* syncpoint goes always to the end since we moved all older packets + before it */ + llist_add_tail(&msg->list, &jb->msg_list); +} + static bool msg_get_marker(struct msgb *msg) { /* TODO: make it more generic as a callback so that different types of @@ -314,11 +343,13 @@ { int rel_delay, delay; struct timeval delay_ts, sched_ts; + bool is_syncpoint; clock_gettime_timeval(CLOCK_MONOTONIC, &jb->last_enqueue_time); /* Check if it's time to sync, ie. start of talkspurt */ - if (!jb->started || msg_is_syncpoint(jb, msg)) { + is_syncpoint = !jb->started || msg_is_syncpoint(jb, msg); + if (is_syncpoint) { jb->started = true; msg_set_as_reference(jb, msg); rel_delay = 0; @@ -365,8 +396,7 @@ jbcb->ts = sched_ts; jbcb->old_cb = old_cb; - llist_add_sorted(msg, &jb->msg_list); - + enqueue_pkt(jb, msg, is_syncpoint); /* See if updating the timer is needed: */ if (!osmo_timer_pending(&jb->timer) || diff --git a/tests/jibuf/jibuf_test.c b/tests/jibuf/jibuf_test.c index 7993a65..ba1bb01 100644 --- a/tests/jibuf/jibuf_test.c +++ b/tests/jibuf/jibuf_test.c @@ -673,8 +673,7 @@ clock_override_add(0, min_delay*1000); osmo_select_main(0); - /* This assert shows that packets are queued out of order in this case:*/ - OSMO_ASSERT(!osmo_jibuf_empty(jb)); + OSMO_ASSERT(osmo_jibuf_empty(jb)); osmo_jibuf_delete(jb); } diff --git a/tests/jibuf/jibuf_test.ok b/tests/jibuf/jibuf_test.ok index 6bf52fb..b92f73c 100644 --- a/tests/jibuf/jibuf_test.ok +++ b/tests/jibuf/jibuf_test.ok @@ -383,10 +383,10 @@ sys={0.140000}, mono={0.140000}: dequeue: seq=34 ts=720 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=35 ts=880 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=36 ts=1040 INTERMEDIATE -sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE sys={0.140000}, mono={0.140000}: dequeue: seq=37 ts=1200 INTERMEDIATE -sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST sys={0.140000}, mono={0.140000}: dequeue: seq=38 ts=1360 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=39 ts=1520 INTERMEDIATE +sys={0.140000}, mono={0.140000}: dequeue: seq=40 ts=1680 LATEST ===test_rtp_out_of_sync(1600, 5, 800, 1)=== sys={0.000000}, mono={0.000000}: clock_override_set sys={0.000000}, mono={0.000000}: enqueue 1st packet (seq=33, ts=560) -- To view, visit https://gerrit.osmocom.org/9172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib8c61dbe6261cf73d6efcd7873e23b7656117556 Gerrit-Change-Number: 9172 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:21:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 11:21:57 +0000 Subject: Change in libosmo-netif[master]: osmux: change log lvl of batch full to debug In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9173 ) Change subject: osmux: change log lvl of batch full to debug ...................................................................... osmux: change log lvl of batch full to debug This message is expected as all code filling batches call osmux_batch_enqueue() and checks for error to know if it must tell the user of the lib to call osmux_xfrm_input_deliver. Change-Id: I3d8227f2281f6ca92fd2502d3e328765dc7ecfe9 --- M src/osmux.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmux.c b/src/osmux.c index 46170ba..7a6ce60 100644 --- a/src/osmux.c +++ b/src/osmux.c @@ -356,7 +356,7 @@ static int osmux_batch_enqueue(struct msgb *msg, struct osmux_circuit *circuit, uint8_t batch_factor) { - /* Too many messages per batch, discard it. The counter field of the + /* Validate amount of messages per batch. The counter field of the * osmux header is just 3 bits long, so make sure it doesn't overflow. */ if (circuit->nmsgs >= batch_factor || circuit->nmsgs >= 8) { @@ -366,7 +366,7 @@ if (rtph == NULL) return -1; - LOGP(DLMUX, LOGL_ERROR, "too many messages for this RTP " + LOGP(DLMUX, LOGL_DEBUG, "Batch is full for RTP " "ssrc=%u\n", rtph->ssrc); return -1; } -- To view, visit https://gerrit.osmocom.org/9173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3d8227f2281f6ca92fd2502d3e328765dc7ecfe9 Gerrit-Change-Number: 9173 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:37:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 11:37:59 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: Add jitter buffer on the uplink receiver Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9212 Change subject: legacy-mgcp: Add jitter buffer on the uplink receiver ...................................................................... legacy-mgcp: Add jitter buffer on the uplink receiver Default usage values are defined in mgcp node, and can be per-BSC overriden on each bsc node This commit is a forward-port of openbsc.git Change-Id Ibf3932adc07442fb5e9c7a06404853f9d0a20959. Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e --- M include/osmocom/legacy_mgcp/mgcp.h M include/osmocom/legacy_mgcp/mgcp_internal.h M src/libosmo-legacy-mgcp/mgcp_network.c M src/libosmo-legacy-mgcp/mgcp_protocol.c M src/libosmo-legacy-mgcp/mgcp_vty.c 5 files changed, 156 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/12/9212/1 diff --git a/include/osmocom/legacy_mgcp/mgcp.h b/include/osmocom/legacy_mgcp/mgcp.h index 147a0d5..7490e37 100644 --- a/include/osmocom/legacy_mgcp/mgcp.h +++ b/include/osmocom/legacy_mgcp/mgcp.h @@ -243,6 +243,12 @@ * message. */ uint16_t osmux_dummy; + + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; }; /* config management */ diff --git a/include/osmocom/legacy_mgcp/mgcp_internal.h b/include/osmocom/legacy_mgcp/mgcp_internal.h index dcc75f1..956bee0 100644 --- a/include/osmocom/legacy_mgcp/mgcp_internal.h +++ b/include/osmocom/legacy_mgcp/mgcp_internal.h @@ -25,6 +25,7 @@ #include #include +#include #define CI_UNUSED 0 @@ -198,6 +199,14 @@ uint32_t octets; } stats; } osmux; + + /* Jitter buffer */ + struct osmo_jibuf* bts_jb; + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; }; #define for_each_line(line, save) \ @@ -335,3 +344,8 @@ } int mgcp_msg_terminate_nul(struct msgb *msg); + +/** + * Internal jitter buffer related + */ +void mgcp_dejitter_udp_send(struct msgb *msg, void *data); diff --git a/src/libosmo-legacy-mgcp/mgcp_network.c b/src/libosmo-legacy-mgcp/mgcp_network.c index 8ccfb42..7b161d2 100644 --- a/src/libosmo-legacy-mgcp/mgcp_network.c +++ b/src/libosmo-legacy-mgcp/mgcp_network.c @@ -584,6 +584,36 @@ return rc; } +void mgcp_dejitter_udp_send(struct msgb *msg, void *data) +{ + struct mgcp_rtp_end *rtp_end = (struct mgcp_rtp_end *) data; + + int rc = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, + rtp_end->rtp_port, (char*) msg->data, msg->len); + if (rc != msg->len) + LOGP(DLMGCP, LOGL_ERROR, + "Failed to send data after jitter buffer: %d\n", rc); + msgb_free(msg); +} + +static int enqueue_dejitter(struct osmo_jibuf *jb, struct mgcp_rtp_end *rtp_end, char *buf, int len) +{ + struct msgb *msg; + msg = msgb_alloc(len, "mgcp-jibuf"); + if (!msg) + return -1; + + memcpy(msg->data, buf, len); + msgb_put(msg, len); + + if (osmo_jibuf_enqueue(jb, msg) < 0) { + rtp_end->dropped_packets += 1; + msgb_free(msg); + } + + return len; +} + int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, struct sockaddr_in *addr, char *buf, int rc) { @@ -591,6 +621,7 @@ struct mgcp_rtp_end *rtp_end; struct mgcp_rtp_state *rtp_state; int tap_idx; + struct osmo_jibuf *jb; LOGP(DLMGCP, LOGL_DEBUG, "endpoint %x dest %s tcfg->audio_loop %d endp->conn_mode %d (== loopback: %d)\n", @@ -612,10 +643,12 @@ rtp_end = &endp->net_end; rtp_state = &endp->bts_state; tap_idx = MGCP_TAP_NET_OUT; + jb = endp->bts_jb; } else { rtp_end = &endp->bts_end; rtp_state = &endp->net_state; tap_idx = MGCP_TAP_BTS_OUT; + jb = NULL; } LOGP(DLMGCP, LOGL_DEBUG, "endpoint %x dest %s net_end %s %d %d bts_end %s %d %d rtp_end %s %d %d\n", @@ -680,9 +713,12 @@ rtp_state->patched_first_rtp_payload = true; } - rc = mgcp_udp_send(rtp_end->rtp.fd, - &rtp_end->addr, - rtp_end->rtp_port, buf, len); + if (jb) + rc = enqueue_dejitter(jb, rtp_end, buf, len); + else + rc = mgcp_udp_send(rtp_end->rtp.fd, + &rtp_end->addr, + rtp_end->rtp_port, buf, len); if (rc <= 0) return rc; diff --git a/src/libosmo-legacy-mgcp/mgcp_protocol.c b/src/libosmo-legacy-mgcp/mgcp_protocol.c index 4e82233..854b4ba 100644 --- a/src/libosmo-legacy-mgcp/mgcp_protocol.c +++ b/src/libosmo-legacy-mgcp/mgcp_protocol.c @@ -863,6 +863,11 @@ goto error2; } + /* Apply Jiter buffer settings for this endpoint, they can be overriden by CRCX policy later */ + endp->bts_use_jibuf = endp->cfg->bts_use_jibuf; + endp->bts_jitter_delay_min = endp->cfg->bts_jitter_delay_min; + endp->bts_jitter_delay_max = endp->cfg->bts_jitter_delay_max; + endp->allocated = 1; /* set up RTP media parameters */ @@ -898,6 +903,13 @@ case MGCP_POLICY_DEFER: /* stop processing */ create_transcoder(endp); + /* Set up jitter buffer if required after policy has updated jibuf endp values */ + if (endp->bts_use_jibuf) { + endp->bts_jb = osmo_jibuf_alloc(tcfg->endpoints); + osmo_jibuf_set_min_delay(endp->bts_jb, endp->bts_jitter_delay_min); + osmo_jibuf_set_max_delay(endp->bts_jb, endp->bts_jitter_delay_max); + osmo_jibuf_set_dequeue_cb(endp->bts_jb, mgcp_dejitter_udp_send, &endp->net_end); + } return NULL; break; case MGCP_POLICY_CONT: @@ -906,6 +918,14 @@ } } + /* Set up jitter buffer if required after policy has updated jibuf endp values */ + if (endp->bts_use_jibuf) { + endp->bts_jb = osmo_jibuf_alloc(tcfg->endpoints); + osmo_jibuf_set_min_delay(endp->bts_jb, endp->bts_jitter_delay_min); + osmo_jibuf_set_max_delay(endp->bts_jb, endp->bts_jitter_delay_max); + osmo_jibuf_set_dequeue_cb(endp->bts_jb, mgcp_dejitter_udp_send, &endp->net_end); + } + LOGP(DLMGCP, LOGL_DEBUG, "Creating endpoint on: 0x%x CI: %u port: %u/%u\n", ENDPOINT_NUMBER(endp), endp->ci, endp->net_end.local_port, endp->bts_end.local_port); @@ -1373,6 +1393,9 @@ void mgcp_release_endp(struct mgcp_endpoint *endp) { LOGP(DLMGCP, LOGL_DEBUG, "Releasing endpoint on: 0x%x\n", ENDPOINT_NUMBER(endp)); + if (endp->bts_jb) + osmo_jibuf_delete(endp->bts_jb); + endp->bts_jb = NULL; endp->ci = CI_UNUSED; endp->allocated = 0; diff --git a/src/libosmo-legacy-mgcp/mgcp_vty.c b/src/libosmo-legacy-mgcp/mgcp_vty.c index 7b11422..be884cb 100644 --- a/src/libosmo-legacy-mgcp/mgcp_vty.c +++ b/src/libosmo-legacy-mgcp/mgcp_vty.c @@ -29,6 +29,7 @@ #include #include +#include #define RTCP_OMIT_STR "Drop RTCP packets in both directions\n" #define RTP_PATCH_STR "Modify RTP packet header in both directions\n" @@ -164,6 +165,13 @@ vty_out(vty, " osmux dummy %s%s", g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE); } + if (g_cfg->bts_use_jibuf) + vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); + if (g_cfg->bts_jitter_delay_min) + vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + if (g_cfg->bts_jitter_delay_max) + vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -241,6 +249,11 @@ if (g_cfg->osmux) vty_out(vty, "Osmux used CID: %d%s", osmux_used_cid(), VTY_NEWLINE); + vty_out(vty, "Jitter Buffer by default on Uplink : %s%s", + g_cfg->bts_use_jibuf ? "on" : "off", VTY_NEWLINE); + if (g_cfg->bts_use_jibuf) + vty_out(vty, "Jitter Buffer delays: min=%"PRIu32" max=%"PRIu32"%s", + g_cfg->bts_jitter_delay_min, g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } @@ -1344,6 +1357,63 @@ return CMD_SUCCESS; } +#define DEJITTER_STR "Uplink Jitter Buffer" +DEFUN(cfg_mgcp_bts_use_jibuf, + cfg_mgcp_bts_use_jibuf_cmd, + "bts-jitter-buffer", + DEJITTER_STR "\n") +{ + g_cfg->bts_use_jibuf = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_no_bts_use_jibuf, + cfg_mgcp_no_bts_use_jibuf_cmd, + "no bts-jitter-buffer", + NO_STR DEJITTER_STR "\n") +{ + g_cfg->bts_use_jibuf = false; + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_bts_jitter_delay_min, + cfg_mgcp_bts_jitter_delay_min_cmd, + "bts-jitter-buffer-delay-min <1-65535>", + DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n") +{ + g_cfg->bts_jitter_delay_min = atoi(argv[0]); + if (!g_cfg->bts_jitter_delay_min) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (g_cfg->bts_jitter_delay_min && g_cfg->bts_jitter_delay_max && + g_cfg->bts_jitter_delay_min > g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \ + "bts-jitter-buffer-delay-max.%s", VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_bts_jitter_delay_max, + cfg_mgcp_bts_jitter_delay_max_cmd, + "bts-jitter-buffer-delay-max <1-65535>", + DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n") +{ + g_cfg->bts_jitter_delay_max = atoi(argv[0]); + if (!g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (g_cfg->bts_jitter_delay_min && g_cfg->bts_jitter_delay_max && + g_cfg->bts_jitter_delay_min > g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \ + "bts-jitter-buffer-delay-min.%s", VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + int mgcp_vty_init(void) { install_element_ve(&show_mgcp_cmd); @@ -1411,6 +1481,10 @@ install_element(MGCP_NODE, &cfg_mgcp_osmux_dummy_cmd); install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_use_jibuf_cmd); + install_element(MGCP_NODE, &cfg_mgcp_no_bts_use_jibuf_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_jitter_delay_min_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_jitter_delay_max_cmd); install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd); -- To view, visit https://gerrit.osmocom.org/9212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e Gerrit-Change-Number: 9212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:38:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 11:38:00 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: switch to new osmux output APIs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9213 Change subject: legacy-mgcp: switch to new osmux output APIs ...................................................................... legacy-mgcp: switch to new osmux output APIs Older ones are being deprecated as they may generate interleaved packets. This commit is a forward-port of openbsc.git Change-Id I189564fc63139c15314db8975afd423c7153ea32. Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 --- M src/libosmo-legacy-mgcp/mgcp_osmux.c 1 file changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/13/9213/1 diff --git a/src/libosmo-legacy-mgcp/mgcp_osmux.c b/src/libosmo-legacy-mgcp/mgcp_osmux.c index 743d3f9..b53e2b5 100644 --- a/src/libosmo-legacy-mgcp/mgcp_osmux.c +++ b/src/libosmo-legacy-mgcp/mgcp_osmux.c @@ -267,7 +267,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -297,8 +296,7 @@ endp->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &endp->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -359,7 +357,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -389,8 +386,7 @@ endp->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &endp->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_net_cb, endp); + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -470,9 +466,13 @@ switch (endp->cfg->role) { case MGCP_BSC_NAT: endp->type = MGCP_OSMUX_BSC_NAT; + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, + scheduled_tx_net_cb, endp); break; case MGCP_BSC: endp->type = MGCP_OSMUX_BSC; + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, + scheduled_tx_bts_cb, endp); break; } endp->osmux.state = OSMUX_STATE_ENABLED; @@ -484,6 +484,11 @@ { LOGP(DLMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n", ENDPOINT_NUMBER(endp), endp->osmux.cid); + + /* We are closing, we don't need pending RTP packets to be transmitted */ + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, NULL, NULL); + osmux_xfrm_output_flush(&endp->osmux.out); + osmux_xfrm_input_close_circuit(endp->osmux.in, endp->osmux.cid); endp->osmux.state = OSMUX_STATE_DISABLED; endp->osmux.cid = -1; -- To view, visit https://gerrit.osmocom.org/9213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 Gerrit-Change-Number: 9213 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 11:42:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 11:42:56 +0000 Subject: Change in osmo-bsc[master]: nat: Add jitter buffer on the uplink receiver Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9214 Change subject: nat: Add jitter buffer on the uplink receiver ...................................................................... nat: Add jitter buffer on the uplink receiver Default usage values are defined in mgcp node, and can be per-BSC overriden on each bsc node. This commit is a forward-port of openbsc.git Change-Id Ibf3932adc07442fb5e9c7a06404853f9d0a20959. Depends on osmo-mgw.git Change-Id Ie19a64ac09f9d51f2434ad0d7925610fc919a90e. Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 --- M include/osmocom/bsc/bsc_nat.h M src/osmo-bsc_nat/bsc_mgcp_utils.c M src/osmo-bsc_nat/bsc_nat_vty.c 3 files changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/9214/1 diff --git a/include/osmocom/bsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h index 6146c00..bd78b9d 100644 --- a/include/osmocom/bsc/bsc_nat.h +++ b/include/osmocom/bsc/bsc_nat.h @@ -175,6 +175,16 @@ /* Osmux is enabled/disabled per BSC */ int osmux; + + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; + /* Enabled if explicitly configured through VTY: */ + bool bts_use_jibuf_override; + bool bts_jitter_delay_min_override; + bool bts_jitter_delay_max_override; }; struct bsc_lac_entry { diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c index bf6d0ad..ab06a5e 100644 --- a/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -585,6 +585,17 @@ if (state == MGCP_ENDP_CRCX) { struct sockaddr_in sock; + /* set up jitter buffer parameters */ + if (bsc_endp->bsc->cfg->bts_use_jibuf_override) + mgcp_endp->bts_use_jibuf = bsc_endp->bsc->cfg->bts_use_jibuf; + + if (bsc_endp->bsc->cfg->bts_jitter_delay_min_override) + mgcp_endp->bts_jitter_delay_min = bsc_endp->bsc->cfg->bts_jitter_delay_min; + + if (bsc_endp->bsc->cfg->bts_jitter_delay_max_override) + mgcp_endp->bts_jitter_delay_max = bsc_endp->bsc->cfg->bts_jitter_delay_max; + + /* Annotate the allocated Osmux CID until the bsc confirms that * it agrees to use Osmux for this voice flow. */ diff --git a/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c index 64608bd..5d8d0c7 100644 --- a/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/src/osmo-bsc_nat/bsc_nat_vty.c @@ -173,6 +173,12 @@ vty_out(vty, " osmux only%s", VTY_NEWLINE); break; } + if (bsc->bts_use_jibuf_override) + vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE); + if (bsc->bts_jitter_delay_min_override) + vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); + if (bsc->bts_jitter_delay_max_override) + vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); } static int config_write_bsc(struct vty *vty) @@ -1231,6 +1237,71 @@ return CMD_SUCCESS; } +#define DEJITTER_STR "Uplink Jitter Buffer" +DEFUN(cfg_bsc_bts_use_jibuf, + cfg_bsc_bts_use_jibuf_cmd, + "bts-jitter-buffer", + DEJITTER_STR "\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_use_jibuf = true; + conf->bts_use_jibuf_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_no_bts_use_jibuf, + cfg_bsc_no_bts_use_jibuf_cmd, + "no bts-jitter-buffer", + NO_STR DEJITTER_STR "\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_use_jibuf = false; + conf->bts_use_jibuf_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_bts_jitter_delay_min, + cfg_bsc_bts_jitter_delay_min_cmd, + "bts-jitter-buffer-delay-min <1-65535>", + DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_jitter_delay_min = atoi(argv[0]); + if (!conf->bts_jitter_delay_min) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max && + conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \ + "bts-jitter-buffer-delay-max.%s", VTY_NEWLINE); + return CMD_WARNING; + } + conf->bts_jitter_delay_min_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_bts_jitter_delay_max, + cfg_bsc_bts_jitter_delay_max_cmd, + "bts-jitter-buffer-delay-max <1-65535>", + DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_jitter_delay_max = atoi(argv[0]); + if (!conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max && + conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \ + "bts-jitter-buffer-delay-min.%s", VTY_NEWLINE); + return CMD_WARNING; + } + conf->bts_jitter_delay_max_override = true; + return CMD_SUCCESS; +} + int bsc_nat_vty_init(struct bsc_nat *nat) { _nat = nat; @@ -1318,6 +1389,10 @@ install_element(NAT_BSC_NODE, &cfg_bsc_paging_grp_cmd); install_element(NAT_BSC_NODE, &cfg_bsc_no_paging_grp_cmd); install_element(NAT_BSC_NODE, &cfg_bsc_osmux_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_use_jibuf_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_no_bts_use_jibuf_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_min_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_max_cmd); mgcp_vty_init(); -- To view, visit https://gerrit.osmocom.org/9214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 Gerrit-Change-Number: 9214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:02:11 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9211/2/src/libmsc/subscr_conn.c File src/libmsc/subscr_conn.c: https://gerrit.osmocom.org/#/c/9211/2/src/libmsc/subscr_conn.c at 211 PS2, Line 211: * The LU expiry timer will restart once the connection is closed. */ do we need an extra field for this? Doesn't every subscribe with active connections have subscr->conn != NULL and we can simply check on that? It's not a strong argument, but if we have the information already somewhere, we shouldn't duplicate it. Or are there other reasons to stop/halt/pause expirtation? -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 17 May 2018 12:02:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:03:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:03:29 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9213 ) Change subject: legacy-mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 Gerrit-Change-Number: 9213 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 12:03:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:03:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:03:33 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9212 ) Change subject: legacy-mgcp: Add jitter buffer on the uplink receiver ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e Gerrit-Change-Number: 9212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 May 2018 12:03:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:05:29 +0000 Subject: Change in libosmocore[master]: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not mul... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9207 ) Change subject: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 12:05:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:05:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:05:31 +0000 Subject: Change in libosmocore[master]: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not mul... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9207 ) Change subject: gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits ...................................................................... gsm: kasumi: Fix dynamic-stack-buffer-overflow on out buffers not multiple of 64 bits Fixes following AddressSanitizer report during gea_test run with gcc 8.1.0: ==8899==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 0x7ffc5f1719bb at pc 0x7fe574adc5fe bp 0x7ffc5f171460 sp 0x7ffc5f171450 WRITE of size 1 at 0x7ffc5f1719bb thread T0 #0 0x7fe574adc5fd in osmo_store64be_ext ../../include/osmocom/core/bit64gen.h:75 #1 0x7fe574adc649 in osmo_store64be ../../include/osmocom/core/bit64gen.h:104 #2 0x7fe574ade936 in _kasumi_kgcore libosmocore/src/gsm/kasumi.c:186 #3 0x7fe574ae2532 in gea4 libosmocore/src/gsm/gea.c:44 #4 0x7fe574ae266c in gea3 libosmocore/src/gsm/gea.c:60 #5 0x7fe574a9b616 in gprs_cipher_run libosmocore/src/gsm/gprs_cipher_core.c:95 #6 0x56422d3fb2ee in test_gea libosmocore/tests/gea/gea_test.c:29 #7 0x56422d3fb506 in main libosmocore/tests/gea/gea_test.c:49 #8 0x7fe5730f406a in __libc_start_main (/usr/lib/libc.so.6+0x2306a) #9 0x56422d3fadf9 in _start (libosmocore/tests/gea/.libs/lt-gea_test+0x1df9) The kasumi_test is updated to calculate the entire array of bits according to expected result. Before this commit it worked by writing the entire last 64bit block, and addressSanitizer cannot catch it because the allocated buffer is 64bit aligned too. Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 --- M src/gsm/kasumi.c M tests/kasumi/kasumi_test.c 2 files changed, 15 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gsm/kasumi.c b/src/gsm/kasumi.c index 7de5cd0..f93c002 100644 --- a/src/gsm/kasumi.c +++ b/src/gsm/kasumi.c @@ -159,6 +159,7 @@ } } +/* if cl is not multiple of 8 (a byte), co needs to be sized on the upper bound so the entire byte can be written. */ void _kasumi_kgcore(uint8_t CA, uint8_t cb, uint32_t cc, uint8_t cd, const uint8_t *ck, uint8_t *co, uint16_t cl) { uint16_t KLi1[8], KLi2[8], KOi1[8], KOi2[8], KOi3[8], KIi1[8], KIi2[8], KIi3[8], i; @@ -181,8 +182,16 @@ _kasumi_key_expand(ck, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); /* i is a block counter */ - for (i = 0; i < cl / 64 + 1; i++) { + for (i = 0; i < cl / 64; i++) { BLK = _kasumi(A ^ i ^ BLK, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); osmo_store64be(BLK, co + (i * 8)); } + + /* Last 64-byte unaligned round. Take also into account last bits non-byte aligned. */ + uint8_t bytes_remain = cl/8%8 + (cl%8 ? 1 : 0); + if (bytes_remain) { + BLK = _kasumi(A ^ (cl / 64) ^ BLK, KLi1, KLi2, KOi1, KOi2, KOi3, KIi1, KIi2, KIi3); + BLK = BLK >> (8-bytes_remain)*8; + osmo_store64be_ext(BLK, co + (cl / 64 * 8), bytes_remain); + } } diff --git a/tests/kasumi/kasumi_test.c b/tests/kasumi/kasumi_test.c index f0f173b..963ce77 100644 --- a/tests/kasumi/kasumi_test.c +++ b/tests/kasumi/kasumi_test.c @@ -109,27 +109,27 @@ uint8_t _Key1[] = {0x2B, 0xD6, 0x45, 0x9F, 0x82, 0xC5, 0xBC, 0x00, 0x2B, 0xD6, 0x45, 0x9F, 0x82, 0xC5, 0xBC, 0x00}, _gamma1[] = {0x88, 0x9E, 0xEA, 0xAF, 0x9E, 0xD1, 0xBA, 0x1A, 0xBB, 0xD8, 0x43, 0x62, 0x32, 0xE4, 0x57, 0x28, 0xD0, 0x1A, 0xA8, 0x91, 0x33, 0xDA, 0x73, 0xC1, 0x1E, 0xAB, 0x68, 0xB7, 0xD8, 0x9B, 0xC8, 0x41}; - _kasumi_kgcore(0xF, 0, 0x0024F20F, 0, _Key1, gamma, 228); + _kasumi_kgcore(0xF, 0, 0x0024F20F, 0, _Key1, gamma, 32*8); printf ("KGCORE Test Set 1: %d\n", _compare_mem(gamma, _gamma1, 32)); uint8_t _Key2[] = {0x95, 0x2C, 0x49, 0x10, 0x48, 0x81, 0xFF, 0x48, 0x95, 0x2C, 0x49, 0x10, 0x48, 0x81, 0xFF, 0x48}, _gamma2[] = {0xFB, 0x4D, 0x5F, 0xBC, 0xEE, 0x13, 0xA3, 0x33, 0x89, 0x28, 0x56, 0x86, 0xE9, 0xA5, 0xC9, 0x42, 0x40, 0xDE, 0x38, 0x15, 0x01, 0x15, 0xF1, 0x5F, 0x8D, 0x9D, 0x98, 0xB9, 0x1A, 0x94, 0xB2, 0x96}; - _kasumi_kgcore(0xF, 0, 0x00061272, 0, _Key2, gamma, 228); + _kasumi_kgcore(0xF, 0, 0x00061272, 0, _Key2, gamma, 32*8); printf ("KGCORE Test Set 2: %d\n", _compare_mem(gamma, _gamma2, 32)); uint8_t _Key3[] = {0xEF, 0xA8, 0xB2, 0x22, 0x9E, 0x72, 0x0C, 0x2A, 0xEF, 0xA8, 0xB2, 0x22, 0x9E, 0x72, 0x0C, 0x2A}, _gamma3[] = {0x0E, 0x40, 0x15, 0x75, 0x5A, 0x33, 0x64, 0x69, 0xC3, 0xDD, 0x86, 0x80, 0xE3, 0x03, 0x5B, 0xC4, 0x19, 0xA7, 0x8A, 0xD3, 0x86, 0x2C, 0x10, 0x90, 0xC6, 0x8A, 0x39, 0x1F, 0xE8, 0xA6, 0xAD, 0xEB}; - _kasumi_kgcore(0xF, 0, 0x0033FD3F, 0, _Key3, gamma, 228); + _kasumi_kgcore(0xF, 0, 0x0033FD3F, 0, _Key3, gamma, 32*8); printf ("KGCORE Test Set 3: %d\n", _compare_mem(gamma, _gamma3, 32)); uint8_t _Key4[] = {0x5A, 0xCB, 0x1D, 0x64, 0x4C, 0x0D, 0x51, 0x20, 0x4E, 0xA5, 0x5A, 0xCB, 0x1D, 0x64, 0x4C, 0x0D}, _gamma4[] = {0xE0, 0x95, 0x30, 0x6A, 0xD5, 0x08, 0x6E, 0x2E, 0xAC, 0x7F, 0x31, 0x07, 0xDE, 0x4F, 0xA2, 0x2D, 0xC1, 0xDF, 0xC9, 0x7D, 0x5B, 0xC5, 0x66, 0x1D, 0xD6, 0x09, 0x6F, 0x47, 0x6A, 0xED, 0xC6, 0x4B}; - _kasumi_kgcore(0xF, 0, 0x00156B26, 0, _Key4, gamma, 228); + _kasumi_kgcore(0xF, 0, 0x00156B26, 0, _Key4, gamma, 32*8); printf ("KGCORE Test Set 4: %d\n", _compare_mem(gamma, _gamma4, 32)); uint8_t _Key5[] = {0xD3, 0xC5, 0xD5, 0x92, 0x32, 0x7F, 0xB1, 0x1C, 0x40, 0x35, 0xC6, 0x68, 0x0A, 0xF8, 0xC6, 0xD1}, _gamma5[] = {0xDC, 0xE6, 0x43, 0x62, 0xAB, 0x5F, 0x89, 0xC1, 0x1E, 0xF0, 0xB3, 0x05, 0x16, 0x65, 0x70, 0xF4, 0x88, 0x9D, 0x55, 0x11, 0xE9, 0xE3, 0x57, 0x5D, 0x06, 0x2B, 0x5C, 0xED, 0x60, 0x39, 0x50, 0x6A}; - _kasumi_kgcore(0xF, 0, 0x000A59B4, 0, _Key5, gamma, 228); + _kasumi_kgcore(0xF, 0, 0x000A59B4, 0, _Key5, gamma, 32*8); printf ("KGCORE Test Set 5: %d\n", _compare_mem(gamma, _gamma5, 32)); return 0; -- To view, visit https://gerrit.osmocom.org/9207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7b2a0224a3b5527d5a3ad7e17efc73081b63eac1 Gerrit-Change-Number: 9207 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:08:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:08:36 +0000 Subject: Change in osmocom-bb[master]: Minor Typo Changes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9210 ) Change subject: Minor Typo Changes ...................................................................... Patch Set 1: Code-Review-2 this is not a typo. The libosmocore here is a "git subtree" of libosmocore.git in order to use a specific fixed old version whcih we know will work inside the firmware. We don't make modifications to this subtree here. See http://osmocom.org/issues/2378 for how this should be solved in general: By ensuring the "embedded" build of libosmocore works inside the osmocomBB firmware, followed by removing this subtree from osmocom-bb.git. -- To view, visit https://gerrit.osmocom.org/9210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I69126638d81d98ce8236cae543515c8dc743f404 Gerrit-Change-Number: 9210 Gerrit-PatchSet: 1 Gerrit-Owner: Nikos Balkanas Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 12:08:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:09:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:09:52 +0000 Subject: Change in osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8054 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-Change-Number: 8054 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 12:09:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:10:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 12:10:52 +0000 Subject: Change in osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8055 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-Change-Number: 8055 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 12:10:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:22:56 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 12:22:56 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9211/2/src/libmsc/subscr_conn.c File src/libmsc/subscr_conn.c: https://gerrit.osmocom.org/#/c/9211/2/src/libmsc/subscr_conn.c at 211 PS2, Line 211: * The LU expiry timer will restart once the connection is closed. */ > do we need an extra field for this? Doesn't every subscribe with active connections have subscr->co [?] Yes we need an extra field. subscr->conn != NULL is not a sufficient condition. We want to stop the expiry timer only if the connection FSM makes it all the way into ACCEPTED state. If a connection does not enter ACCEPTED state the timer should keep ticking. E.g. we don't want failed location updates to reset this timer. -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 17 May 2018 12:22:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 12:33:04 +0000 Subject: Change in osmo-mgw[master]: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9215 Change subject: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat ...................................................................... mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat This commit actually doesn't fix the entire code, since anyway osmux conns are not supported and mgcp_conn_get_rtp() will return NULL. However, it makes the code more logical and easier to understand once somebody refactors the code to make it work again. Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/15/9215/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 1d3cab3..bdc285b 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -326,7 +326,7 @@ struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; - struct mgcp_conn_rtp *conn_net = NULL; + struct mgcp_conn_rtp *conn_bts = NULL; msg = osmux_recv(ofd, &addr); if (!msg) @@ -345,8 +345,8 @@ &addr.sin_addr, MGCP_DEST_NET); /* FIXME: Get rid of CONN_ID_XXX! */ - conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); - if (!conn_net) + conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS); + if (!conn_bts) goto out; if (!endp) { @@ -355,11 +355,11 @@ osmuxh->circuit_id); goto out; } - conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_net->osmux.stats.chunks++; + conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_bts->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_net->osmux.out, &list); + osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list); osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); } out: -- To view, visit https://gerrit.osmocom.org/9215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 Gerrit-Change-Number: 9215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:33:04 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 12:33:04 +0000 Subject: Change in osmo-mgw[master]: mgcp: switch to new osmux output APIs Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9216 Change subject: mgcp: switch to new osmux output APIs ...................................................................... mgcp: switch to new osmux output APIs Older ones are being deprecated as they may generate interleaved packets. Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/16/9216/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index bdc285b..281595c 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -322,7 +322,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -359,8 +358,7 @@ conn_bts->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); + osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); } out: msgb_free(msg); @@ -426,7 +424,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -463,8 +460,7 @@ conn_net->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_net->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_net_cb, endp); + osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); } out: msgb_free(msg); @@ -553,9 +549,13 @@ switch (endp->cfg->role) { case MGCP_BSC_NAT: conn->type = MGCP_OSMUX_BSC_NAT; + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, + scheduled_tx_net_cb, endp); break; case MGCP_BSC: conn->type = MGCP_OSMUX_BSC; + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, + scheduled_tx_bts_cb, endp); break; } @@ -576,6 +576,11 @@ LOGP(DLMGCP, LOGL_INFO, "Releasing connection %s using Osmux CID %u\n", conn->conn->id, conn->osmux.cid); + + /* We are closing, we don't need pending RTP packets to be transmitted */ + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL); + osmux_xfrm_output_flush(&conn->osmux.out); + osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid); conn->osmux.state = OSMUX_STATE_DISABLED; conn->osmux.cid = -1; -- To view, visit https://gerrit.osmocom.org/9216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf Gerrit-Change-Number: 9216 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:53:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 12:53:44 +0000 Subject: Change in osmo-bsc[master]: show all global counters of osmo-bsc in vty Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9217 Change subject: show all global counters of osmo-bsc in vty ...................................................................... show all global counters of osmo-bsc in vty The 'show statistics' VTY command was not showing all counters maintained by osmo-bsc. Instead of printing just two counters related to paging, print all available counters in a generic way. Adjust descriptions of some counters for nicer display. After startup (all counters are zero) is now looks like this: OsmoBSC# show statistics handover:attempted: 0 Received handover attempts. handover:no_channel: 0 Sent no channel available responses. handover:timeout: 0 Timeouts of timer T3103. handover:completed: 0 Received handover completed. handover:failed: 0 Received HO FAIL messages. paging:attempted: 0 Paging attempts for a subscriber. paging:detached: 0 Paging request send failures because no responsible BTS was found. paging:responded: 0 Paging attempts with successful response. OsmoBSC# Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bsc_vty.c 2 files changed, 11 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/9217/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 29b97f0..6365938 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1133,12 +1133,12 @@ static const struct rate_ctr_desc bsc_ctr_description[] = { [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover:attempted", "Received handover attempts."}, [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover:no_channel", "Sent no channel available responses."}, - [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Count the amount of timeouts of timer T3103."}, + [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Timeouts of timer T3103."}, [BSC_CTR_HANDOVER_COMPLETED] = {"handover:completed", "Received handover completed."}, - [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Receive HO FAIL messages."}, + [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Received HO FAIL messages."}, [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber."}, - [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, + [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found."}, [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response."}, }; diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index ea4c8d0..e53a14f 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -4133,12 +4133,16 @@ return CMD_SUCCESS; } +int print_counter(struct rate_ctr_group *bsc_ctrs, struct rate_ctr *ctr, const struct rate_ctr_desc *desc, void *data) +{ + struct vty *vty = data; + vty_out(vty, "%25s: %10"PRIu64" %s%s", desc->name, ctr->current, desc->description, VTY_NEWLINE); + return 0; +} + void openbsc_vty_print_statistics(struct vty *vty, struct gsm_network *net) { - vty_out(vty, "Paging : %"PRIu64" attempted, %"PRIu64" responded%s", - net->bsc_ctrs->ctr[BSC_CTR_PAGING_ATTEMPTED].current, - net->bsc_ctrs->ctr[BSC_CTR_PAGING_RESPONDED].current, - VTY_NEWLINE); + rate_ctr_for_each_counter(net->bsc_ctrs, print_counter, vty); } DEFUN(drop_bts, -- To view, visit https://gerrit.osmocom.org/9217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Gerrit-Change-Number: 9217 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 12:53:45 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 12:53:45 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9218 Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... add counter for connection attempts from BTS with unknown unit id Add a global counter to the BSC which shows the number of failed OML connections attempts due to a unit_id mismatch between the BSC and the BTS. Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bts_ipaccess_nanobts.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/9218/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6365938..aacb2d5 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1128,6 +1128,7 @@ BSC_CTR_PAGING_ATTEMPTED, BSC_CTR_PAGING_DETACHED, BSC_CTR_PAGING_RESPONDED, + BSC_CTR_BTS_UNKNOWN_UNIT_ID, }; static const struct rate_ctr_desc bsc_ctr_description[] = { @@ -1140,6 +1141,8 @@ [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber."}, [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found."}, [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response."}, + + [BSC_CTR_BTS_UNKNOWN_UNIT_ID] = {"oml:bts_unknown_unit_id", "OML connection attempts from BTS with unknown unit ID."}, }; diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index d5b3b21..b4d213a 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -468,6 +468,7 @@ LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for " " %u/%u/%u, disconnecting\n", dev->site_id, dev->bts_id, dev->trx_id); + rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_BTS_UNKNOWN_UNIT_ID]); return NULL; } DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 13:12:46 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 May 2018 13:12:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_n... Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/9219 Change subject: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_nothing ...................................................................... MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_nothing This should fix the bogus failures we are seeing in this test. The pcap usually shows that the Clear Command does arrive after about 5 seconds, but sometimes the internal timer fires before that. Double the timeout of the test here. Change-Id: I998cfb52a3813dd9f76d3787e4d0d448752ec847 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/9219/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index edaa61b..56ac3d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1173,7 +1173,7 @@ f_perform_lu(); f_establish_fully(); - f_expect_clear(); + f_expect_clear(10.0); } testcase TC_establish_and_nothing() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/9219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I998cfb52a3813dd9f76d3787e4d0d448752ec847 Gerrit-Change-Number: 9219 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 13:41:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 13:41:52 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9220 Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... remove redundant unconditional PKG_CHECK_MODULES for libsmpp The configure script should only check for libsmpp with --enable-smpp. Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Fixes: a55dda703fc5e367bd58b5f9f6986d62ffbbdb6c Related: If7e1af11cdac8587bb4d66fb4eacee4b79945359 Related: OS#3232 --- M configure.ac 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/9220/1 diff --git a/configure.ac b/configure.ac index deee84b..c02b74d 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 13:54:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 13:54:50 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 13:54:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 13:55:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 13:55:49 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 13:55:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 13:57:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 13:57:47 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 1: I think the commit you are fixing added this: smpp_mirror_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ $(NULL) which means if smpp is not checked unconditionally, it will fail because LIBSMPP34_CFLAGS will not be set. You need to conditionally build that one. Check also if there are more related changes required please. -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 13:57:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 14:09:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 17 May 2018 14:09:24 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9220 to look at the new patch set (#2). Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... remove redundant unconditional PKG_CHECK_MODULES for libsmpp The configure script should only check for libsmpp with --enable-smpp. Also, disable the build of smpp_mirror with --disable-smpp. NOTE: This is probably not done yet. Still need to check if the test suite is happy because it contains related tests. Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Fixes: a55dda703fc5e367bd58b5f9f6986d62ffbbdb6c Related: If7e1af11cdac8587bb4d66fb4eacee4b79945359 Related: OS#3232 --- M configure.ac M src/utils/Makefile.am M tests/smpp/Makefile.am 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/9220/2 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 14:10:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 14:10:54 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: After out of band discussion, the issue I pointed out seems to actually not be a problem, but we have seen some stuff can still be improved which needs to be set only conditionally depending on HAVE_SMPP. -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 14:10:54 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 14:12:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 14:12:22 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am File tests/smpp/Makefile.am: https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am at 1 PS2, Line 1: if BUILD_SMPP It's probably cleaner to move this if to tests/Makefile.am when we add it to SUBDIR. -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 14:12:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:30:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:30:47 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/7992 ) Change subject: move creation of insert subscriber data messages to a common function ...................................................................... Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/7992/5/src/gsup_server.c File src/gsup_server.c: https://gerrit.osmocom.org/#/c/7992/5/src/gsup_server.c at 377 PS5, Line 377: int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, char *imsi, char *msisdn, imsi and msisdn should be const, as laforge requested earlier -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 17 May 2018 15:30:47 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:34:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:34:24 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am File tests/smpp/Makefile.am: https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am at 1 PS2, Line 1: if BUILD_SMPP > It's probably cleaner to move this if to tests/Makefile.am when we add it to SUBDIR. we also put Makefile paths in configure.ac and can't do that conditionally, so not 100% sure that we should make the entire subdir conditional? -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 15:34:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:35:07 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:35:07 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_n... In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9219 ) Change subject: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_nothing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I998cfb52a3813dd9f76d3787e4d0d448752ec847 Gerrit-Change-Number: 9219 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 15:35:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:38:03 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:38:03 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 1: Code-Review+2 maybe we should also count the successful BTS connections to add perspective to this counter -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 15:38:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:41:57 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:41:57 +0000 Subject: Change in osmo-bsc[master]: show all global counters of osmo-bsc in vty In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9217 ) Change subject: show all global counters of osmo-bsc in vty ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/9217/1/src/libbsc/bsc_vty.c File src/libbsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/9217/1/src/libbsc/bsc_vty.c at 4136 PS1, Line 4136: int print_counter(struct rate_ctr_group *bsc_ctrs, struct rate_ctr *ctr, const struct rate_ctr_desc *desc, void *data) (was gonna say "const" but this is adhering to rate_ctr_handler_t) -- To view, visit https://gerrit.osmocom.org/9217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Gerrit-Change-Number: 9217 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 15:41:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:44:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:44:14 +0000 Subject: Change in osmo-mgw[master]: mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9216 ) Change subject: mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) I have no idea about this API https://gerrit.osmocom.org/#/c/9216/1/src/libosmo-mgcp/mgcp_osmux.c File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/#/c/9216/1/src/libosmo-mgcp/mgcp_osmux.c at 553 PS1, Line 553: scheduled_tx_net_cb, endp); (weird indenting choice ... we typically align with '(' or use one tab) -- To view, visit https://gerrit.osmocom.org/9216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf Gerrit-Change-Number: 9216 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 15:44:14 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:46:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 15:46:14 +0000 Subject: Change in osmo-mgw[master]: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9215 ) Change subject: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat ...................................................................... Patch Set 1: Code-Review+1 can't claim that I understand -- To view, visit https://gerrit.osmocom.org/9215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 Gerrit-Change-Number: 9215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 17 May 2018 15:46:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:54:41 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 17 May 2018 15:54:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_n... In-Reply-To: References: Message-ID: daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/9219 ) Change subject: MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_nothing ...................................................................... MSC_Tests: Extend timeout waiting for Clear Cmd in TC_establish_and_nothing This should fix the bogus failures we are seeing in this test. The pcap usually shows that the Clear Command does arrive after about 5 seconds, but sometimes the internal timer fires before that. Double the timeout of the test here. Change-Id: I998cfb52a3813dd9f76d3787e4d0d448752ec847 --- M msc/MSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index edaa61b..56ac3d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1173,7 +1173,7 @@ f_perform_lu(); f_establish_fully(); - f_expect_clear(); + f_expect_clear(10.0); } testcase TC_establish_and_nothing() runs on MTC_CT { var BSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/9219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I998cfb52a3813dd9f76d3787e4d0d448752ec847 Gerrit-Change-Number: 9219 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 15:55:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 15:55:18 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: We do that in osmo-trx and it works fine: https://git.osmocom.org/osmo-trx/tree/Transceiver52M/device/Makefile.am -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 15:55:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:16:48 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 16:16:48 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9221 Change subject: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb ...................................................................... jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/9221/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index a43580c..48150c7 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -15,6 +15,7 @@ - osmo-pcu - osmo-sgsn - osmo-trx + - osmocom-bb - osmo-nitb: triggered-by: master-openbsc - osmo-stp: @@ -85,6 +86,8 @@ name: OSMO_GSM_TESTER_BUILD_osmo_pcu - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_trx + - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmocom_bb scm: - osmo-gsm-tester-repo -- To view, visit https://gerrit.osmocom.org/9221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 Gerrit-Change-Number: 9221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:19:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 16:19:43 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: Record repo curr rev in have_repo instead of build_repo Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9222 Change subject: contrib: common: Record repo curr rev in have_repo instead of build_repo ...................................................................... contrib: common: Record repo curr rev in have_repo instead of build_repo This way scripts making use only of have_repo (to have build specific insturctions) can still benefit from that code. Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 --- M contrib/jenkins-build-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/9222/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 39046ef..9d85622 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -91,6 +91,8 @@ git rev-parse HEAD + echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" + cd "$base" } @@ -122,8 +124,6 @@ cd "$dep" - echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" - # special shim: we know the openbsc.git needs to be built in the openbsc/ subdir. if [ "$dep" = "openbsc" ]; then cd openbsc -- To view, visit https://gerrit.osmocom.org/9222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 Gerrit-Change-Number: 9222 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 16:19:44 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: create_bin_tgz supports sbin dir now Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9223 Change subject: contrib: common: create_bin_tgz supports sbin dir now ...................................................................... contrib: common: create_bin_tgz supports sbin dir now Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-mgw.sh 4 files changed, 31 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/9223/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 9d85622..79509bc 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -139,32 +139,42 @@ make install } +prune_files() { + bindir="$1" + wanted_binaries="$2" + + if [ ! -d "$prefix_real"/$bindir ]; then return; fi + # remove binaries not intended to originate from this build + cd "$prefix_real"/$bindir + for f in * ; do + if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then + rm "$f" + fi + done + + # ensure requested binaries indeed exist + for b in $wanted_binaries ; do + if [ ! -f "$b" ]; then + set +x; echo "ERROR: no such binary: $b in $prefix_real/$bindir/"; set -x + ls -1 "$prefix_real/$bindir" + exit 1 + fi + done +} + create_bin_tgz() { # build the archive that is going to be copied to the tester - wanted_binaries="$@" + wanted_binaries_bin="$1" + wanted_binaries_sbin="$2" - if [ -z "$wanted_binaries" ]; then + if [ -z "$wanted_binaries_bin" ] && [ -z "$wanted_binaries_sbin" ]; then set +x; echo "ERROR: create_bin_tgz needs a list of permitted binaries"; set -x exit 1 fi - # remove binaries not intended to originate from this build - cd "$prefix_real"/bin - for f in * ; do - if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then - rm "$f" - fi - done - - # ensure requested binaries indeed exist - for b in $wanted_binaries ; do - if [ ! -f "$b" ]; then - set +x; echo "ERROR: no such binary: $b in $prefix_real/bin/"; set -x - ls -1 "$prefix_real/bin" - exit 1 - fi - done + prune_files bin "$wanted_binaries_bin" + prune_files sbin "$wanted_binaries_sbin" cd "$prefix_real" this="$name.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 73e71e5..4081a00 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -11,4 +11,4 @@ build_repo osmo-mgw --enable-sanitize build_repo osmo-bsc --enable-sanitize -create_bin_tgz osmo-bsc abisip-find ipaccess-config +create_bin_tgz "osmo-bsc abisip-find ipaccess-config" diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index b40c613..e5fab5d 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -10,4 +10,4 @@ build_repo libosmo-abis --enable-sanitize build_repo osmo-bts --enable-sanitize --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers -create_bin_tgz osmo-bts-trx osmo-bts-octphy +create_bin_tgz "osmo-bts-trx osmo-bts-octphy" diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index d4ff0b9..43473c6 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -9,4 +9,4 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo osmo-mgw --enable-sanitize -create_bin_tgz osmo-bsc_mgcp osmo-mgw +create_bin_tgz "osmo-bsc_mgcp osmo-mgw" -- To view, visit https://gerrit.osmocom.org/9223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 Gerrit-Change-Number: 9223 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:19:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 16:19:44 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9224 Change subject: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon ...................................................................... contrib: Add jenkins-build-osmocom-bb.sh to build osmocon Change-Id: Ic5b29951d3fd143dce5826138c84301a9797b1ef --- A contrib/jenkins-build-osmocom-bb.sh 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/24/9224/1 diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh new file mode 100755 index 0000000..f54518a --- /dev/null +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -0,0 +1,24 @@ +#!/bin/sh +set -e -x + +base="$PWD" +name="osmocom-bb" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --disable-doxygen + +have_repo osmocom-bb +cd osmocom-bb/ + +cd src/host/osmocon/ +set +x; echo; echo; set -x +autoreconf -fi +set +x; echo; echo; set -x +./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts +set +x; echo; echo; set -x +make -j4 +set +x; echo; echo; set -x +make install + + +create_bin_tgz "" "osmocon" -- To view, visit https://gerrit.osmocom.org/9224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5b29951d3fd143dce5826138c84301a9797b1ef Gerrit-Change-Number: 9224 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:25:06 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:25:06 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 2: Code-Review-1 (13 comments) https://gerrit.osmocom.org/#/c/9211/2/include/osmocom/msc/gsm_subscriber.h File include/osmocom/msc/gsm_subscriber.h: https://gerrit.osmocom.org/#/c/9211/2/include/osmocom/msc/gsm_subscriber.h at 20 PS2, Line 20: #define GSM_SUBSCRIBER_NO_EXPIRATION 0x0 interesting that it existed before, but I would prefer these values moving into the libvlr code now. After all it is specifically about VLR expiry. And then I'd call them VLR_SUBSRC_*, not GSM_* https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 469 PS2, Line 469: /* Table 10.5.33: The T3212 timeout value is coded as the (why not use the entire line width. hint in vim: Visual-Line mark the comment and enter gw to automatically re-align the line widths to the value set in 'set textwidth=N'. With 'set cindent' vim even edits the '*' markers for you automatically.) The "Table X" info is pretty useless without the "3GPP TS XX.YYY" spec. https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 471 PS2, Line 471: * periodic updating in decihours. Mark the subscriber as "decihours" lol https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 473 PS2, Line 473: * Timeout is twice the t3212 value plus one minute */ lol "twice plus one minute" wtf https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 479 PS2, Line 479: vsub->imsi, vsub->id); use vlr_subscr_name() (see below) https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 481 PS2, Line 481: vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; hmm. we should always be getting the time, right? If not, then what do we prefer, "memory leaks" of subscribers sticking around, or a subscriber being thrown out early and needing to do another LU later? I actually think rather the latter. So I think I'd set expire_lu = 1 so it always gets expired? https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 503 PS2, Line 503: LOGP(DVLR, LOGL_DEBUG, "IMSI=%s id=%llu: Location Update expired\n", vsub->imsi, vsub->id); use vlr_subscr_name(). We use that all over, and we might at some point tweak its output, which would then match everywhere, including here. https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 1192 PS2, Line 1192: osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); (for me it would make sense to keep osmo_timer_setup() right next to osmo_timer_schedule() below) https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr_lu_fsm.c at 359 PS2, Line 359: /* Balanced by vlr_subscr_rx_imsi_detach() or Location Update expiry */ let's rather say "by vlr_subscr_expire()", which is accurate for both cases. https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_test_no_authen.c File tests/msc_vlr/msc_vlr_test_no_authen.c: https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_test_no_authen.c at 929 PS2, Line 929: maybe you should set an explicit t3212 here to make the test independent from default values possibly changing one day (meaning different timer values ending up in the checked log output) https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_test_no_authen.c at 971 PS2, Line 971: OSMO_ASSERT(vsub); also assert that lu_success flag and the periodic timer value being != that GSM_SUBSCRIBER_NO_EXPIRATION value? https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_test_no_authen.c at 973 PS2, Line 973: I would add a fake_time_passes() here of just under the expiration time and assert that the subscriber is still around, and then pass that last minute of fake time and assert it is gone. (somehow make sure the periodic lu cleanup timer has also fired, probably by enough fake time passing, as you apparently do). Note that fake_time is quite precise since it is not subject to real time passing, and you should be able to stay even a millisecond below / a millisecond above to not trigger / trigger the timer (as long as the periodic cleanup function gets invoked); however, i've never used fake time with MONOTONIC before, I hope that works? https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_tests.h File tests/msc_vlr/msc_vlr_tests.h: https://gerrit.osmocom.org/#/c/9211/2/tests/msc_vlr/msc_vlr_tests.h at 221 PS2, Line 221: osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ ah. nice. -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 17 May 2018 16:25:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:26:02 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:26:02 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9224 ) Change subject: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic5b29951d3fd143dce5826138c84301a9797b1ef Gerrit-Change-Number: 9224 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 16:26:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:33:01 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: create_bin_tgz supports sbin dir now In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9223 ) Change subject: contrib: common: create_bin_tgz supports sbin dir now ...................................................................... Patch Set 1: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/9223/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9223/1//COMMIT_MSG at 7 PS1, Line 7: contrib: common: create_bin_tgz supports sbin dir now "add support for sbin dir binaries" And add the reason why: which of our packages installs sbin binaries!? https://gerrit.osmocom.org/#/c/9223/1/contrib/jenkins-build-common.sh File contrib/jenkins-build-common.sh: https://gerrit.osmocom.org/#/c/9223/1/contrib/jenkins-build-common.sh at 146 PS1, Line 146: if [ ! -d "$prefix_real"/$bindir ]; then return; fi since it is now a shell var, include it in the quotes "$prefix_real/$bindir" not that we would ever have bin dirs with spaces, it's just nitpicking. https://gerrit.osmocom.org/#/c/9223/1/contrib/jenkins-build-common.sh at 168 PS1, Line 168: wanted_binaries_bin="$1" so now all callers need to pass binaries in quotes, including spaces in the quotes... well, ok then. -- To view, visit https://gerrit.osmocom.org/9223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 Gerrit-Change-Number: 9223 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 16:33:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:33:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:33:47 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: Record repo curr rev in have_repo instead of build_repo In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9222 ) Change subject: contrib: common: Record repo curr rev in have_repo instead of build_repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 Gerrit-Change-Number: 9222 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 16:33:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:34:20 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:34:20 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9221 ) Change subject: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 Gerrit-Change-Number: 9221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 16:34:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 16:36:36 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 16:36:36 +0000 Subject: Change in osmo-bsc[master]: bsc_api.c: actually log with context In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/7996 ) Change subject: bsc_api.c: actually log with context ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/7996/1/src/libbsc/bsc_api.c File src/libbsc/bsc_api.c: https://gerrit.osmocom.org/#/c/7996/1/src/libbsc/bsc_api.c at 47 PS1, Line 47: #define LOGPLCHAN(lchan, ss, level, fmt, args...) \ > I think this should go in a header file so it can be used from more code agreed -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-Change-Number: 7996 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 16:36:36 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 17:13:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 17:13:35 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9225 Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... jobs: osmo-gsm-tester-runner: Add ttcn3 job Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b --- M jobs/osmo-gsm-tester-runner.yml A jobs/osmo-gsm-tester_ttcn3.sh 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/9225/1 diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 5e1ff92..d6bece9 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -7,6 +7,7 @@ jobs: - 'osmo-gsm-tester_run-{stage}' - 'osmo-gsm-tester_gerrit' + - 'osmo-gsm-tester_ttcn3' - scm: name: osmo-gsm-tester-gerrit @@ -166,3 +167,29 @@ - junit: results: 'trial-*/last_run/trial-*.xml' allow-empty-results: true + +# ttcn3 job +- job: + name: 'osmo-gsm-tester_ttcn3' + defaults: runner + scm: + - 'osmo-gsm-tester-gerrit' + triggers: + - timed: "H H/2 * * *" + - pollscm: + cron: "H/5 * * * *" + builders: + - shell: | + # make sure no bin artifacts from a previous run remain + rm -f *.tgz *.md5 + - copy_artifact_all + - copy_artifact: + repo: osmo-gsm-tester_build-osmocom-bb + - shell: !include-raw: osmo-gsm-tester_ttcn3.sh + publishers: + - archive: + artifacts: '*-run.tgz, *-bin.tgz' + default-excludes: false + - junit: + results: 'trial-*/last_run/trial-*.xml' + allow-empty-results: true diff --git a/jobs/osmo-gsm-tester_ttcn3.sh b/jobs/osmo-gsm-tester_ttcn3.sh new file mode 100644 index 0000000..f2b974f --- /dev/null +++ b/jobs/osmo-gsm-tester_ttcn3.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e -x + +# On our hardware, we actually use the example configuration as-is. +export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/ttcn3" + +# debug: provoke a failure +#export OSMO_GSM_TESTER_OPTS="-s debug -t fail" + +unlink osmo-gsm-tester/ttcn3/resources.conf || true +ln -s resources.conf.prod osmo-gsm-tester/ttcn3/resources.conf + +PATH="$PWD/osmo-gsm-tester/src:$PATH" \ + ./osmo-gsm-tester/ttcn3/jenkins-run.sh -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 17:14:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 17 May 2018 17:14:33 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 1: Code-Review-1 Don't merge this one, I couldn't verify it yet since current master of osmo-gsm-tester-runner.yml is broken, fails with error: FileNotFoundError: [Errno 2] No such file or directory: 'osmo-gsm-tester_run-{stage}.sh' I already pinged lynxis about it. -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 17 May 2018 17:14:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 18:34:45 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 17 May 2018 18:34:45 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 1: works for me. I'm using jjb 2.0 -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Thu, 17 May 2018 18:34:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:04:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:04:29 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9221 ) Change subject: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 Gerrit-Change-Number: 9221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 20:04:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:05:01 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: Record repo curr rev in have_repo instead of build_repo In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9222 ) Change subject: contrib: common: Record repo curr rev in have_repo instead of build_repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 Gerrit-Change-Number: 9222 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 20:05:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:06:46 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 17 May 2018 20:06:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:07:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:07:27 +0000 Subject: Change in osmo-mgw[master]: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9215 ) Change subject: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 Gerrit-Change-Number: 9215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 17 May 2018 20:07:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:11:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:11:06 +0000 Subject: Change in osmo-bsc[master]: show all global counters of osmo-bsc in vty In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9217 ) Change subject: show all global counters of osmo-bsc in vty ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/9217/1/src/libbsc/bsc_vty.c File src/libbsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/9217/1/src/libbsc/bsc_vty.c at 4143 PS1, Line 4143: void openbsc_vty_print_statistics(struct vty *vty, struct gsm_network *net) We can merge this patch first, but I think it would be actually nice to have this as part of libosmocore. It should be the same for all applications, as it's truly generic. libosmovty depends on libosmocore, and rate_ctr are in libosmcoore, i.e. anyone using libosmovty should automatically get the "print statistics" installed. Maybe we should call it "print rate-counters" instead, as this will not clash with any existing VTY commands code like this installs inside the applications, so we can handle this in a graceful way (old programs with new libosmocore, ...) -- To view, visit https://gerrit.osmocom.org/9217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Gerrit-Change-Number: 9217 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 20:11:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:13:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:13:16 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9218/1/src/libbsc/bts_ipaccess_nanobts.c File src/libbsc/bts_ipaccess_nanobts.c: https://gerrit.osmocom.org/#/c/9218/1/src/libbsc/bts_ipaccess_nanobts.c at 471 PS1, Line 471: rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_BTS_UNKNOWN_UNIT_ID]); this code is inserted *before* you know it's an OML or a RSL connection. The dispatch between OML/RSL is further down below in the switch statement. So technically, you don't know it's an OML connection. I guess the best way is to rename the counter and description (and possibly commit log message) to simply say "Connections with unknown IPA CCM Unit ID" without referring to OML or RSL explicitly. -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 17 May 2018 20:13:16 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:13:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:13:29 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has removed a vote on this change. Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Removed Code-Review+2 by Neels Hofmeyr -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: deleteVote Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:13:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:13:52 +0000 Subject: Change in osmo-bsc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8055 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code The function a_reset_free() is not used anywhere at the code. The reason for this is that a BSC instance is never cleared once it is started up. Also the timer number is not according to the spec. - Remove a_reset_free() - Fix timer identification number (T4) - use fi->priv to hold context info - Fix sourcecode formatting Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Related: OS#3102 --- M include/osmocom/bsc/a_reset.h M include/osmocom/bsc/bsc_msc_data.h M src/libbsc/a_reset.c M src/libbsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_sigtran.c 7 files changed, 77 insertions(+), 105 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/a_reset.h b/include/osmocom/bsc/a_reset.h index c01a8b0..6b6ce81 100644 --- a/include/osmocom/bsc/a_reset.h +++ b/include/osmocom/bsc/a_reset.h @@ -20,41 +20,17 @@ #pragma once - - -/* Reset context data (callbacks, state machine etc...) */ -struct a_reset_ctx { - - /* FSM instance, which handles the reset procedure */ - struct osmo_fsm_inst *fsm; - - /* Connection failure counter. When this counter - * reaches a certain threshold, the reset procedure - * will be triggered */ - int conn_loss_counter; - - /* Callback function to be called when a connection - * failure is detected and a rest must occur */ - void (*cb)(void *priv); - - /* Privated data for the callback function */ - void *priv; -}; - /* Create and start state machine which handles the reset/reset-ack procedure */ -struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv); - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset); +struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, void *priv); /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct a_reset_ctx *reset); +void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm); /* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset); +void a_reset_conn_fail(struct osmo_fsm_inst *reset_fsm); /* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset); +void a_reset_conn_success(struct osmo_fsm_inst *reset_fsm); /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct a_reset_ctx *reset); +bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm); diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index bedf412..345724d 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -124,7 +124,9 @@ struct osmo_sccp_addr msc_addr; char *msc_addr_name; - struct a_reset_ctx *reset; + /* Pointer to the osmo-fsm that controls the + * BSSMAP RESET procedure */ + struct osmo_fsm_inst *reset_fsm; } a; }; diff --git a/src/libbsc/a_reset.c b/src/libbsc/a_reset.c index 1fccc5f..b8f8c8c 100644 --- a/src/libbsc/a_reset.c +++ b/src/libbsc/a_reset.c @@ -29,16 +29,31 @@ #include #include -#define RESET_RESEND_INTERVAL 2 /* sec */ -#define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ +#define RESET_RESEND_INTERVAL 2 /* sec */ +#define RESET_RESEND_TIMER_NO 4 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.1 */ #define BAD_CONNECTION_THRESOLD 3 /* connection failures */ -enum fsm_states { +/* Reset context data (callbacks, state machine etc...) */ +struct reset_ctx { + /* Connection failure counter. When this counter + * reaches a certain threshold, the reset procedure + * will be triggered */ + int conn_loss_counter; + + /* Callback function to be called when a connection + * failure is detected and a rest must occur */ + void (*cb)(void *priv); + + /* Privated data for the callback function */ + void *priv; +}; + +enum reset_fsm_states { ST_DISC, /* Disconnected from remote end */ ST_CONN, /* We have a confirmed connection */ }; -enum fsm_evt { +enum reset_fsm_evt { EV_RESET_ACK, /* got reset acknowlegement from remote end */ EV_N_DISCONNECT, /* lost a connection */ EV_N_CONNECT, /* made a successful connection */ @@ -54,31 +69,30 @@ /* Disconnected state */ static void fsm_disc_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct a_reset_ctx *reset = (struct a_reset_ctx *)data; - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection succeded.\n"); + struct reset_ctx *reset_ctx = (struct reset_ctx *)fi->priv; + OSMO_ASSERT(reset_ctx); + LOGPFSML(fi, LOGL_NOTICE, "SIGTRAN connection succeded.\n"); - reset->conn_loss_counter = 0; + reset_ctx->conn_loss_counter = 0; osmo_fsm_inst_state_chg(fi, ST_CONN, 0, 0); } /* Connected state */ static void fsm_conn_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct a_reset_ctx *reset = (struct a_reset_ctx *)data; - OSMO_ASSERT(reset); + struct reset_ctx *reset_ctx = (struct reset_ctx *)fi->priv; + OSMO_ASSERT(reset_ctx); switch (event) { case EV_N_DISCONNECT: - if (reset->conn_loss_counter >= BAD_CONNECTION_THRESOLD) { - LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection down, reconnecting...\n"); + if (reset_ctx->conn_loss_counter >= BAD_CONNECTION_THRESOLD) { + LOGPFSML(fi, LOGL_NOTICE, "SIGTRAN connection down, reconnecting...\n"); osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); } else - reset->conn_loss_counter++; + reset_ctx->conn_loss_counter++; break; case EV_N_CONNECT: - reset->conn_loss_counter = 0; + reset_ctx->conn_loss_counter = 0; break; } } @@ -86,18 +100,18 @@ /* Timer callback to retransmit the reset signal */ static int fsm_reset_ack_timeout_cb(struct osmo_fsm_inst *fi) { - struct a_reset_ctx *reset = (struct a_reset_ctx *)fi->priv; - OSMO_ASSERT(reset->fsm); + struct reset_ctx *reset_ctx = (struct reset_ctx *)fi->priv; + OSMO_ASSERT(reset_ctx); - LOGPFSML(reset->fsm, LOGL_NOTICE, "(re)sending BSSMAP RESET message...\n"); + LOGPFSML(fi, LOGL_NOTICE, "(re)sending BSSMAP RESET message...\n"); - reset->cb(reset->priv); + reset_ctx->cb(reset_ctx->priv); osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); return 0; } -static struct osmo_fsm_state fsm_states[] = { +static struct osmo_fsm_state reset_fsm_states[] = { [ST_DISC] = { .in_event_mask = (1 << EV_RESET_ACK), .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN), @@ -115,96 +129,76 @@ /* State machine definition */ static struct osmo_fsm fsm = { .name = "A-RESET", - .states = fsm_states, - .num_states = ARRAY_SIZE(fsm_states), + .states = reset_fsm_states, + .num_states = ARRAY_SIZE(reset_fsm_states), .log_subsys = DMSC, .timer_cb = fsm_reset_ack_timeout_cb, .event_names = fsm_event_names, }; /* Create and start state machine which handles the reset/reset-ack procedure */ -struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv) +struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, void *priv) { OSMO_ASSERT(name); - struct a_reset_ctx *reset; + struct reset_ctx *reset_ctx; + struct osmo_fsm_inst *reset_fsm; /* Register the fsm description (if not already done) */ if (osmo_fsm_find_by_name(fsm.name) != &fsm) osmo_fsm_register(&fsm); /* Allocate and configure a new fsm instance */ - reset = talloc_zero(ctx, struct a_reset_ctx); - OSMO_ASSERT(reset); - reset->priv = priv; - reset->cb = cb; - reset->conn_loss_counter = 0; - reset->fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, name); - OSMO_ASSERT(reset->fsm); - reset->fsm->priv = reset; + reset_ctx = talloc_zero(ctx, struct reset_ctx); + OSMO_ASSERT(reset_ctx); + reset_ctx->priv = priv; + reset_ctx->cb = cb; + reset_ctx->conn_loss_counter = 0; + reset_fsm = osmo_fsm_inst_alloc(&fsm, ctx, reset_ctx, LOGL_DEBUG, name); + OSMO_ASSERT(reset_fsm); /* kick off reset-ack sending mechanism */ - osmo_fsm_inst_state_chg(reset->fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); + osmo_fsm_inst_state_chg(reset_fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); - return reset; -} - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset) -{ - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_free(reset->fsm); - reset->fsm = NULL; - - memset(reset, 0, sizeof(*reset)); - talloc_free(reset); + return reset_fsm; } /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct a_reset_ctx *reset) +void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm) { - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_RESET_ACK, reset); + OSMO_ASSERT(reset_fsm); + osmo_fsm_inst_dispatch(reset_fsm, EV_RESET_ACK, NULL); } /* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset) +void a_reset_conn_fail(struct osmo_fsm_inst *reset_fsm) { /* If no reset context is supplied, just drop the info */ - if (!reset) + if (!reset_fsm) return; - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_DISCONNECT, reset); + osmo_fsm_inst_dispatch(reset_fsm, EV_N_DISCONNECT, NULL); } /* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset) +void a_reset_conn_success(struct osmo_fsm_inst *reset_fsm) { /* If no reset context is supplied, just drop the info */ - if (!reset) + if (!reset_fsm) return; - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_CONNECT, reset); + osmo_fsm_inst_dispatch(reset_fsm, EV_N_CONNECT, NULL); } /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct a_reset_ctx *reset) +bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm) { /* If no reset context is supplied, we assume that * the connection can't be ready! */ - if (!reset) + if (!reset_fsm) return false; - OSMO_ASSERT(reset->fsm); - if (reset->fsm->state == ST_CONN) + if (reset_fsm->state == ST_CONN) return true; return false; diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 7f53f1b..3e0ccc0 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -1075,7 +1075,7 @@ * could indicate a bad SCCP connection. We now inform the the * FSM that controls the BSSMAP reset about the event. Maybe * a BSSMAP reset is necessary. */ - a_reset_conn_fail(conn->sccp.msc->a.reset); + a_reset_conn_fail(conn->sccp.msc->a.reset_fsm); /* Since we could not reach the MSC, we give up and terminate * the FSM instance now (N-DISCONNET.req is sent in diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index 239bb54..8c16bde 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -44,7 +44,7 @@ return false; /* Reset procedure not (yet) executed */ - if (a_reset_conn_ready(conn->sccp.msc->a.reset) == false) + if (a_reset_conn_ready(conn->sccp.msc->a.reset_fsm) == false) return false; return true; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index bfa4091..24dbc95 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -208,7 +208,7 @@ /* Inform the FSM that controls the RESET/RESET-ACK procedure * that we have successfully received the reset-ack message */ - a_reset_ack_confirm(msc->a.reset); + a_reset_ack_confirm(msc->a.reset_fsm); return 0; } diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 1a31a7c..e3d4829 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -205,7 +205,7 @@ /* Incoming data is a sign of a vital connection */ conn = get_bsc_conn_by_conn_id(scu_prim->u.data.conn_id); if (conn) { - a_reset_conn_success(conn->sccp.msc->a.reset); + a_reset_conn_success(conn->sccp.msc->a.reset_fsm); handle_data_from_msc(conn, oph->msg); } break; @@ -249,7 +249,7 @@ LOGP(DMSC, LOGL_NOTICE, "Initializing resources for new SIGTRAN connection to MSC: %s...\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); - if (a_reset_conn_ready(msc->a.reset) == false) { + if (a_reset_conn_ready(msc->a.reset_fsm) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); return BSC_CON_REJECT_NO_LINK; } @@ -279,7 +279,7 @@ msc = conn->sccp.msc; - if (a_reset_conn_ready(msc->a.reset) == false) { + if (a_reset_conn_ready(msc->a.reset_fsm) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); return -EINVAL; } @@ -333,7 +333,7 @@ } else LOGP(DMSC, LOGL_ERROR, "Tx MSC (message too short)\n"); - if (a_reset_conn_ready(msc->a.reset) == false) { + if (a_reset_conn_ready(msc->a.reset_fsm) == false) { LOGP(DMSC, LOGL_ERROR, "MSC is not connected. Dropping.\n"); return -EINVAL; } @@ -487,8 +487,8 @@ return -EINVAL; /* Start MSC-Reset procedure */ - msc->a.reset = a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb, msc); - if (!msc->a.reset) + msc->a.reset_fsm = a_reset_alloc(msc, msc_name, osmo_bsc_sigtran_reset_cb, msc); + if (!msc->a.reset_fsm) return -EINVAL; /* If we have detected that the SS7 configuration of the MSC we have just initalized -- To view, visit https://gerrit.osmocom.org/8055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I72095d52304c520e383755eee6c889bce492cbd4 Gerrit-Change-Number: 8055 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 20:14:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 17 May 2018 20:14:01 +0000 Subject: Change in osmo-msc[master]: a_reset: cleanup + remove dead code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8054 ) Change subject: a_reset: cleanup + remove dead code ...................................................................... a_reset: cleanup + remove dead code a_reset.c/h was originally developed to be used in both, bsc and msc without changes. Unfortunately no suitable library has been found for a_reset.c/h so the file ended up as duplicated code in both split brances. Eventually we decided to specialize the generalized code again, which means some of the functions needed only by osmo-bsc are removed. - Remove dead code - Fix timer identification number (T16) - use fi->priv to hold context info - Minor cosmetic fixes Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Depends: libosmocore I36d221c973d3890721ef1d376fb9be82c4311378 Related: OS#3103 --- M include/osmocom/msc/a_iface.h M include/osmocom/msc/a_reset.h M src/libmsc/a_iface.c M src/libmsc/a_iface_bssap.c M src/libmsc/a_reset.c 5 files changed, 59 insertions(+), 159 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/a_iface.h b/include/osmocom/msc/a_iface.h index 3098b51..217011d 100644 --- a/include/osmocom/msc/a_iface.h +++ b/include/osmocom/msc/a_iface.h @@ -51,7 +51,7 @@ /* A pointer to the reset handler FSM, the * state machine is allocated when the BSC * is registerd. */ - struct a_reset_ctx *reset; + struct osmo_fsm_inst *reset_fsm; /* A pointer to the sccp_user that is associated * with the A interface. We need this information diff --git a/include/osmocom/msc/a_reset.h b/include/osmocom/msc/a_reset.h index cdb17c2..8eb3bbf 100644 --- a/include/osmocom/msc/a_reset.h +++ b/include/osmocom/msc/a_reset.h @@ -20,45 +20,12 @@ #pragma once - - -/* Reset context data (callbacks, state machine etc...) */ -struct a_reset_ctx { - - /* FSM instance, which handles the reset procedure */ - struct osmo_fsm_inst *fsm; - - /* Connection failure counter. When this counter - * reaches a certain threshold, the reset procedure - * will be triggered */ - int conn_loss_counter; - - /* A human readable name to display in the logs */ - char name[256]; - - /* Callback function to be called when a connection - * failure is detected and a rest must occur */ - void (*cb)(void *priv); - - /* Privated data for the callback function */ - void *priv; -}; - /* Create and start state machine which handles the reset/reset-ack procedure */ -struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv, - bool already_connected); - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset); +struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, + void *priv, bool already_connected); /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct a_reset_ctx *reset); - -/* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset); - -/* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset); +void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm); /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct a_reset_ctx *reset); +bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm); diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 6f2000e..75fa438 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -209,7 +209,7 @@ /* Deliver paging request to all known BSCs */ llist_for_each_entry(bsc_ctx, &gsm_network->a.bscs, list) { - if (a_reset_conn_ready(bsc_ctx->reset)) { + if (a_reset_conn_ready(bsc_ctx->reset_fsm)) { LOGP(DBSSAP, LOGL_DEBUG, "Tx BSSMAP paging message from MSC %s to BSC %s (imsi=%s, tmsi=0x%08x, lac=%u)\n", osmo_sccp_addr_name(ss7, &bsc_ctx->msc_addr), @@ -471,10 +471,10 @@ void a_start_reset(struct bsc_context *bsc_ctx, bool already_connected) { char bsc_name[32]; - OSMO_ASSERT(bsc_ctx->reset == NULL); + OSMO_ASSERT(bsc_ctx->reset_fsm == NULL); /* Start reset procedure to make the new connection active */ snprintf(bsc_name, sizeof(bsc_name), "bsc-%i", bsc_ctx->bsc_addr.pc); - bsc_ctx->reset = a_reset_alloc(bsc_ctx, bsc_name, a_reset_cb, bsc_ctx, already_connected); + bsc_ctx->reset_fsm = a_reset_alloc(bsc_ctx, bsc_name, a_reset_cb, bsc_ctx, already_connected); } /* determine if given msg is BSSMAP RESET related (true) or not (false) */ @@ -521,7 +521,7 @@ a_start_reset(a_conn_info.bsc, false); } else { /* This BSC is already known to us, check if we have been through reset yet */ - if (a_reset_conn_ready(a_conn_info.bsc->reset) == false) { + if (a_reset_conn_ready(a_conn_info.bsc->reset_fsm) == false) { LOGP(DBSSAP, LOGL_NOTICE, "Refusing N-CONNECT.ind(%u, %s), BSC not reset yet\n", scu_prim->u.connect.conn_id, msgb_hexdump_l2(oph->msg)); rc = osmo_sccp_tx_disconn(scu, a_conn_info.conn_id, &a_conn_info.bsc->msc_addr, @@ -580,7 +580,7 @@ /* As long as we are in the reset phase, only reset related BSSMAP messages may pass * beond here. */ - if (!bssmap_is_reset(oph->msg) && a_reset_conn_ready(a_conn_info.bsc->reset) == false) { + if (!bssmap_is_reset(oph->msg) && a_reset_conn_ready(a_conn_info.bsc->reset_fsm) == false) { LOGP(DBSSAP, LOGL_NOTICE, "Ignoring N-UNITDATA.ind(%s), BSC not reset yet\n", msgb_hexdump_l2(oph->msg)); break; diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 6d5848a..1ace43d 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -114,12 +114,12 @@ /* Make sure all orphand subscriber connections will be cleard */ a_clear_all(scu, &a_conn_info->bsc->bsc_addr); - if (!a_conn_info->bsc->reset) + if (!a_conn_info->bsc->reset_fsm) a_start_reset(a_conn_info->bsc, true); /* Treat an incoming RESET like an ACK to any RESET request we may have just sent. * After all, what we wanted is the A interface to be reset, which we now know has happened. */ - a_reset_ack_confirm(a_conn_info->bsc->reset); + a_reset_ack_confirm(a_conn_info->bsc->reset_fsm); } /* Endpoint to handle BSSMAP reset acknowlegement */ @@ -133,7 +133,7 @@ ss7 = osmo_ss7_instance_find(network->a.cs7_instance); OSMO_ASSERT(ss7); - if (a_conn_info->bsc->reset == NULL) { + if (a_conn_info->bsc->reset_fsm == NULL) { LOGP(DBSSAP, LOGL_ERROR, "Received RESET ACK from an unknown BSC %s, ignoring...\n", osmo_sccp_addr_name(ss7, &a_conn_info->bsc->bsc_addr)); return; @@ -144,7 +144,7 @@ /* Confirm that we managed to get the reset ack message * towards the connection reset logic */ - a_reset_ack_confirm(a_conn_info->bsc->reset); + a_reset_ack_confirm(a_conn_info->bsc->reset_fsm); } /* Handle UNITDATA BSSMAP messages */ diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c index 701066f..1e35a10 100644 --- a/src/libmsc/a_reset.c +++ b/src/libmsc/a_reset.c @@ -28,188 +28,121 @@ #include #include -#define RESET_RESEND_INTERVAL 2 /* sec */ -#define RESET_RESEND_TIMER_NO 1234 /* FIXME: dig out the real timer number */ -#define BAD_CONNECTION_THRESOLD 3 /* connection failures */ +#define RESET_RESEND_INTERVAL 2 /* sec */ +#define RESET_RESEND_TIMER_NO 16 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ -enum fsm_states { +enum reset_fsm_states { ST_DISC, /* Disconnected from remote end */ ST_CONN, /* We have a confirmed connection */ }; -enum fsm_evt { - EV_RESET_ACK, /* got reset acknowlegement from remote end */ - EV_N_DISCONNECT, /* lost a connection */ - EV_N_CONNECT, /* made a successful connection */ +enum reset_fsm_evt { + EV_CONN_ACK, /* Received either BSSMAP RESET or BSSMAP RESET + * ACK from the remote end */ +}; + +/* Reset context data (callbacks, state machine etc...) */ +struct reset_ctx { + /* Callback function to be called when a connection + * failure is detected and a rest must occur */ + void (*cb)(void *priv); + + /* Privated data for the callback function */ + void *priv; }; static const struct value_string fsm_event_names[] = { - OSMO_VALUE_STRING(EV_RESET_ACK), - OSMO_VALUE_STRING(EV_N_DISCONNECT), - OSMO_VALUE_STRING(EV_N_CONNECT), + OSMO_VALUE_STRING(EV_CONN_ACK), {0, NULL} }; /* Disconnected state */ static void fsm_disc_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct a_reset_ctx *reset = (struct a_reset_ctx *)data; - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection succeded.\n"); - - reset->conn_loss_counter = 0; osmo_fsm_inst_state_chg(fi, ST_CONN, 0, 0); } -/* Connected state */ -static void fsm_conn_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct a_reset_ctx *reset = (struct a_reset_ctx *)data; - OSMO_ASSERT(reset); - - switch (event) { - case EV_N_DISCONNECT: - if (reset->conn_loss_counter >= BAD_CONNECTION_THRESOLD) { - LOGPFSML(reset->fsm, LOGL_NOTICE, "SIGTRAN connection down, reconnecting...\n"); - osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); - } else - reset->conn_loss_counter++; - break; - case EV_N_CONNECT: - reset->conn_loss_counter = 0; - break; - } -} - /* Timer callback to retransmit the reset signal */ static int fsm_reset_ack_timeout_cb(struct osmo_fsm_inst *fi) { - struct a_reset_ctx *reset = (struct a_reset_ctx *)fi->priv; - OSMO_ASSERT(reset->fsm); - - LOGPFSML(reset->fsm, LOGL_NOTICE, "(re)sending BSSMAP RESET message...\n"); - - reset->cb(reset->priv); - + struct reset_ctx *reset_ctx = (struct reset_ctx *)fi->priv; + LOGPFSML(fi, LOGL_NOTICE, "(re)sending BSSMAP RESET message...\n"); + reset_ctx->cb(reset_ctx->priv); osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); return 0; } -static struct osmo_fsm_state fsm_states[] = { +static struct osmo_fsm_state reset_fsm_states[] = { [ST_DISC] = { - .in_event_mask = (1 << EV_RESET_ACK), - .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN), + .in_event_mask = (1 << EV_CONN_ACK), + .out_state_mask = (1 << ST_CONN) | (1 << ST_DISC), .name = "DISC", .action = fsm_disc_cb, }, [ST_CONN] = { - .in_event_mask = (1 << EV_N_DISCONNECT) | (1 << EV_N_CONNECT), - .out_state_mask = (1 << ST_DISC) | (1 << ST_CONN), + .in_event_mask = (1 << EV_CONN_ACK), .name = "CONN", - .action = fsm_conn_cb, }, }; /* State machine definition */ static struct osmo_fsm fsm = { .name = "A-RESET", - .states = fsm_states, - .num_states = ARRAY_SIZE(fsm_states), + .states = reset_fsm_states, + .num_states = ARRAY_SIZE(reset_fsm_states), .log_subsys = DMSC, .timer_cb = fsm_reset_ack_timeout_cb, .event_names = fsm_event_names, }; /* Create and start state machine which handles the reset/reset-ack procedure */ -struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, void *priv, - bool already_connected) +struct osmo_fsm_inst *a_reset_alloc(void *ctx, const char *name, void *cb, + void *priv, bool already_connected) { OSMO_ASSERT(name); - struct a_reset_ctx *reset; + struct reset_ctx *reset_ctx; + struct osmo_fsm_inst *reset_fsm; /* Register the fsm description (if not already done) */ if (osmo_fsm_find_by_name(fsm.name) != &fsm) osmo_fsm_register(&fsm); /* Allocate and configure a new fsm instance */ - reset = talloc_zero(ctx, struct a_reset_ctx); - OSMO_ASSERT(reset); - reset->priv = priv; - reset->cb = cb; - reset->conn_loss_counter = 0; - reset->fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, name); - OSMO_ASSERT(reset->fsm); - reset->fsm->priv = reset; + reset_ctx = talloc_zero(ctx, struct reset_ctx); + OSMO_ASSERT(reset_ctx); + reset_ctx->priv = priv; + reset_ctx->cb = cb; + reset_fsm = osmo_fsm_inst_alloc(&fsm, ctx, reset_ctx, LOGL_DEBUG, name); + OSMO_ASSERT(reset_fsm); if (already_connected) - osmo_fsm_inst_state_chg(reset->fsm, ST_CONN, 0, 0); + osmo_fsm_inst_state_chg(reset_fsm, ST_CONN, 0, 0); else { /* kick off reset-ack sending mechanism */ - osmo_fsm_inst_state_chg(reset->fsm, ST_DISC, RESET_RESEND_INTERVAL, + osmo_fsm_inst_state_chg(reset_fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); } - return reset; -} - -/* Tear down state machine */ -void a_reset_free(struct a_reset_ctx *reset) -{ - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_free(reset->fsm); - reset->fsm = NULL; - - memset(reset, 0, sizeof(*reset)); - talloc_free(reset); + return reset_fsm; } /* Confirm that we sucessfully received a reset acknowlege message */ -void a_reset_ack_confirm(struct a_reset_ctx *reset) +void a_reset_ack_confirm(struct osmo_fsm_inst *reset_fsm) { - OSMO_ASSERT(reset); - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_RESET_ACK, reset); -} - -/* Report a failed connection */ -void a_reset_conn_fail(struct a_reset_ctx *reset) -{ - /* If no reset context is supplied, just drop the info */ - if (!reset) - return; - - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_DISCONNECT, reset); -} - -/* Report a successful connection */ -void a_reset_conn_success(struct a_reset_ctx *reset) -{ - /* If no reset context is supplied, just drop the info */ - if (!reset) - return; - - OSMO_ASSERT(reset->fsm); - - osmo_fsm_inst_dispatch(reset->fsm, EV_N_CONNECT, reset); + OSMO_ASSERT(reset_fsm); + osmo_fsm_inst_dispatch(reset_fsm, EV_CONN_ACK, NULL); } /* Check if we have a connection to a specified msc */ -bool a_reset_conn_ready(struct a_reset_ctx *reset) +bool a_reset_conn_ready(struct osmo_fsm_inst *reset_fsm) { /* If no reset context is supplied, we assume that * the connection can't be ready! */ - if (!reset) + if (!reset_fsm) return false; - OSMO_ASSERT(reset->fsm); - if (reset->fsm->state == ST_CONN) + if (reset_fsm->state == ST_CONN) return true; return false; -- To view, visit https://gerrit.osmocom.org/8054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e489eb494d358d130e51cb2167929edeaa12e92 Gerrit-Change-Number: 8054 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu May 17 21:10:14 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 21:10:14 +0000 Subject: Build failure of network:osmocom:nightly/libsmpp34 in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afdefc5b641b_2446846688469021@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libsmpp34/Debian_9.0/aarch64 Package network:osmocom:nightly/libsmpp34 failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libsmpp34 Last lines of build log: [ 268s] [ 245.235034] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 245.895609] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.585067] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.265800] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.945066] dracut-initqueue[459]: Warning: dracut-initqueue timeout - starting timeout scripts [ 271s] [ 247.951958] dracut-initqueue[459]: Warning: Could not boot. [ 271s] Starting Setup Virtual Console... [ 271s] [ OK ] Started Setup Virtual Console. [ 271s] Starting Dracut Emergency Shell... [ 271s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 271s] [ 271s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 328s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_5/root: 30091 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 47121 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/5/build/build-vm: line 458: kill: (30084) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 21:14:48 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 21:14:48 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afdf0d344b5a_2446846688471419@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/aarch64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ *** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ *] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [* ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [*** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ **] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ *] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 328s] /var/cache/obs/worker/root_3/root: 8298 [ 328s] qemu-system-aarch64: terminating on signal 15 from pid 10349 () [ 328s] ### VM INTERACTION END ### [ 328s] /var/run/obs/worker/3/build/build-vm: line 458: kill: (8291) - No such process [ 328s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 328s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 21:15:39 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 21:15:39 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afdf11225196_2446846688472555@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/Debian_9.0/aarch64 Package network:osmocom:nightly/libusrp failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: [ 330s] [ 267.126803] dracut-initqueue[494]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 267.751085] dracut-initqueue[494]: Warning: dracut-initqueue timeout - starting timeout scripts [ 331s] [ 268.346980] dracut-initqueue[494]: Warning: dracut-initqueue timeout - starting timeout scripts [ 332s] [ 269.021229] dracut-initqueue[494]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 269.716912] dracut-initqueue[494]: Warning: dracut-initqueue timeout - starting timeout scripts [ 333s] [ 269.731385] dracut-initqueue[494]: Warning: Could not boot. [ 333s] Starting Setup Virtual Console... [ 333s] [ OK ] Started Setup Virtual Console. [ 333s] Starting Dracut Emergency Shell... [ 333s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 333s] [ 333s] Generating "/run/initramfs/rdsosreport.txt" [ 334s] [ 334s] [ 334s] Entering emergency mode. Exit the shell to continue. [ 334s] Type "journalctl" to view system logs. [ 334s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 334s] after mounting them and attach it to a bug report. [ 334s] [ 334s] [ 368s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 369s] /var/cache/obs/worker/root_20/root: 20755 [ 369s] qemu-system-aarch64: terminating on signal 15 from pid 37534 () [ 369s] ### VM INTERACTION END ### [ 369s] /var/run/obs/worker/20/build/build-vm: line 458: kill: (20738) - No such process [ 369s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 369s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Thu May 17 21:27:05 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 17 May 2018 21:27:05 +0000 Subject: Build failure of network:osmocom:nightly/libasn1c in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5afdf3c270eea_244684668848013b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libasn1c/Debian_9.0/aarch64 Package network:osmocom:nightly/libasn1c failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly libasn1c Last lines of build log: [ 268s] [ 245.474846] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 268s] [ 246.125647] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 269s] [ 246.764860] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 247.395606] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 248.054919] dracut-initqueue[470]: Warning: dracut-initqueue timeout - starting timeout scripts [ 270s] [ 248.061699] dracut-initqueue[470]: Warning: Could not boot. [ 270s] Starting Setup Virtual Console... [ 270s] [ OK ] Started Setup Virtual Console. [ 270s] Starting Dracut Emergency Shell... [ 270s] Warning: /dev/disk/by-uuid/00750419-b769-40be-aa7a-a81dca13c577 does not exist [ 270s] [ 270s] Generating "/run/initramfs/rdsosreport.txt" [ 271s] [ 271s] [ 271s] Entering emergency mode. Exit the shell to continue. [ 271s] Type "journalctl" to view system logs. [ 271s] You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot [ 271s] after mounting them and attach it to a bug report. [ 271s] [ 271s] [ 332s] dracut:/# ### WATCHDOG TRIGGERED, KILLING VM ### [ 333s] /var/cache/obs/worker/root_14/root: 28534 [ 333s] qemu-system-aarch64: terminating on signal 15 from pid 48046 () [ 333s] ### VM INTERACTION END ### [ 333s] /var/run/obs/worker/14/build/build-vm: line 458: kill: (28526) - No such process [ 333s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 333s] or the build host has a kernel or hardware problem... gave up after 12 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 17 22:01:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:01:25 +0000 Subject: Change in osmo-mgw[master]: api doc: fix parameter name for mgcp_conn_create() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9226 Change subject: api doc: fix parameter name for mgcp_conn_create() ...................................................................... api doc: fix parameter name for mgcp_conn_create() Change-Id: Ib6ea230c2e1918bd4e431208610b53e468e534c7 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/26/9226/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 3c755be..6e1e7b8 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -548,7 +548,7 @@ /*! allocate FSM, and create a new connection on the MGW. * \param[in] mgcp MGCP client descriptor. - * \param[in] mgcpparent_fi Parent FSM instance. + * \param[in] parent_fi Parent FSM instance. * \param[in] parent_term_evt Event to be sent to parent when terminating. * \param[in] parent_evt Event to be sent to parent when operation is done. * \param[in] conn_peer Connection parameters (ip, port...). -- To view, visit https://gerrit.osmocom.org/9226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6ea230c2e1918bd4e431208610b53e468e534c7 Gerrit-Change-Number: 9226 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:29:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:29:25 +0000 Subject: Change in osmo-bsc[master]: bsc_api.c: actually log with context In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7996 to look at the new patch set (#2). Change subject: bsc_api.c: actually log with context ...................................................................... bsc_api.c: actually log with context bsc_api.c notoriously lacks log context. Provide gsm_lchan_name() and/or bsc_subscr_name() in roughly a million instances, using new LOGPLCHAN macro. Add LOGPLCHAN() to gsm_data.h, to encourage use of it in other .c files. Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bsc_api.c 2 files changed, 58 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/7996/2 -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-Change-Number: 7996 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:29:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:29:26 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.h: drop unused rsl_chan_activate() declaration Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9227 Change subject: abis_rsl.h: drop unused rsl_chan_activate() declaration ...................................................................... abis_rsl.h: drop unused rsl_chan_activate() declaration Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c --- M include/osmocom/bsc/abis_rsl.h 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/9227/1 diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index b30702f..fc21238 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -41,12 +41,6 @@ int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len); int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len); -int rsl_chan_activate(struct gsm_bts_trx *trx, uint8_t chan_nr, - uint8_t act_type, - struct rsl_ie_chan_mode *chan_mode, - struct rsl_ie_chan_ident *chan_ident, - uint8_t bs_power, uint8_t ms_power, - uint8_t ta); int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref); int rsl_chan_mode_modify_req(struct gsm_lchan *ts); -- To view, visit https://gerrit.osmocom.org/9227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c Gerrit-Change-Number: 9227 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:29:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:29:26 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_dyn_ts.c: make local functions static Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9228 Change subject: cosmetic: bsc_dyn_ts.c: make local functions static ...................................................................... cosmetic: bsc_dyn_ts.c: make local functions static Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 --- M src/libbsc/bsc_dyn_ts.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/9228/1 diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index 6a1cff7..ed7caed 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/src/libbsc/bsc_dyn_ts.c @@ -23,7 +23,7 @@ #include #include -void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts) +static void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts) { int rc; @@ -33,7 +33,7 @@ gsm_ts_name(ts), gsm_pchan_name(ts->pchan)); } -void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) +static void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) { dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); } -- To view, visit https://gerrit.osmocom.org/9228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 Gerrit-Change-Number: 9228 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:29:26 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:29:26 +0000 Subject: Change in osmo-bsc[master]: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9229 Change subject: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or ...................................................................... cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/9229/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index c7181ac..862a761 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -460,8 +460,7 @@ TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, TS_F_PDCH_DEACT_PENDING = 0x4000, - TS_F_PDCH_PENDING_MASK = 0x6000 /*< - TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ + TS_F_PDCH_PENDING_MASK = (TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING), } gsm_bts_trx_ts_flags; /* One Timeslot in a TRX */ -- To view, visit https://gerrit.osmocom.org/9229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 Gerrit-Change-Number: 9229 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:29:27 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:29:27 +0000 Subject: Change in osmo-bsc[master]: cosmetic: logging and ordering in handle_ass_compl() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9230 Change subject: cosmetic: logging and ordering in handle_ass_compl() ...................................................................... cosmetic: logging and ordering in handle_ass_compl() * Check the message length once at the start, before any other actions. * Use only one local gsm48_hdr pointer. * Read the cause value once near the top, re-use it. * Log "ASSIGNMENT COMPLETE" always, not only during handover. * Fully initialize local struct lchan_signal_data. Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 --- M src/libbsc/bsc_api.c 1 file changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/9230/1 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 71cc0f0..c6c1438 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -344,18 +344,27 @@ static void handle_ass_compl(struct gsm_subscriber_connection *conn, struct msgb *msg) { - struct gsm48_hdr *gh; + struct gsm48_hdr *gh = msgb_l3(msg); struct bsc_api *api = conn->network->bsc_api; + enum gsm48_rr_cause cause; + + /* Expecting gsm48_hdr + cause value */ + if (msgb_l3len(msg) != sizeof(*gh) + 1) { + LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR, + "RR Assignment Complete: length invalid: %zu, expected %zu\n", + msgb_l3len(msg), sizeof(*gh) + 1); + return; + } + + cause = gh->data[0]; + + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", + rr_cause_name(cause)); if (conn->ho) { - struct lchan_signal_data sig; - struct gsm48_hdr *gh = msgb_l3(msg); - - LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); - - sig.lchan = msg->lchan; - sig.mr = NULL; + struct lchan_signal_data sig = { + .lchan = msg->lchan, + }; osmo_signal_dispatch(SS_LCHAN, S_LCHAN_ASSIGNMENT_COMPL, &sig); /* FIXME: release old channel */ @@ -366,15 +375,8 @@ } if (conn->secondary_lchan != msg->lchan) { - LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, - "Assignment Compl should occur on second lchan.\n"); - return; - } - - gh = msgb_l3(msg); - if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR, + "RR Assignment Complete does not match conn's secondary lchan.\n"); return; } @@ -391,7 +393,7 @@ if (is_ipaccess_bts(conn_get_bts(conn)) && conn->lchan->tch_mode != GSM48_CMODE_SIGN) rsl_ipacc_crcx(conn->lchan); - api->assign_compl(conn, gh->data[0]); + api->assign_compl(conn, cause); } static void handle_ass_fail(struct gsm_subscriber_connection *conn, -- To view, visit https://gerrit.osmocom.org/9230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 Gerrit-Change-Number: 9230 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:38:15 +0000 Subject: Change in osmo-bsc[master]: cosmetic: logging and ordering in handle_ass_compl() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9230 to look at the new patch set (#2). Change subject: cosmetic: logging and ordering in handle_ass_compl() ...................................................................... cosmetic: logging and ordering in handle_ass_compl() * Check the message length once at the start, before any other actions. * Use only one local gsm48_hdr pointer. * Read the cause value once near the top, re-use it. * Log "ASSIGNMENT COMPLETE" always, not only during handover. * Fully initialize local struct lchan_signal_data. Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 --- M src/libbsc/bsc_api.c 1 file changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/30/9230/2 -- To view, visit https://gerrit.osmocom.org/9230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 Gerrit-Change-Number: 9230 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:39:10 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:39:10 +0000 Subject: Change in openbsc[master]: TEST 6 COMMIT 2 In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/337 ) Change subject: TEST 6 COMMIT 2 ...................................................................... Abandoned wtf is this doing here, two years old cruft got resurrected?? -- To view, visit https://gerrit.osmocom.org/337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: If7e514f350414c8ee8de56f5ebe22d2483437933 Gerrit-Change-Number: 337 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 17 22:39:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 17 May 2018 22:39:23 +0000 Subject: Change in openbsc[master]: TEST 6 COMMIT 1 In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/336 ) Change subject: TEST 6 COMMIT 1 ...................................................................... Abandoned wtf is this doing here, two years old cruft got resurrected?? -- To view, visit https://gerrit.osmocom.org/336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I143701f5e9837df29e6e1ada5026a340ef42c17d Gerrit-Change-Number: 336 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu May 17 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 17 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#37?= In-Reply-To: <859882392.57.1526510481535.JavaMail.jenkins@jenkins.osmocom.org> References: <859882392.57.1526510481535.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <156833654.72.1526596881126.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1872/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-1872/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-1872/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-1872/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-1872/ libtool: install: (cd /tmp/am-dc-1872/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-1872/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-1872/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-1872/ libtool: install: chmod 644 /tmp/am-dc-1872/ libtool: install: ranlib /tmp/am-dc-1872/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-1872/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-1872/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-1872/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1872/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-1872/ /bin/mkdir -p '/tmp/am-dc-1872/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-1872/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-1872/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-1872/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-1872/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-1872/ libtool: uninstall: rm -f /tmp/am-dc-1872/ /tmp/am-dc-1872/ /tmp/am-dc-1872/ /tmp/am-dc-1872/ /tmp/am-dc-1872/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-1872/ && rm -f html.tar ) ( cd '/tmp/am-dc-1872/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-1872/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Fri May 18 00:08:27 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 May 2018 00:08:27 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#479?= Message-ID: <2052953278.75.1526602107465.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 112.13 KB...] checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for LIBOSMOGB... yes checking whether to enable direct DSP access for PDCH of sysmocom-bts... unset checking whether to enable direct PHY access for PDCH of NuRAN Wireless Litecell 1.5 BTS... no checking whether to enable VTY tests... no CFLAGS="-g -O2 -fsanitize=address -fsanitize=undefined" CPPFLAGS=" -fsanitize=address -fsanitize=undefined" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating osmo-pcu.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands make[1]: Entering directory ' Making all in include make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in src make[2]: Entering directory ' CXX gprs_debug.lo CXX csn1.lo CXX gsm_rlcmac.lo CXX gprs_bssgp_pcu.lo ../../../src/gprs_bssgp_pcu.cpp:975:2: warning: #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" [-Wcpp] #warning "This causes ASAN to complain. It is not critical for normal operation but should be fixed nevertheless" ^~~~~~~ CXX gprs_rlcmac.lo CXX gprs_rlcmac_sched.lo CXX gprs_rlcmac_meas.lo CXX gprs_rlcmac_ts_alloc.lo CXX gprs_ms.lo CXX gprs_ms_storage.lo CXX gsm_timer.lo CXX pcu_l1_if.lo CC pcu_vty.lo CXX pcu_vty_functions.lo CC mslot_class.lo CXX tbf.lo CXX tbf_ul.lo CXX tbf_dl.lo CXX bts.lo CXX pdch.lo CXX poll_controller.lo CXX encoding.lo CXX sba.lo CXX decoding.lo CXX llc.lo CXX rlc.lo CXX osmobts_sock.lo CC gprs_codel.lo CXX gprs_coding_scheme.lo CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.3-7a9c] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1261: recipe for target 'check-local' failed make[3]: *** [check-local] Error 1 make[3]: Leaving directory ' Makefile:1095: recipe for target 'check-am' failed make[2]: *** [check-am] Error 2 make[2]: Leaving directory ' Makefile:461: recipe for target 'check-recursive' failed make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.3-7a9c/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-18 00:08:25.962176404 +0000 +++ 2018-05-18 00:08:26.006175785 +0000 @@ -5388,6 +5388,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 07 00 00 02 28 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc e0 e4 e8 ec f0 f4 f8 fc 00 05 09 0d 11 15 19 1d 21 25 41 d3 a5 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 36 04 1c b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Final ACK received. +../../../src/gprs_rlcmac_meas.cpp:134:42: runtime error: left shift of negative value -999883 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to WAIT RELEASE TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) starting timer T3193 [release (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_SEND_ASS to GPRS_RLCMAC_DL_ASS_NONE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri May 18 00:12:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 May 2018 00:12:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3466?= Message-ID: <66835460.76.1526602340313.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 856.46 KB...] struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:35:10: warning: its scope is only this definition or declaration, which is probably not what you want struct IE_Extensions *iE_Extensions /* OPTIONAL */; ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC CGI.o CC CI.o CC CN-DomainIndicator.o CC ESN.o CC GeographicalLocation.o CC GeographicalCoordinates.o CC GTP-TEI.o CC HNBCapacity.o CC HNB-Cell-Identifier.o CC HNB-Cell-Access-Mode.o CC HNB-GWResponse.o CC HNB-RNL-Identity.o CC HNBConfigInfo.o CC ConfigurationInformation.o CC HNBConfigurationInformationProvided.o CC HNBConfigurationInformationMissing.o CC HNB-Identity.o CC HNB-Location-Information.o CC HNB-Identity-Info.o CC IMEI.o CC IMSI.o CC IMSIDS41.o CC IMSIESN.o CC Ipv6Address.o CC Ipv4Address.o CC IP-Address.o CC Iurh-Signalling-TNL-AddressList.o CC LAC.o CC LAI.o CC MacroCoverageInformation.o CC MacroCellID.o CC MuxPortNumber.o CC NeighbourCellIdentityList.o CC NeighbourIdentity.o CC NeighbourInfoList.o CC NeighbourInfoRequestList.o CC AdditionalNeighbourInfoList.o CC NeighbourInfoRequestItem.o CC PLMNidentity.o CC PTMSI.o CC PSC.o CC PTMSIRAI.o CC RAB-ID.o CC RABList.o CC RABListItem.o CC RAC.o CC RAI.o CC Registration-Cause.o CC RNC-ID.o CC SAC.o CC S-RNTIPrefix.o CC TMSILAI.o CC TMSIDS41.o CC TransportInfo.o CC TransportLayerAddress.o CC Tunnel-Information.o CC TypeOfError.o CC UDP-Port-Number.o CC UE-Capabilities.o CC UTRANCellID.o CC UE-Identity.o CC Update-cause.o CC URAIdentityList.o CC URAIdentity.o CC UnknownU-RNTIIndication.o CC HNBAP-PDU.o CC U-RNTI.o CC InitiatingMessage.o CC SuccessfulOutcome.o CC UnsuccessfulOutcome.o CC HNBRegisterRequest.o CC HNBRegisterAccept.o CC HNBRegisterReject.o CC UERegisterRequest.o CC UERegisterAccept.o CC UERegisterReject.o CC UEDe-Register.o CC HNBDe-Register.o CC ErrorIndication.o CC CSGMembershipUpdate.o CC TNLUpdateRequest.o CC TNLUpdateResponse.o CC TNLUpdateFailure.o CC HNBConfigTransferRequest.o CC HNBConfigTransferResponse.o CC RelocationComplete.o CC U-RNTIQueryRequest.o CC U-RNTIQueryResponse.o CC PrivateMessage.o CC IE.o AR libosmo-asn1-hnbap.a make[5]: Entering directory '/build/deps/osmo-iuh/src/hnbap' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-iuh/src/hnbap' make[4]: Leaving directory '/build/deps/osmo-iuh/src/hnbap' Making install in rua make[4]: Entering directory '/build/deps/osmo-iuh/src/rua' CC RUA_Criticality.o CC RUA_ProcedureCode.o CC RUA_Presence.o CC RUA_PrivateIE-ID.o CC RUA_ProtocolIE-ID.o CC RUA_TriggeringMessage.o CC RUA_IE-Extensions.o CC RUA_CN-DomainIndicator.o CC RUA_Establishment-Cause.o CC RUA_CSGMembershipStatus.o CC RUA_Context-ID.o CC RUA_IntraDomainNasNodeSelector.o CC RUA_Gsm-map-IDNNS.o CC RUA_Ansi-41-IDNNS.o CC RUA_RANAP-Message.o CC RUA_RoutingParameter.o CC RUA_Cause.o CC RUA_CauseRadioNetwork.o CC RUA_CauseTransport.o CC RUA_CauseProtocol.o CC RUA_CauseMisc.o CC RUA_CriticalityDiagnostics.o CC RUA_CriticalityDiagnostics-IE-List.o CC RUA_TypeOfError.o CC RUA_RUA-PDU.o In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics.h:17, from RUA_CriticalityDiagnostics.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct Member' declared inside parameter list A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: 'struct Member' declared inside parameter list A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct Member { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct Member { ^ CC RUA_InitiatingMessage.o CC RUA_SuccessfulOutcome.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o CC RUA_IE.o AR libosmo-asn1-rua.a make[5]: Entering directory '/build/deps/osmo-iuh/src/rua' make[5]: Nothing to be done for 'install-exec-am'. make[5]: Nothing to be done for 'install-data-am'. make[5]: Leaving directory '/build/deps/osmo-iuh/src/rua' make[4]: Leaving directory '/build/deps/osmo-iuh/src/rua' Making install in ranap make[4]: Entering directory '/build/deps/osmo-iuh/src/ranap' CC RANAP_Criticality.lo CC RANAP_ProcedureCode.lo CC RANAP_PrivateIE-ID.lo CC RANAP_IE-Extensions.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_Presence.lo CC RANAP_TriggeringMessage.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_AlternativeRABConfigurationRequest.lo /bin/bash: line 1: 9009 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0\" -DPACKAGE_BUGREPORT=\"openbsc at 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-iuh\" -DVERSION=\"0.3.0\" -DSTDC_HEADERS=1 -I. -Wall -I../../include -I/build/deps/install/stow/libasn1c/include/ -I/build/deps/install/stow/libasn1c/include/asn1c -I/build/deps/install/stow/libosmocore/include/ -g -O2 -Wall -MT RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo -MD -MP -MF .deps/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.Tpo -c -o RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c Makefile:2494: recipe for target 'RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo' failed make[4]: *** [RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory '/build/deps/osmo-iuh/src/ranap' Makefile:630: recipe for target 'install-recursive' failed make[3]: Leaving directory '/build/deps/osmo-iuh/src' make[3]: *** [install-recursive] Error 1 Makefile:789: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/osmo-iuh/src' make[2]: *** [install] Error 2 Makefile:442: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-iuh' make[1]: *** [install-recursive] Error 1 Makefile:741: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri May 18 00:19:50 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 May 2018 00:19:50 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3467?= In-Reply-To: <66835460.76.1526602340313.JavaMail.jenkins@jenkins.osmocom.org> References: <66835460.76.1526602340313.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <224655957.77.1526602790965.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Fri May 18 07:34:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 May 2018 07:34:21 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#480?= In-Reply-To: <2052953278.75.1526602107465.JavaMail.jenkins@jenkins.osmocom.org> References: <2052953278.75.1526602107465.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1515242121.87.1526628861908.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri May 18 09:59:54 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 May 2018 09:59:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: check channel mode in f_establish_fully Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9231 Change subject: MSC_ConnectionHandler: check channel mode in f_establish_fully ...................................................................... MSC_ConnectionHandler: check channel mode in f_establish_fully The helper function f_establish_fully() checks the channel type for compatibility. If the channel type is compatible with the desired mode a channel mode modification could be necessary if the current channel mode is different from the desired channel mode. However, this is not checked at the momemend. We just blindly expect a MODE MODIFY message from the BSC and ignore the cases where the current channel mode and the desired channel mode already matches up. This is the case if only a signalling channel is requested with f_establish_fully for example. - Check if the channel mode of the current channel and the desired channel mode match up. - Make sure that the MODE MODIFY from the BSC is only expected when the channel modes are different. Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Closes: OS#2762 Related: OS#2936 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 46 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/9231/1 diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 991a693..f799bfe 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -674,6 +674,35 @@ return false; } +/* Determine if the channel mode specified within rsl_chan_nr requires a + * MODE MODIFY in to match the channel mode specified by given BSSMAP + * ChannelType */ +function f_channel_needs_modify(BSSMAP_IE_ChannelType bssmap, RslChannelNr rsl_chan_nr) +return boolean { + + var boolean current_signalling := false; + var boolean desired_signalling := false; + + select (rsl_chan_nr) { + case (t_RslChanNr_SDCCH4(?, ?)) { current_signalling := true; } + case (t_RslChanNr_SDCCH8(?, ?)) { current_signalling := true; } + } + + if (bssmap.speechOrDataIndicator == '0011'B) { + desired_signalling := true; + } + + if (current_signalling == desired_signalling) { + /* The desired channel mode is equal to the one we currently + * have, there is no mode modification needed or expected */ + return false; + } else { + /* The desired channel mode and the current channel mode do + * not match. A mode modification is required */ + return true; + } +} + /* establish a channel fully, expecting an assignment matching 'exp' */ function f_establish_fully(template (omit) PDU_BSSAP ass_tpl, template PDU_BSSAP exp_ass_cpl) runs on MSC_ConnHdlr { @@ -698,6 +727,7 @@ timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); var boolean exp_fail := ischosen(exp_ass_cpl.pdu.bssmap.assignmentFailure); + var boolean exp_modify; var ExpectCriteria mgcpcrit := { connid := omit, endpoint := omit, @@ -707,10 +737,23 @@ /* if the channel type is SIGNAL, we're not handling a voice call */ if (ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechOrDataIndicator != '0011'B) { st.voice_call := true; + exp_modify := true; } + /* determine if the current channel can support the given service or not */ if (not f_channel_compatible(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr)) { st.is_assignment := true; + + /* We decided to assign a new channel, so we do not expect + * any mode modify messages on RSL */ + exp_modify := false; + } else { + + /* We will continue working with the currently assigned + * channel, we must now check if the mode of the current + * channel is compatible. If not we expect the BSC to modify + * the mode */ + exp_modify := f_channel_needs_modify(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr); } f_create_mgcp_expect(mgcpcrit); @@ -722,21 +765,20 @@ [st.is_assignment] as_assignment(st); /* modify related bits */ - [not st.is_assignment] as_modify(st); + [not st.is_assignment and exp_modify] as_modify(st); /* voice call related bits (IPA CRCX/MDCX + MGCP) */ [st.voice_call] as_Media(); /* if we receive exactly what we expected, always return + pass */ - [st.is_assignment and st.assignment_done or - (not st.is_assignment and st.modify_done)] BSSAP.receive(exp_ass_cpl) -> value bssap { + [st.is_assignment and st.assignment_done or (not st.is_assignment and (st.modify_done or not exp_modify))] BSSAP.receive(exp_ass_cpl) -> value bssap { setverdict(pass); } [exp_fail] BSSAP.receive(exp_ass_cpl) -> value bssap { setverdict(pass); } [(st.is_assignment and st.assignment_done or - (not st.is_assignment and st.modify_done)) and + (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); } -- To view, visit https://gerrit.osmocom.org/9231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Gerrit-Change-Number: 9231 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 09:59:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 May 2018 09:59:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix TC_ciph_mode_a5_{0, 1, 3} Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9232 Change subject: BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} ...................................................................... BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} The helper function f_tc_ciph_mode_a5(), thich performs all of the three tests currently disables the ASSIGNMENT COMMAND since due to a bug in OsmoBSC a MODE MODIFY would be attempted by the BSC, causing the testcase to fail. The problem in OsmoBSC is now fixed and the ASSIGNMENT COMMAND can be re-enabled again for this test. However, the test function includes and expects an AoIP transport layer address, which is not included for signalling assignments. - Make sure no AoIP transport identifier is included in ths ASSIGNMENT COMMAND - Do not expect an AoIP transport identifier in the ASSIGNMENT COMPLETE from the BSC - Re-Enable the generation of the ASSIGNMENT COMMAND Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Closes: OS#2936 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/9232/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 762b5a2..bcb53cc 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1436,14 +1436,11 @@ /* Establish signalling channel (non-assignment case) followed by cipher mode */ private function f_tc_ciph_mode_a5(charstring id) runs on MSC_ConnHdlr { - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, omit); var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, omit)); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); - - // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) - //f_establish_fully(ass_cmd, exp_compl); - f_establish_fully(omit, exp_compl); + f_establish_fully(ass_cmd, exp_compl); } testcase TC_ciph_mode_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/9232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Gerrit-Change-Number: 9232 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:07:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:07:45 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: Code-Review-1 I still think at least we should move it to the upper Makefile. -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 18 May 2018 10:07:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:08:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 10:08:39 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 469 PS2, Line 469: /* Table 10.5.33: The T3212 timeout value is coded as the > (why not use the entire line width. [?] This comment was moved here, I didn't write it. You don't seem to like it. Should I just delete it? https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 481 PS2, Line 481: vsub->expire_lu = GSM_SUBSCRIBER_NO_EXPIRATION; > hmm. [?] I am not sure. This error really should not happen. I suppose leaving subscribers in memory is better than kicking off all subscribers in case of a problem with reading the clock. https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 503 PS2, Line 503: LOGP(DVLR, LOGL_DEBUG, "IMSI=%s id=%llu: Location Update expired\n", vsub->imsi, vsub->id); > use vlr_subscr_name(). [?] Sure. https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 1192 PS2, Line 1192: osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); > (for me it would make sense to keep osmo_timer_setup() right next to osmo_timer_schedule() below) It's not in the same function. Looks like gerrit has fooled you by leaving out some lines in-between... -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 10:08:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:09:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 10:09:22 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9211 to look at the new patch set (#3). Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 281 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/3 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:15:17 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:15:17 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: create_bin_tgz supports sbin dir now In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9223 to look at the new patch set (#2). Change subject: contrib: common: create_bin_tgz supports sbin dir now ...................................................................... contrib: common: create_bin_tgz supports sbin dir now This is a preparation for inclusion of osmocom-bb build job, which installs binaries such as osmocon in sbin. Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-mgw.sh 4 files changed, 31 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/23/9223/2 -- To view, visit https://gerrit.osmocom.org/9223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 Gerrit-Change-Number: 9223 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:15:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 10:15:43 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9211 to look at the new patch set (#4). Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 281 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/4 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:16:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:16:39 +0000 Subject: Change in osmo-mgw[master]: mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9216 ) Change subject: mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9216/1/src/libosmo-mgcp/mgcp_osmux.c File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/#/c/9216/1/src/libosmo-mgcp/mgcp_osmux.c at 553 PS1, Line 553: scheduled_tx_net_cb, endp); > (weird indenting choice ... [?] In any case, that's a forwardport from other commits already merged, so let's leave it as it is. -- To view, visit https://gerrit.osmocom.org/9216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf Gerrit-Change-Number: 9216 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 18 May 2018 10:16:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:18:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:18:05 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9221 ) Change subject: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/9221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 Gerrit-Change-Number: 9221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 18 May 2018 10:18:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:18:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:18:07 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9221 ) Change subject: jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb ...................................................................... jobs: osmo-gsm-tester-builder: Add new job to build osmocom-bb Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 --- M jobs/osmo-gsm-tester-builder.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index a43580c..48150c7 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -15,6 +15,7 @@ - osmo-pcu - osmo-sgsn - osmo-trx + - osmocom-bb - osmo-nitb: triggered-by: master-openbsc - osmo-stp: @@ -85,6 +86,8 @@ name: OSMO_GSM_TESTER_BUILD_osmo_pcu - add_param_build_branch: name: OSMO_GSM_TESTER_BUILD_osmo_trx + - add_param_build_branch: + name: OSMO_GSM_TESTER_BUILD_osmocom_bb scm: - osmo-gsm-tester-repo -- To view, visit https://gerrit.osmocom.org/9221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b390e34719503a5d0a50e6392b1ceeb3a9cb730 Gerrit-Change-Number: 9221 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:18:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 10:18:47 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 1: > works for me. I'm using jjb 2.0 Thanks for the info, I'll try updating my jjb and see if it fixes the issue. I already tried doing pip --upgrade yesterday but it told me it was up to date. -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 18 May 2018 10:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:21:30 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 10:21:30 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Hello neels, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7992 to look at the new patch set (#6). Change subject: move creation of insert subscriber data messages to a common function ...................................................................... move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 103 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/92/7992/6 -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:25:13 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 May 2018 10:25:13 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9233 Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... mgcp_sdp: correct apidoc of mgcp_parse_sdp_data The API documentation of mgcp_parse_sdp_data is incorrect. - correct API documentation Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/9233/1 diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 52b4df4..5acb1ce 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -205,10 +205,10 @@ * \param[in] endp trunk endpoint. * \param[out] conn associated rtp connection. * \param[out] caller provided memory to store the parsing results. - * \returns 0 on success, -1 on failure. + * \returns 1 when codecs are assigned, 0 when no codecs are assigned * * Note: In conn (conn->end) the function returns the packet duration, - * the rtp port and the rtcp port */ + * rtp port, rtcp port and the assigned codecs (codec and alt_codec). */ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, struct mgcp_parse_data *p) -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:25:15 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 May 2018 10:25:15 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9234 Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... sdp: remove unused alt_codec field from struct mgcp_rtp_end The alt_codec field is not used anywhere in the code - remove unused alt_codec field Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Related: OS#3114 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_sdp.c M tests/mgcp/mgcp_test.c 4 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/9234/1 diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index ff02768..7a00c98 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -116,7 +116,6 @@ /* audio codec information */ struct mgcp_rtp_codec codec; - struct mgcp_rtp_codec alt_codec; /* TODO/XXX: make it generic */ /* per endpoint data */ int frames_per_packet; diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 280ee8b..a7cd6cf 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -132,7 +132,6 @@ end->output_enabled = 0; mgcp_rtp_codec_init(&end->codec); - mgcp_rtp_codec_init(&end->alt_codec); conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index); conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR]; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 5acb1ce..5cc34ea 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -205,10 +205,10 @@ * \param[in] endp trunk endpoint. * \param[out] conn associated rtp connection. * \param[out] caller provided memory to store the parsing results. - * \returns 1 when codecs are assigned, 0 when no codecs are assigned + * \returns 1 when a codec is assigned, 0 when no codec is assigned * * Note: In conn (conn->end) the function returns the packet duration, - * rtp port, rtcp port and the assigned codecs (codec and alt_codec). */ + * rtp port, rtcp port and the assigned codec. */ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, struct mgcp_parse_data *p) @@ -218,7 +218,7 @@ char *line; int maxptime = -1; int i; - int codecs_assigned = 0; + bool codec_assigned = false; void *tmp_ctx = talloc_new(NULL); struct mgcp_rtp_end *rtp; @@ -277,6 +277,10 @@ rtp->rtp_port = htons(port); rtp->rtcp_port = htons(port + 1); codecs_used = rc - 1; + + /* So far we have only set the payload type in + * the codec struct. Now we fill up the + * remaining fields of the codec description */ codecs_initialize(tmp_ctx, codecs, codecs_used); } break; @@ -300,11 +304,11 @@ } } - /* Now select the primary and alt_codec */ - for (i = 0; i < codecs_used && codecs_assigned < 2; ++i) { - struct mgcp_rtp_codec *codec = codecs_assigned == 0 ? - &rtp->codec : &rtp->alt_codec; + /* Now select a suitable codec */ + for (i = 0; i < codecs_used; i++) { + /* When no transcoding is available, avoid codecs that would + * require transcoding. */ if (endp->tcfg->no_audio_transcoding && !is_codec_compatible(endp, &codecs[i])) { LOGP(DLMGCP, LOGL_NOTICE, "Skipping codec %s\n", @@ -312,12 +316,14 @@ continue; } - mgcp_set_audio_info(p->cfg, codec, + mgcp_set_audio_info(p->cfg, &rtp->codec, codecs[i].payload_type, codecs[i].map_line); - codecs_assigned += 1; + + codec_assigned = true; + break; } - if (codecs_assigned > 0) { + if (codec_assigned) { /* TODO/XXX: Store this per codec and derive it on use */ if (maxptime >= 0 && maxptime * rtp->codec.frame_duration_den > rtp->codec.frame_duration_num * 1500) { @@ -335,7 +341,10 @@ } talloc_free(tmp_ctx); - return codecs_assigned > 0; + + if (codec_assigned) + return 1; + return 0; } /*! Generate SDP response string. diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 67c5f66..4dce64c 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1244,7 +1244,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 97); /* Allocate 2 at mgw with three codecs, last one ignored */ last_endpoint = -1; @@ -1260,7 +1259,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 97); /* Allocate 3 at mgw with no codecs, check for PT == -1 */ last_endpoint = -1; @@ -1276,7 +1274,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == -1); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); /* Allocate 4 at mgw with a single codec */ last_endpoint = -1; @@ -1292,7 +1289,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); /* Allocate 5 at mgw at select GSM.. */ last_endpoint = -1; @@ -1311,7 +1307,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 3); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); inp = create_msg(MDCX_NAT_DUMMY, conn_id); last_endpoint = -1; @@ -1323,7 +1318,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 3); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); OSMO_ASSERT(conn->end.rtp_port == htons(16434)); memset(&addr, 0, sizeof(addr)); inet_aton("8.8.8.8", &addr); @@ -1354,7 +1348,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 255); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 0); talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 10:33:16 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 18 May 2018 10:33:16 +0000 Subject: Change in osmo-mgw[master]: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/9215 ) Change subject: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat ...................................................................... Patch Set 1: Code-Review+1 > Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 Gerrit-Change-Number: 9215 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 18 May 2018 10:33:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 11:38:24 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 11:38:24 +0000 Subject: Change in osmo-bsc[master]: show all global counters of osmo-bsc in vty In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9217 ) Change subject: show all global counters of osmo-bsc in vty ...................................................................... show all global counters of osmo-bsc in vty The 'show statistics' VTY command was not showing all counters maintained by osmo-bsc. Instead of printing just two counters related to paging, print all available counters in a generic way. Adjust descriptions of some counters for nicer display. After startup (all counters are zero) is now looks like this: OsmoBSC# show statistics handover:attempted: 0 Received handover attempts. handover:no_channel: 0 Sent no channel available responses. handover:timeout: 0 Timeouts of timer T3103. handover:completed: 0 Received handover completed. handover:failed: 0 Received HO FAIL messages. paging:attempted: 0 Paging attempts for a subscriber. paging:detached: 0 Paging request send failures because no responsible BTS was found. paging:responded: 0 Paging attempts with successful response. OsmoBSC# Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bsc_vty.c 2 files changed, 11 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 29b97f0..6365938 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1133,12 +1133,12 @@ static const struct rate_ctr_desc bsc_ctr_description[] = { [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover:attempted", "Received handover attempts."}, [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover:no_channel", "Sent no channel available responses."}, - [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Count the amount of timeouts of timer T3103."}, + [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Timeouts of timer T3103."}, [BSC_CTR_HANDOVER_COMPLETED] = {"handover:completed", "Received handover completed."}, - [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Receive HO FAIL messages."}, + [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Received HO FAIL messages."}, [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber."}, - [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."}, + [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found."}, [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response."}, }; diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index ea4c8d0..e53a14f 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -4133,12 +4133,16 @@ return CMD_SUCCESS; } +int print_counter(struct rate_ctr_group *bsc_ctrs, struct rate_ctr *ctr, const struct rate_ctr_desc *desc, void *data) +{ + struct vty *vty = data; + vty_out(vty, "%25s: %10"PRIu64" %s%s", desc->name, ctr->current, desc->description, VTY_NEWLINE); + return 0; +} + void openbsc_vty_print_statistics(struct vty *vty, struct gsm_network *net) { - vty_out(vty, "Paging : %"PRIu64" attempted, %"PRIu64" responded%s", - net->bsc_ctrs->ctr[BSC_CTR_PAGING_ATTEMPTED].current, - net->bsc_ctrs->ctr[BSC_CTR_PAGING_RESPONDED].current, - VTY_NEWLINE); + rate_ctr_for_each_counter(net->bsc_ctrs, print_counter, vty); } DEFUN(drop_bts, -- To view, visit https://gerrit.osmocom.org/9217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Gerrit-Change-Number: 9217 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 11:51:02 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 11:51:02 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 1: > (1 comment) What does "IPA CCM" stand for? The counter names are scoped to a topic (e.g. "handover:"). What would be a suitable topic to use instead of "oml:"? Would "ipa:" be OK, "ipa:unknown_unit_id" ? -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 11:51:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 11:56:15 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 11:56:15 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9218 to look at the new patch set (#2). Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... add counter for connection attempts from BTS with unknown unit id Add a global counter to the BSC which shows the number of failed OML connections attempts due to a unit_id mismatch between the BSC and the BTS. Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bts_ipaccess_nanobts.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/9218/2 -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:01:38 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:01:38 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 2: The next patch set contains a counter description based you on your suggestion: "Connection attempts from unknown IPA CCM Unit ID." I am not sure if this is a very good description for our intended purpose. The purpose, as I understand, is to allow users who see this counter to take a mental leap from this counter to the unit_id directive in bsc/bts configuration files. I believe the description as it is now won't meet this goal in practice because it contains acronyms which make it hard for the user to categorize the message if the user does not know their correct expansion, and it does not contain the word "BTS". -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 12:01:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:02:11 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 18 May 2018 12:02:11 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 1: pip install --pre ... still not released yet even I'm using jjb 2.0 for other reason. I'm not sure if it's worth to do a workaround in our receipts?! -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 18 May 2018 12:02:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:04:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:04:36 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9218 to look at the new patch set (#3). Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... add counter for connection attempts from BTS with unknown unit id Add a global counter to the BSC which shows the number of failed connections attempts due to a unit_id mismatch between the BSC and the BTS. Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bts_ipaccess_nanobts.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/9218/3 -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:10:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:10:03 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9220 to look at the new patch set (#3). Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... remove redundant unconditional PKG_CHECK_MODULES for libsmpp The configure script should only check for libsmpp with --enable-smpp. Also, disable the build of smpp_mirror with --disable-smpp. Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Fixes: a55dda703fc5e367bd58b5f9f6986d62ffbbdb6c Related: If7e1af11cdac8587bb4d66fb4eacee4b79945359 Related: OS#3232 --- M configure.ac M src/utils/Makefile.am 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/9220/3 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:10:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:10:21 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9233 ) Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/9233/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9233/1//COMMIT_MSG at 11 PS1, Line 11: - correct API documentation are you joking? lol, saying the exact same thing thrice :) https://gerrit.osmocom.org/#/c/9233/1/src/libosmo-mgcp/mgcp_sdp.c File src/libosmo-mgcp/mgcp_sdp.c: https://gerrit.osmocom.org/#/c/9233/1/src/libosmo-mgcp/mgcp_sdp.c at 208 PS1, Line 208: * \returns 1 when codecs are assigned, 0 when no codecs are assigned end sentence in a '.' -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Neels Hofmeyr Gerrit-Comment-Date: Fri, 18 May 2018 12:10:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:10:51 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:10:51 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#2) to the change originally created by dexter. ( https://gerrit.osmocom.org/9233 ) Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... mgcp_sdp: correct apidoc of mgcp_parse_sdp_data The API documentation of mgcp_parse_sdp_data is incorrect. - correct API documentation Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/9233/2 -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:11:00 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:11:00 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9233 ) Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... Patch Set 2: Code-Review+2 fixed the dot -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 18 May 2018 12:11:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:11:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:11:18 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am File tests/smpp/Makefile.am: https://gerrit.osmocom.org/#/c/9220/2/tests/smpp/Makefile.am at 1 PS2, Line 1: if BUILD_SMPP > we also put Makefile paths in configure. [?] This Makefile.am is already excluded in the parent directory if SMPP support is not built. So this already worked as intended. I'll just drop this part of the patch. -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 12:11:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:12:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:12:19 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 12:12:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:16:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:16:22 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9234 ) Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... Patch Set 1: Code-Review+1 (1 comment) patch looks good, just not sure about the semantics. what was the alt-codec intended for and why don't we use it after all? https://gerrit.osmocom.org/#/c/9234/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9234/1//COMMIT_MSG at 11 PS1, Line 11: - remove unused alt_codec field oh so there's a scheme behind repeating the same statements -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 18 May 2018 12:16:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:17:31 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:17:31 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/7992 ) Change subject: move creation of insert subscriber data messages to a common function ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels Gerrit-Comment-Date: Fri, 18 May 2018 12:17:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:29:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 12:29:10 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 1: > pip install --pre ... > > still not released yet even I'm using jjb 2.0 for other reason. I'm > not sure if it's worth to do a workaround in our receipts?! It seems I required to pass "--upgrade" after install in order to get a newer version. Now I have 2.0 and it works fine. I'm pushing a new version of this patch soon, so no need to merge it yet. Thanks for your support! -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 18 May 2018 12:29:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:29:42 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 12:29:42 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 12:29:42 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:43:21 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:43:21 +0000 Subject: Change in osmo-msc[master]: remove redundant unconditional PKG_CHECK_MODULES for libsmpp In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9220 ) Change subject: remove redundant unconditional PKG_CHECK_MODULES for libsmpp ...................................................................... remove redundant unconditional PKG_CHECK_MODULES for libsmpp The configure script should only check for libsmpp with --enable-smpp. Also, disable the build of smpp_mirror with --disable-smpp. Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Fixes: a55dda703fc5e367bd58b5f9f6986d62ffbbdb6c Related: If7e1af11cdac8587bb4d66fb4eacee4b79945359 Related: OS#3232 --- M configure.ac M src/utils/Makefile.am 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index deee84b..c02b74d 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.9.0) PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.3.0) -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index fad522d..2d67102 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -28,7 +28,6 @@ noinst_PROGRAMS = \ smpp_mirror \ $(NULL) -endif smpp_mirror_SOURCES = \ smpp_mirror.c \ @@ -44,4 +43,4 @@ $(LIBOSMOGSM_LIBS) \ $(LIBSMPP34_LIBS) \ $(NULL) - +endif -- To view, visit https://gerrit.osmocom.org/9220 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic4a8a5c970c04a6257ee4c8e3977e98c4ddfda13 Gerrit-Change-Number: 9220 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 18 May 2018 12:47:53 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 469 PS2, Line 469: /* Table 10.5.33: The T3212 timeout value is coded as the > This comment was moved here, I didn't write it. [?] no no, I was just mocking about the design from 3GPP. But the comment is actually helpful. Let's just fix the spec reference. I can find half of it at 3GPP TS 24.008 Table 10.5.1.12.2, and 3GPP TS 44.018 Table 10.5.2.11.1; but so far can't find this "Table 10.5.33" nor the spec to use twice T3212 plus 1 minute... can anyone else find it? https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 1144 PS2, Line 1144: /* See TS 32.012 version 9.10.0 4.3.2.1 "Process Detach_IMSI_VLR" */ 23.012 ! https://gerrit.osmocom.org/#/c/9211/2/src/libvlr/vlr.c at 1192 PS2, Line 1192: osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); > It's not in the same function. [?] yes, I saw that, but it doesn't make sense to setup the timer if it isn't started, so might as well setup in vlr_start() as well. Usually when I read code, I see a timer being started with the related callback function referenced right next to it. Makes it harder to read if that is spread about. So it's a cosmetic preference. Any hard reason to need this in vlr_alloc()? -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 18 May 2018 12:47:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 12:50:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 12:50:46 +0000 Subject: Change in osmo-hlr[master]: move creation of insert subscriber data messages to a common function In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/7992 ) Change subject: move creation of insert subscriber data messages to a common function ...................................................................... move creation of insert subscriber data messages to a common function Move code to create an Insert Subscriber Data message into a common function which can be shared by hlr.c and luop.c. As a consequence, we always encode gsup.cn_domain in the corresponding msgb and must adjust expected output of the 'gsup' test accordingly. Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Requested-by: neels Related: OS#2785 --- M src/gsup_server.c M src/gsup_server.h M src/hlr.c M src/luop.c M tests/gsup/gsup_test.err 5 files changed, 103 insertions(+), 67 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/src/gsup_server.c b/src/gsup_server.c index 07d4feb..4b8a0fa 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "gsup_server.h" @@ -357,3 +358,56 @@ return 0; } + +/** + * Populate a gsup message structure with an Insert Subscriber Data Message. + * All required memory buffers for data pointed to by pointers in struct omso_gsup_message + * must be allocated by the caller and should have the same lifetime as the gsup parameter. + * + * \param[out] gsup The gsup message to populate. + * \param[in] imsi The subscriber's IMSI. + * \param[in] msisdn The subscriber's MSISDN. + * \param[out] msisdn_enc A buffer large enough to store the MSISDN in encoded form. + * \param[in] msisdn_enc_size Size of the buffer (must be >= OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN). + * \param[out] apn_buf A buffer large enough to store an APN (required if cn_domain is OSMO_GSUP_CN_DOMAIN_PS). + * \param[in] apn_buf_size Size of APN buffer (must be >= APN_MAXLEN). + * \param[in] cn_domain The CN Domain of the subscriber connection. + * \returns 0 on success, and negative on error. + */ +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, const char *imsi, const char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain) +{ + int len; + + OSMO_ASSERT(gsup); + + gsup->message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST; + osmo_strlcpy(gsup->imsi, imsi, sizeof(gsup->imsi)); + + if (msisdn_enc_size < OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN) + return -ENOSPC; + + OSMO_ASSERT(msisdn_enc); + len = gsm48_encode_bcd_number(msisdn_enc, msisdn_enc_size, 0, msisdn); + if (len < 1) { + LOGP(DLGSUP, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", imsi, msisdn); + return -ENOSPC; + } + gsup->msisdn_enc = msisdn_enc; + gsup->msisdn_enc_len = len; + + #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" + + gsup->cn_domain = cn_domain; + if (gsup->cn_domain == OSMO_GSUP_CN_DOMAIN_PS) { + OSMO_ASSERT(apn_buf_size >= APN_MAXLEN); + OSMO_ASSERT(apn_buf); + /* FIXME: PDP infos - use more fine-grained access control + instead of wildcard APN */ + osmo_gsup_configure_wildcard_apn(gsup, apn_buf, apn_buf_size); + } + + return 0; +} diff --git a/src/gsup_server.h b/src/gsup_server.h index 66c1a9c..e49d283 100644 --- a/src/gsup_server.h +++ b/src/gsup_server.h @@ -6,6 +6,10 @@ #include #include +#ifndef OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN +#define OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN 43 /* TS 24.008 10.5.4.7 */ +#endif + struct osmo_gsup_conn; /* Expects message in msg->l2h */ @@ -55,3 +59,7 @@ int osmo_gsup_configure_wildcard_apn(struct osmo_gsup_message *gsup, uint8_t *apn_buf, size_t apn_buf_size); +int osmo_gsup_create_insert_subscriber_data_msg(struct osmo_gsup_message *gsup, const char *imsi, const char *msisdn, + uint8_t *msisdn_enc, size_t msisdn_enc_size, + uint8_t *apn_buf, size_t apn_buf_size, + enum osmo_gsup_cn_domain cn_domain); diff --git a/src/hlr.c b/src/hlr.c index 1c72f45..4da7b9b 100644 --- a/src/hlr.c +++ b/src/hlr.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -62,54 +61,33 @@ return; llist_for_each_entry(co, &g_hlr->gs->clients, list) { - struct osmo_gsup_message gsup = { - .message_type = OSMO_GSUP_MSGT_INSERT_DATA_REQUEST - }; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; + uint8_t apn[APN_MAXLEN]; + struct msgb *msg_out; uint8_t *peer; int peer_len; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ - uint8_t apn[APN_MAXLEN]; - int len; - struct msgb *msg_out; + enum osmo_gsup_cn_domain cn_domain; - peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); - if (peer_len < 0) { + if (co->supports_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else if (co->supports_cs) + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; + else { + /* We have not yet received a location update from this subscriber .*/ + continue; + } + + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "IMSI='%s': Cannot notify GSUP client, cannot get peer name " + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " "for %s:%u\n", subscr->imsi, co && co->conn && co->conn->server? co->conn->server->addr : "unset", co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_strlcpy(gsup.imsi, subscr->imsi, GSM23003_IMSI_MAX_DIGITS + 1); - - len = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, subscr->msisdn); - if (len < 1) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode MSISDN '%s'\n", - subscr->imsi, subscr->msisdn); - continue; - } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = len; - - if (co->supports_ps) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_PS; - - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - subscr->imsi); - continue; - } - } else if (co->supports_cs) { - gsup.cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - } else { - /* We have not yet received a location update from this subscriber .*/ - continue; - } - /* Send ISD to MSC/SGSN */ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP ISD UPDATE"); if (msg_out == NULL) { @@ -120,8 +98,17 @@ co && co->conn && co->conn->server? co->conn->server->port : 0); continue; } - osmo_gsup_encode(msg_out, &gsup); + + peer_len = osmo_gsup_conn_ccm_get(co, &peer, IPAC_IDTAG_SERNR); + if (peer_len < 0) { + LOGP(DMAIN, LOGL_ERROR, + "IMSI='%s': cannot get peer name for connection %s:%u\n", subscr->imsi, + co && co->conn && co->conn->server? co->conn->server->addr : "unset", + co && co->conn && co->conn->server? co->conn->server->port : 0); + continue; + } + if (osmo_gsup_addr_send(g_hlr->gs, peer, peer_len, msg_out) < 0) { LOGP(DMAIN, LOGL_ERROR, "IMSI='%s': Cannot notify GSUP client; send operation failed " diff --git a/src/luop.c b/src/luop.c index db7b3c9..aff4d81 100644 --- a/src/luop.c +++ b/src/luop.c @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -52,6 +51,7 @@ struct msgb *msg_out; msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP LUOP"); + OSMO_ASSERT(msg_out); osmo_gsup_encode(msg_out, gsup); osmo_gsup_addr_send(luop->gsup_server, luop->peer, @@ -215,40 +215,27 @@ /*! Transmit Insert Subscriber Data to new VLR/SGSN */ void lu_op_tx_insert_subscr_data(struct lu_operation *luop) { - struct osmo_gsup_message gsup; - uint8_t msisdn_enc[43]; /* TODO use constant; TS 24.008 10.5.4.7 */ + struct hlr_subscriber *subscr = &luop->subscr; + struct osmo_gsup_message gsup = { }; + uint8_t msisdn_enc[OSMO_GSUP_MAX_CALLED_PARTY_BCD_LEN]; uint8_t apn[APN_MAXLEN]; - int l; + enum osmo_gsup_cn_domain cn_domain; OSMO_ASSERT(luop->state == LU_S_LU_RECEIVED || luop->state == LU_S_CANCEL_ACK_RECEIVED); - fill_gsup_msg(&gsup, luop, OSMO_GSUP_MSGT_INSERT_DATA_REQUEST); + if (luop->is_ps) + cn_domain = OSMO_GSUP_CN_DOMAIN_PS; + else + cn_domain = OSMO_GSUP_CN_DOMAIN_CS; - l = gsm48_encode_bcd_number(msisdn_enc, sizeof(msisdn_enc), 0, - luop->subscr.msisdn); - if (l < 1) { + if (osmo_gsup_create_insert_subscriber_data_msg(&gsup, subscr->imsi, subscr->msisdn, msisdn_enc, + sizeof(msisdn_enc), apn, sizeof(apn), cn_domain) != 0) { LOGP(DMAIN, LOGL_ERROR, - "%s: Error: cannot encode MSISDN '%s'\n", - luop->subscr.imsi, luop->subscr.msisdn); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); + "IMSI='%s': Cannot notify GSUP client; could not create gsup message " + "for %s\n", subscr->imsi, luop->peer); return; } - gsup.msisdn_enc = msisdn_enc; - gsup.msisdn_enc_len = l; - - #pragma message "FIXME: deal with encoding the following data: gsup.hlr_enc" - - if (luop->is_ps) { - /* FIXME: PDP infos - use more fine-grained access control - instead of wildcard APN */ - if (osmo_gsup_configure_wildcard_apn(&gsup, apn, sizeof(apn))) { - LOGP(DMAIN, LOGL_ERROR, "%s: Error: cannot encode wildcard APN\n", - luop->subscr.imsi); - lu_op_tx_error(luop, GMM_CAUSE_PROTO_ERR_UNSPEC); - return; - } - } /* Send ISD to new VLR/SGSN */ _luop_tx_gsup(luop, &gsup); diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index d9d272a..0aeae30 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -1,2 +1,2 @@ -DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a +DMAIN 10 01 08 21 43 65 87 09 21 43 f5 08 09 08 89 67 45 23 01 89 67 f5 05 07 10 01 01 12 02 01 2a 28 01 01 DMAIN LU OP state change: LU RECEIVED -> ISD SENT -- To view, visit https://gerrit.osmocom.org/7992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6a92ca34cdaadca9eacc774bb1ca386c325ba865 Gerrit-Change-Number: 7992 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: neels -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 13:45:13 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 13:45:13 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9211 to look at the new patch set (#5). Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. This functionality existed in OpenBSC but was lost during the nitb split. This code took some inspiration from the OpenBSC implementation. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 284 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/5 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 13:46:43 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 18 May 2018 13:46:43 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9211 to look at the new patch set (#6). Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. This functionality existed in OpenBSC but was lost during the nitb split. This code took some inspiration from the OpenBSC implementation. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 283 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/6 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 14:31:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 14:31:19 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Hello lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9225 to look at the new patch set (#2). Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... jobs: osmo-gsm-tester-runner: Add ttcn3 job Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b --- M jobs/osmo-gsm-tester-runner.yml A jobs/osmo-gsm-tester_ttcn3.sh 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/9225/2 -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 18 15:14:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 18 May 2018 15:14:08 +0000 Subject: Change in osmo-gsm-tester[master]: testenv: Provide tests with access to process module Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9235 Change subject: testenv: Provide tests with access to process module ...................................................................... testenv: Provide tests with access to process module Some tests may want to start/stop/manages processes themselves. By using the process module from osmo-gsm-tester, we make that possible easily, providing with useful features such as requesting a suite to stop it on cleanup. Change-Id: I8e018107cbec81299ec2228bfff933fb3b0bb6cd --- M src/osmo_gsm_tester/test.py M src/osmo_gsm_tester/testenv.py 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/35/9235/1 diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index 59d503c..b706dac 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -54,9 +54,9 @@ log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3) self.status = Test.UNKNOWN self.start_timestamp = time.time() - from . import suite, sms + from . import suite, sms, process from .event_loop import MainLoop - testenv.setup(self.suite_run, self, suite, MainLoop, sms) + testenv.setup(self.suite_run, self, suite, MainLoop, sms, process) with self.redirect_stdout(): util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename), self.path) diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index 26b492e..ceea028 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -34,9 +34,10 @@ prompt = None Timeout = None Sms = None +process = None -def setup(suite_run, _test, suite_module, event_module, sms_module): - global trial, suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Timeout, Sms +def setup(suite_run, _test, suite_module, event_module, sms_module, process_module): + global trial, suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Timeout, Sms, process trial = suite_run.trial suite = suite_run test = _test @@ -51,5 +52,6 @@ prompt = suite_run.prompt Timeout = suite_module.Timeout Sms = sms_module.Sms + process = process_module # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/9235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e018107cbec81299ec2228bfff933fb3b0bb6cd Gerrit-Change-Number: 9235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri May 18 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 18 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#38?= In-Reply-To: <156833654.72.1526596881126.JavaMail.jenkins@jenkins.osmocom.org> References: <156833654.72.1526596881126.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1506476698.91.1526683281497.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-12787/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-12787/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-12787/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-12787/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-12787/ libtool: install: (cd /tmp/am-dc-12787/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-12787/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-12787/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-12787/ libtool: install: chmod 644 /tmp/am-dc-12787/ libtool: install: ranlib /tmp/am-dc-12787/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-12787/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-12787/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-12787/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-12787/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-12787/ /bin/mkdir -p '/tmp/am-dc-12787/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-12787/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-12787/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-12787/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-12787/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-12787/ libtool: uninstall: rm -f /tmp/am-dc-12787/ /tmp/am-dc-12787/ /tmp/am-dc-12787/ /tmp/am-dc-12787/ /tmp/am-dc-12787/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-12787/ && rm -f html.tar ) ( cd '/tmp/am-dc-12787/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-12787/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Sat May 19 07:34:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 19 May 2018 07:34:15 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#482?= Message-ID: <658274697.100.1526715255462.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 115.63 KB...] CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.3-7a9c] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.3-7a9c/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-19 07:34:13.955169952 +0000 +++ 2018-05-19 07:34:13.999169936 +0000 @@ -7294,6 +7294,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=0 .. V(R)=105) +../../../src/gprs_rlcmac_meas.cpp:82:42: runtime error: left shift of negative value -997352 max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) restarting timer T3169 [acked (data)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Got MCS-4 RLC data block: CV=10, BSN=105, SPB=0, PI=0, E=1, TI=0, bitoffs=33 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat May 19 07:57:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 07:57:17 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 19 May 2018 07:57:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 07:58:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 07:58:33 +0000 Subject: Change in osmo-gsm-tester[master]: testenv: Provide tests with access to process module In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9235 ) Change subject: testenv: Provide tests with access to process module ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e018107cbec81299ec2228bfff933fb3b0bb6cd Gerrit-Change-Number: 9235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 19 May 2018 07:58:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:00:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:00:35 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9234 ) Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 19 May 2018 08:00:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:01:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:01:31 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9233 ) Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sat, 19 May 2018 08:01:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:02:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:02:56 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 3: > > (1 comment) > > What does "IPA CCM" stand for? We have no idea. We have never seen any specs for that protocol.... > The counter names are scoped to a topic (e.g. "handover:"). > What would be a suitable topic to use instead of "oml:"? Would > "ipa:" be OK, "ipa:unknown_unit_id" ? Ack -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 19 May 2018 08:02:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:03:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:03:33 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 19 May 2018 08:03:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:05:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:05:14 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 3: Code-Review+1 One might think of implementing this somewhere generic in a library, but I think we still have three IPA. implementations around. In terms of naming, some reference to abis would be good, as other interfaces (A, CTRL, ...) May also use IPA -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Sat, 19 May 2018 08:05:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:07:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:07:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix TC_ciph_mode_a5_{0, 1, 3} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9232 ) Change subject: BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Gerrit-Change-Number: 9232 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 19 May 2018 08:07:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 08:10:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 19 May 2018 08:10:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: check channel mode in f_establish_fully In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9231 ) Change subject: MSC_ConnectionHandler: check channel mode in f_establish_fully ...................................................................... Patch Set 2: A TCH can also be in signaling mode, which your new function doesn't cover. Please at least add a fimxe to the code and mention it in the commitlog. Thanks -- To view, visit https://gerrit.osmocom.org/9231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Gerrit-Change-Number: 9231 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Sat, 19 May 2018 08:10:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:03:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:03:50 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: create_bin_tgz supports sbin dir now In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9223 ) Change subject: contrib: common: create_bin_tgz supports sbin dir now ...................................................................... Patch Set 2: Code-Review+2 I +2 it since I addressed the comments from Neels -- To view, visit https://gerrit.osmocom.org/9223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 Gerrit-Change-Number: 9223 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 May 2018 12:03:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:03:59 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: Record repo curr rev in have_repo instead of build_repo In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9222 ) Change subject: contrib: common: Record repo curr rev in have_repo instead of build_repo ...................................................................... contrib: common: Record repo curr rev in have_repo instead of build_repo This way scripts making use only of have_repo (to have build specific insturctions) can still benefit from that code. Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 --- M contrib/jenkins-build-common.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 39046ef..9d85622 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -91,6 +91,8 @@ git rev-parse HEAD + echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" + cd "$base" } @@ -122,8 +124,6 @@ cd "$dep" - echo "$(git rev-parse HEAD) $dep" >> "$prefix_real/${name}_git_hashes.txt" - # special shim: we know the openbsc.git needs to be built in the openbsc/ subdir. if [ "$dep" = "openbsc" ]; then cd openbsc -- To view, visit https://gerrit.osmocom.org/9222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I03149942ac1d279a15c71df3eb880c331c8fc155 Gerrit-Change-Number: 9222 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:04:00 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:04:00 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: common: create_bin_tgz supports sbin dir now In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9223 ) Change subject: contrib: common: create_bin_tgz supports sbin dir now ...................................................................... contrib: common: create_bin_tgz supports sbin dir now This is a preparation for inclusion of osmocom-bb build job, which installs binaries such as osmocon in sbin. Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 --- M contrib/jenkins-build-common.sh M contrib/jenkins-build-osmo-bsc.sh M contrib/jenkins-build-osmo-bts.sh M contrib/jenkins-build-osmo-mgw.sh 4 files changed, 31 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 9d85622..b8cafcf 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -139,32 +139,42 @@ make install } +prune_files() { + bindir="$1" + wanted_binaries="$2" + + if [ ! -d "$prefix_real/$bindir" ]; then return; fi + # remove binaries not intended to originate from this build + cd "$prefix_real/$bindir" + for f in * ; do + if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then + rm "$f" + fi + done + + # ensure requested binaries indeed exist + for b in $wanted_binaries ; do + if [ ! -f "$b" ]; then + set +x; echo "ERROR: no such binary: $b in $prefix_real/$bindir/"; set -x + ls -1 "$prefix_real/$bindir" + exit 1 + fi + done +} + create_bin_tgz() { # build the archive that is going to be copied to the tester - wanted_binaries="$@" + wanted_binaries_bin="$1" + wanted_binaries_sbin="$2" - if [ -z "$wanted_binaries" ]; then + if [ -z "$wanted_binaries_bin" ] && [ -z "$wanted_binaries_sbin" ]; then set +x; echo "ERROR: create_bin_tgz needs a list of permitted binaries"; set -x exit 1 fi - # remove binaries not intended to originate from this build - cd "$prefix_real"/bin - for f in * ; do - if [ -z "$(echo "_ $wanted_binaries _" | grep " $f ")" ]; then - rm "$f" - fi - done - - # ensure requested binaries indeed exist - for b in $wanted_binaries ; do - if [ ! -f "$b" ]; then - set +x; echo "ERROR: no such binary: $b in $prefix_real/bin/"; set -x - ls -1 "$prefix_real/bin" - exit 1 - fi - done + prune_files bin "$wanted_binaries_bin" + prune_files sbin "$wanted_binaries_sbin" cd "$prefix_real" this="$name.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" diff --git a/contrib/jenkins-build-osmo-bsc.sh b/contrib/jenkins-build-osmo-bsc.sh index 73e71e5..4081a00 100755 --- a/contrib/jenkins-build-osmo-bsc.sh +++ b/contrib/jenkins-build-osmo-bsc.sh @@ -11,4 +11,4 @@ build_repo osmo-mgw --enable-sanitize build_repo osmo-bsc --enable-sanitize -create_bin_tgz osmo-bsc abisip-find ipaccess-config +create_bin_tgz "osmo-bsc abisip-find ipaccess-config" diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index b40c613..e5fab5d 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -10,4 +10,4 @@ build_repo libosmo-abis --enable-sanitize build_repo osmo-bts --enable-sanitize --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers -create_bin_tgz osmo-bts-trx osmo-bts-octphy +create_bin_tgz "osmo-bts-trx osmo-bts-octphy" diff --git a/contrib/jenkins-build-osmo-mgw.sh b/contrib/jenkins-build-osmo-mgw.sh index d4ff0b9..43473c6 100755 --- a/contrib/jenkins-build-osmo-mgw.sh +++ b/contrib/jenkins-build-osmo-mgw.sh @@ -9,4 +9,4 @@ build_repo libosmo-netif --enable-sanitize --disable-doxygen build_repo osmo-mgw --enable-sanitize -create_bin_tgz osmo-bsc_mgcp osmo-mgw +create_bin_tgz "osmo-bsc_mgcp osmo-mgw" -- To view, visit https://gerrit.osmocom.org/9223 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I562721af82e481e926ee65dbcd9dcc5b55057ae8 Gerrit-Change-Number: 9223 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:04:01 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9224 ) Change subject: contrib: Add jenkins-build-osmocom-bb.sh to build osmocon ...................................................................... contrib: Add jenkins-build-osmocom-bb.sh to build osmocon Change-Id: Ic5b29951d3fd143dce5826138c84301a9797b1ef --- A contrib/jenkins-build-osmocom-bb.sh 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Neels Hofmeyr: Looks good to me, approved diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh new file mode 100755 index 0000000..f54518a --- /dev/null +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -0,0 +1,24 @@ +#!/bin/sh +set -e -x + +base="$PWD" +name="osmocom-bb" +. "$(dirname "$0")/jenkins-build-common.sh" + +build_repo libosmocore --disable-doxygen + +have_repo osmocom-bb +cd osmocom-bb/ + +cd src/host/osmocon/ +set +x; echo; echo; set -x +autoreconf -fi +set +x; echo; echo; set -x +./configure --prefix="$prefix" $CONFIGURE_FLAGS $configure_opts +set +x; echo; echo; set -x +make -j4 +set +x; echo; echo; set -x +make install + + +create_bin_tgz "" "osmocon" -- To view, visit https://gerrit.osmocom.org/9224 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic5b29951d3fd143dce5826138c84301a9797b1ef Gerrit-Change-Number: 9224 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:04:01 +0000 Subject: Change in osmo-gsm-tester[master]: testenv: Provide tests with access to process module In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9235 ) Change subject: testenv: Provide tests with access to process module ...................................................................... testenv: Provide tests with access to process module Some tests may want to start/stop/manages processes themselves. By using the process module from osmo-gsm-tester, we make that possible easily, providing with useful features such as requesting a suite to stop it on cleanup. Change-Id: I8e018107cbec81299ec2228bfff933fb3b0bb6cd --- M src/osmo_gsm_tester/test.py M src/osmo_gsm_tester/testenv.py 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py index 59d503c..b706dac 100644 --- a/src/osmo_gsm_tester/test.py +++ b/src/osmo_gsm_tester/test.py @@ -54,9 +54,9 @@ log.large_separator(self.suite_run.trial.name(), self.suite_run.name(), self.name(), sublevel=3) self.status = Test.UNKNOWN self.start_timestamp = time.time() - from . import suite, sms + from . import suite, sms, process from .event_loop import MainLoop - testenv.setup(self.suite_run, self, suite, MainLoop, sms) + testenv.setup(self.suite_run, self, suite, MainLoop, sms, process) with self.redirect_stdout(): util.run_python_file('%s.%s' % (self.suite_run.definition.name(), self.basename), self.path) diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py index 26b492e..ceea028 100644 --- a/src/osmo_gsm_tester/testenv.py +++ b/src/osmo_gsm_tester/testenv.py @@ -34,9 +34,10 @@ prompt = None Timeout = None Sms = None +process = None -def setup(suite_run, _test, suite_module, event_module, sms_module): - global trial, suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Timeout, Sms +def setup(suite_run, _test, suite_module, event_module, sms_module, process_module): + global trial, suite, test, resources, log, dbg, err, wait, wait_no_raise, sleep, poll, prompt, Timeout, Sms, process trial = suite_run.trial suite = suite_run test = _test @@ -51,5 +52,6 @@ prompt = suite_run.prompt Timeout = suite_module.Timeout Sms = sms_module.Sms + process = process_module # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit https://gerrit.osmocom.org/9235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e018107cbec81299ec2228bfff933fb3b0bb6cd Gerrit-Change-Number: 9235 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:05:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:05:29 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9212 ) Change subject: legacy-mgcp: Add jitter buffer on the uplink receiver ...................................................................... Patch Set 1: Code-Review+2 It's a forward port and it's been +1 for several days, merging. -- To view, visit https://gerrit.osmocom.org/9212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e Gerrit-Change-Number: 9212 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 May 2018 12:05:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:05:41 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:05:41 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9213 ) Change subject: legacy-mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: It's a forward port and it's been +1 for several days, merging. -- To view, visit https://gerrit.osmocom.org/9213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 Gerrit-Change-Number: 9213 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 May 2018 12:05:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:05:50 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9213 ) Change subject: legacy-mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 Gerrit-Change-Number: 9213 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 May 2018 12:05:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:10 +0000 Subject: Change in osmo-mgw[master]: mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9216 ) Change subject: mgcp: switch to new osmux output APIs ...................................................................... Patch Set 1: Code-Review+2 It's a forward port and it's been +1 for several days, merging. -- To view, visit https://gerrit.osmocom.org/9216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf Gerrit-Change-Number: 9216 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Sat, 19 May 2018 12:06:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:12 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9212 ) Change subject: legacy-mgcp: Add jitter buffer on the uplink receiver ...................................................................... legacy-mgcp: Add jitter buffer on the uplink receiver Default usage values are defined in mgcp node, and can be per-BSC overriden on each bsc node This commit is a forward-port of openbsc.git Change-Id Ibf3932adc07442fb5e9c7a06404853f9d0a20959. Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e --- M include/osmocom/legacy_mgcp/mgcp.h M include/osmocom/legacy_mgcp/mgcp_internal.h M src/libosmo-legacy-mgcp/mgcp_network.c M src/libosmo-legacy-mgcp/mgcp_protocol.c M src/libosmo-legacy-mgcp/mgcp_vty.c 5 files changed, 156 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/legacy_mgcp/mgcp.h b/include/osmocom/legacy_mgcp/mgcp.h index 147a0d5..7490e37 100644 --- a/include/osmocom/legacy_mgcp/mgcp.h +++ b/include/osmocom/legacy_mgcp/mgcp.h @@ -243,6 +243,12 @@ * message. */ uint16_t osmux_dummy; + + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; }; /* config management */ diff --git a/include/osmocom/legacy_mgcp/mgcp_internal.h b/include/osmocom/legacy_mgcp/mgcp_internal.h index dcc75f1..956bee0 100644 --- a/include/osmocom/legacy_mgcp/mgcp_internal.h +++ b/include/osmocom/legacy_mgcp/mgcp_internal.h @@ -25,6 +25,7 @@ #include #include +#include #define CI_UNUSED 0 @@ -198,6 +199,14 @@ uint32_t octets; } stats; } osmux; + + /* Jitter buffer */ + struct osmo_jibuf* bts_jb; + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; }; #define for_each_line(line, save) \ @@ -335,3 +344,8 @@ } int mgcp_msg_terminate_nul(struct msgb *msg); + +/** + * Internal jitter buffer related + */ +void mgcp_dejitter_udp_send(struct msgb *msg, void *data); diff --git a/src/libosmo-legacy-mgcp/mgcp_network.c b/src/libosmo-legacy-mgcp/mgcp_network.c index 8ccfb42..7b161d2 100644 --- a/src/libosmo-legacy-mgcp/mgcp_network.c +++ b/src/libosmo-legacy-mgcp/mgcp_network.c @@ -584,6 +584,36 @@ return rc; } +void mgcp_dejitter_udp_send(struct msgb *msg, void *data) +{ + struct mgcp_rtp_end *rtp_end = (struct mgcp_rtp_end *) data; + + int rc = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, + rtp_end->rtp_port, (char*) msg->data, msg->len); + if (rc != msg->len) + LOGP(DLMGCP, LOGL_ERROR, + "Failed to send data after jitter buffer: %d\n", rc); + msgb_free(msg); +} + +static int enqueue_dejitter(struct osmo_jibuf *jb, struct mgcp_rtp_end *rtp_end, char *buf, int len) +{ + struct msgb *msg; + msg = msgb_alloc(len, "mgcp-jibuf"); + if (!msg) + return -1; + + memcpy(msg->data, buf, len); + msgb_put(msg, len); + + if (osmo_jibuf_enqueue(jb, msg) < 0) { + rtp_end->dropped_packets += 1; + msgb_free(msg); + } + + return len; +} + int mgcp_send(struct mgcp_endpoint *endp, int dest, int is_rtp, struct sockaddr_in *addr, char *buf, int rc) { @@ -591,6 +621,7 @@ struct mgcp_rtp_end *rtp_end; struct mgcp_rtp_state *rtp_state; int tap_idx; + struct osmo_jibuf *jb; LOGP(DLMGCP, LOGL_DEBUG, "endpoint %x dest %s tcfg->audio_loop %d endp->conn_mode %d (== loopback: %d)\n", @@ -612,10 +643,12 @@ rtp_end = &endp->net_end; rtp_state = &endp->bts_state; tap_idx = MGCP_TAP_NET_OUT; + jb = endp->bts_jb; } else { rtp_end = &endp->bts_end; rtp_state = &endp->net_state; tap_idx = MGCP_TAP_BTS_OUT; + jb = NULL; } LOGP(DLMGCP, LOGL_DEBUG, "endpoint %x dest %s net_end %s %d %d bts_end %s %d %d rtp_end %s %d %d\n", @@ -680,9 +713,12 @@ rtp_state->patched_first_rtp_payload = true; } - rc = mgcp_udp_send(rtp_end->rtp.fd, - &rtp_end->addr, - rtp_end->rtp_port, buf, len); + if (jb) + rc = enqueue_dejitter(jb, rtp_end, buf, len); + else + rc = mgcp_udp_send(rtp_end->rtp.fd, + &rtp_end->addr, + rtp_end->rtp_port, buf, len); if (rc <= 0) return rc; diff --git a/src/libosmo-legacy-mgcp/mgcp_protocol.c b/src/libosmo-legacy-mgcp/mgcp_protocol.c index 4e82233..854b4ba 100644 --- a/src/libosmo-legacy-mgcp/mgcp_protocol.c +++ b/src/libosmo-legacy-mgcp/mgcp_protocol.c @@ -863,6 +863,11 @@ goto error2; } + /* Apply Jiter buffer settings for this endpoint, they can be overriden by CRCX policy later */ + endp->bts_use_jibuf = endp->cfg->bts_use_jibuf; + endp->bts_jitter_delay_min = endp->cfg->bts_jitter_delay_min; + endp->bts_jitter_delay_max = endp->cfg->bts_jitter_delay_max; + endp->allocated = 1; /* set up RTP media parameters */ @@ -898,6 +903,13 @@ case MGCP_POLICY_DEFER: /* stop processing */ create_transcoder(endp); + /* Set up jitter buffer if required after policy has updated jibuf endp values */ + if (endp->bts_use_jibuf) { + endp->bts_jb = osmo_jibuf_alloc(tcfg->endpoints); + osmo_jibuf_set_min_delay(endp->bts_jb, endp->bts_jitter_delay_min); + osmo_jibuf_set_max_delay(endp->bts_jb, endp->bts_jitter_delay_max); + osmo_jibuf_set_dequeue_cb(endp->bts_jb, mgcp_dejitter_udp_send, &endp->net_end); + } return NULL; break; case MGCP_POLICY_CONT: @@ -906,6 +918,14 @@ } } + /* Set up jitter buffer if required after policy has updated jibuf endp values */ + if (endp->bts_use_jibuf) { + endp->bts_jb = osmo_jibuf_alloc(tcfg->endpoints); + osmo_jibuf_set_min_delay(endp->bts_jb, endp->bts_jitter_delay_min); + osmo_jibuf_set_max_delay(endp->bts_jb, endp->bts_jitter_delay_max); + osmo_jibuf_set_dequeue_cb(endp->bts_jb, mgcp_dejitter_udp_send, &endp->net_end); + } + LOGP(DLMGCP, LOGL_DEBUG, "Creating endpoint on: 0x%x CI: %u port: %u/%u\n", ENDPOINT_NUMBER(endp), endp->ci, endp->net_end.local_port, endp->bts_end.local_port); @@ -1373,6 +1393,9 @@ void mgcp_release_endp(struct mgcp_endpoint *endp) { LOGP(DLMGCP, LOGL_DEBUG, "Releasing endpoint on: 0x%x\n", ENDPOINT_NUMBER(endp)); + if (endp->bts_jb) + osmo_jibuf_delete(endp->bts_jb); + endp->bts_jb = NULL; endp->ci = CI_UNUSED; endp->allocated = 0; diff --git a/src/libosmo-legacy-mgcp/mgcp_vty.c b/src/libosmo-legacy-mgcp/mgcp_vty.c index 7b11422..be884cb 100644 --- a/src/libosmo-legacy-mgcp/mgcp_vty.c +++ b/src/libosmo-legacy-mgcp/mgcp_vty.c @@ -29,6 +29,7 @@ #include #include +#include #define RTCP_OMIT_STR "Drop RTCP packets in both directions\n" #define RTP_PATCH_STR "Modify RTP packet header in both directions\n" @@ -164,6 +165,13 @@ vty_out(vty, " osmux dummy %s%s", g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE); } + if (g_cfg->bts_use_jibuf) + vty_out(vty, " bts-jitter-buffer%s", VTY_NEWLINE); + if (g_cfg->bts_jitter_delay_min) + vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", g_cfg->bts_jitter_delay_min, VTY_NEWLINE); + if (g_cfg->bts_jitter_delay_max) + vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", g_cfg->bts_jitter_delay_max, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -241,6 +249,11 @@ if (g_cfg->osmux) vty_out(vty, "Osmux used CID: %d%s", osmux_used_cid(), VTY_NEWLINE); + vty_out(vty, "Jitter Buffer by default on Uplink : %s%s", + g_cfg->bts_use_jibuf ? "on" : "off", VTY_NEWLINE); + if (g_cfg->bts_use_jibuf) + vty_out(vty, "Jitter Buffer delays: min=%"PRIu32" max=%"PRIu32"%s", + g_cfg->bts_jitter_delay_min, g_cfg->bts_jitter_delay_max, VTY_NEWLINE); return CMD_SUCCESS; } @@ -1344,6 +1357,63 @@ return CMD_SUCCESS; } +#define DEJITTER_STR "Uplink Jitter Buffer" +DEFUN(cfg_mgcp_bts_use_jibuf, + cfg_mgcp_bts_use_jibuf_cmd, + "bts-jitter-buffer", + DEJITTER_STR "\n") +{ + g_cfg->bts_use_jibuf = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_no_bts_use_jibuf, + cfg_mgcp_no_bts_use_jibuf_cmd, + "no bts-jitter-buffer", + NO_STR DEJITTER_STR "\n") +{ + g_cfg->bts_use_jibuf = false; + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_bts_jitter_delay_min, + cfg_mgcp_bts_jitter_delay_min_cmd, + "bts-jitter-buffer-delay-min <1-65535>", + DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n") +{ + g_cfg->bts_jitter_delay_min = atoi(argv[0]); + if (!g_cfg->bts_jitter_delay_min) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (g_cfg->bts_jitter_delay_min && g_cfg->bts_jitter_delay_max && + g_cfg->bts_jitter_delay_min > g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \ + "bts-jitter-buffer-delay-max.%s", VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_bts_jitter_delay_max, + cfg_mgcp_bts_jitter_delay_max_cmd, + "bts-jitter-buffer-delay-max <1-65535>", + DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n") +{ + g_cfg->bts_jitter_delay_max = atoi(argv[0]); + if (!g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (g_cfg->bts_jitter_delay_min && g_cfg->bts_jitter_delay_max && + g_cfg->bts_jitter_delay_min > g_cfg->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \ + "bts-jitter-buffer-delay-min.%s", VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; +} + int mgcp_vty_init(void) { install_element_ve(&show_mgcp_cmd); @@ -1411,6 +1481,10 @@ install_element(MGCP_NODE, &cfg_mgcp_osmux_dummy_cmd); install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_use_jibuf_cmd); + install_element(MGCP_NODE, &cfg_mgcp_no_bts_use_jibuf_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_jitter_delay_min_cmd); + install_element(MGCP_NODE, &cfg_mgcp_bts_jitter_delay_max_cmd); install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd); -- To view, visit https://gerrit.osmocom.org/9212 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie19a64ac09f9d51f2434ad0d7925610fc919a90e Gerrit-Change-Number: 9212 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:13 +0000 Subject: Change in osmo-mgw[master]: legacy-mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9213 ) Change subject: legacy-mgcp: switch to new osmux output APIs ...................................................................... legacy-mgcp: switch to new osmux output APIs Older ones are being deprecated as they may generate interleaved packets. This commit is a forward-port of openbsc.git Change-Id I189564fc63139c15314db8975afd423c7153ea32. Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 --- M src/libosmo-legacy-mgcp/mgcp_osmux.c 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-legacy-mgcp/mgcp_osmux.c b/src/libosmo-legacy-mgcp/mgcp_osmux.c index 743d3f9..b53e2b5 100644 --- a/src/libosmo-legacy-mgcp/mgcp_osmux.c +++ b/src/libosmo-legacy-mgcp/mgcp_osmux.c @@ -267,7 +267,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -297,8 +296,7 @@ endp->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &endp->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -359,7 +357,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -389,8 +386,7 @@ endp->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &endp->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_net_cb, endp); + osmux_xfrm_output_sched(&endp->osmux.out, osmuxh); } out: msgb_free(msg); @@ -470,9 +466,13 @@ switch (endp->cfg->role) { case MGCP_BSC_NAT: endp->type = MGCP_OSMUX_BSC_NAT; + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, + scheduled_tx_net_cb, endp); break; case MGCP_BSC: endp->type = MGCP_OSMUX_BSC; + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, + scheduled_tx_bts_cb, endp); break; } endp->osmux.state = OSMUX_STATE_ENABLED; @@ -484,6 +484,11 @@ { LOGP(DLMGCP, LOGL_INFO, "Releasing endpoint %u using Osmux CID %u\n", ENDPOINT_NUMBER(endp), endp->osmux.cid); + + /* We are closing, we don't need pending RTP packets to be transmitted */ + osmux_xfrm_output_set_tx_cb(&endp->osmux.out, NULL, NULL); + osmux_xfrm_output_flush(&endp->osmux.out); + osmux_xfrm_input_close_circuit(endp->osmux.in, endp->osmux.cid); endp->osmux.state = OSMUX_STATE_DISABLED; endp->osmux.cid = -1; -- To view, visit https://gerrit.osmocom.org/9213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b8a19e5b8d62deaa9bbb92d49d99e8c33b7e345 Gerrit-Change-Number: 9213 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:13 +0000 Subject: Change in osmo-mgw[master]: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9215 ) Change subject: mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat ...................................................................... mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat This commit actually doesn't fix the entire code, since anyway osmux conns are not supported and mgcp_conn_get_rtp() will return NULL. However, it makes the code more logical and easier to understand once somebody refactors the code to make it work again. Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 1d3cab3..bdc285b 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -326,7 +326,7 @@ struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; - struct mgcp_conn_rtp *conn_net = NULL; + struct mgcp_conn_rtp *conn_bts = NULL; msg = osmux_recv(ofd, &addr); if (!msg) @@ -345,8 +345,8 @@ &addr.sin_addr, MGCP_DEST_NET); /* FIXME: Get rid of CONN_ID_XXX! */ - conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET); - if (!conn_net) + conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS); + if (!conn_bts) goto out; if (!endp) { @@ -355,11 +355,11 @@ osmuxh->circuit_id); goto out; } - conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem); - conn_net->osmux.stats.chunks++; + conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem); + conn_bts->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_net->osmux.out, &list); + osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list); osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); } out: -- To view, visit https://gerrit.osmocom.org/9215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib57e12e5a36b5842c40673c236907bbcbfc390f3 Gerrit-Change-Number: 9215 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:14 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:14 +0000 Subject: Change in osmo-mgw[master]: mgcp: switch to new osmux output APIs In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9216 ) Change subject: mgcp: switch to new osmux output APIs ...................................................................... mgcp: switch to new osmux output APIs Older ones are being deprecated as they may generate interleaved packets. Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, but someone else must approve Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index bdc285b..281595c 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -322,7 +322,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -359,8 +358,7 @@ conn_bts->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_bts->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_bts_cb, endp); + osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh); } out: msgb_free(msg); @@ -426,7 +424,6 @@ { struct msgb *msg; struct osmux_hdr *osmuxh; - struct llist_head list; struct sockaddr_in addr; struct mgcp_config *cfg = ofd->data; uint32_t rem; @@ -463,8 +460,7 @@ conn_net->osmux.stats.chunks++; rem = msg->len; - osmux_xfrm_output(osmuxh, &conn_net->osmux.out, &list); - osmux_tx_sched(&list, scheduled_tx_net_cb, endp); + osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh); } out: msgb_free(msg); @@ -553,9 +549,13 @@ switch (endp->cfg->role) { case MGCP_BSC_NAT: conn->type = MGCP_OSMUX_BSC_NAT; + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, + scheduled_tx_net_cb, endp); break; case MGCP_BSC: conn->type = MGCP_OSMUX_BSC; + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, + scheduled_tx_bts_cb, endp); break; } @@ -576,6 +576,11 @@ LOGP(DLMGCP, LOGL_INFO, "Releasing connection %s using Osmux CID %u\n", conn->conn->id, conn->osmux.cid); + + /* We are closing, we don't need pending RTP packets to be transmitted */ + osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL); + osmux_xfrm_output_flush(&conn->osmux.out); + osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid); conn->osmux.state = OSMUX_STATE_DISABLED; conn->osmux.cid = -1; -- To view, visit https://gerrit.osmocom.org/9216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0705aa4dc4b02eaff4d6030795243e6720f7fddf Gerrit-Change-Number: 9216 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:25 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:25 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 19 May 2018 12:06:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:06:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:06:26 +0000 Subject: Change in osmo-ci[master]: jobs: osmo-gsm-tester-runner: Add ttcn3 job In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9225 ) Change subject: jobs: osmo-gsm-tester-runner: Add ttcn3 job ...................................................................... jobs: osmo-gsm-tester-runner: Add ttcn3 job Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b --- M jobs/osmo-gsm-tester-runner.yml A jobs/osmo-gsm-tester_ttcn3.sh 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Verified diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 5e1ff92..f6774b7 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -7,6 +7,7 @@ jobs: - 'osmo-gsm-tester_run-{stage}' - 'osmo-gsm-tester_gerrit' + - 'osmo-gsm-tester_ttcn3' - scm: name: osmo-gsm-tester-gerrit @@ -166,3 +167,29 @@ - junit: results: 'trial-*/last_run/trial-*.xml' allow-empty-results: true + +# ttcn3 job +- job: + name: 'osmo-gsm-tester_ttcn3' + defaults: runner + scm: + - 'osmo-gsm-tester-repo' + triggers: + - timed: "H H/2 * * *" + - pollscm: + cron: "H/5 * * * *" + builders: + - shell: | + # make sure no bin artifacts from a previous run remain + rm -f *.tgz *.md5 + - copy_artifact_all + - copy_artifact: + repo: osmo-gsm-tester_build-osmocom-bb + - shell: !include-raw: osmo-gsm-tester_ttcn3.sh + publishers: + - archive: + artifacts: '*-run.tgz, *-bin.tgz' + default-excludes: false + - junit: + results: 'trial-*/last_run/trial-*.xml' + allow-empty-results: true diff --git a/jobs/osmo-gsm-tester_ttcn3.sh b/jobs/osmo-gsm-tester_ttcn3.sh new file mode 100644 index 0000000..f2b974f --- /dev/null +++ b/jobs/osmo-gsm-tester_ttcn3.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e -x + +# On our hardware, we actually use the example configuration as-is. +export OSMO_GSM_TESTER_CONF="$PWD/osmo-gsm-tester/ttcn3" + +# debug: provoke a failure +#export OSMO_GSM_TESTER_OPTS="-s debug -t fail" + +unlink osmo-gsm-tester/ttcn3/resources.conf || true +ln -s resources.conf.prod osmo-gsm-tester/ttcn3/resources.conf + +PATH="$PWD/osmo-gsm-tester/src:$PATH" \ + ./osmo-gsm-tester/ttcn3/jenkins-run.sh -- To view, visit https://gerrit.osmocom.org/9225 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8ca1c9a3a18138a27232efba7d65d6806e044a6b Gerrit-Change-Number: 9225 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 19 12:12:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Sat, 19 May 2018 12:12:44 +0000 Subject: Change in libosmocore[master]: core/timer_compat: define CLOCK_BOOTTIME In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/7906 ) Change subject: core/timer_compat: define CLOCK_BOOTTIME ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/7906/1/include/osmocom/core/timer_compat.h File include/osmocom/core/timer_compat.h: https://gerrit.osmocom.org/#/c/7906/1/include/osmocom/core/timer_compat.h at 119 PS1, Line 119: #define CLOCK_BOOTTIME 7 > so what does the magic 7 do in pre-2.6. [?] We are actually not using CLOCK_BOOTTIME anywhere in our code afaik, we only provide the possibility to use it together with other clocks in the API. If CLOCK_BOOTTIME is not suported I would still efine it, then I would probably return EINVAL, as explained in man clock_gettime: "EINVAL The clk_id specified is not supported on this system." If we just pass that to clock_gettime, it's going to return EINVAL anyway most probably. -- To view, visit https://gerrit.osmocom.org/7906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3d3a829700272ec8e5cf67379d8d85368230726 Gerrit-Change-Number: 7906 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 19 May 2018 12:12:44 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat May 19 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 19 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#39?= In-Reply-To: <1506476698.91.1526683281497.JavaMail.jenkins@jenkins.osmocom.org> References: <1506476698.91.1526683281497.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <300823797.102.1526769681646.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 92.17 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-23570/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-23570/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-23570/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-23570/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-23570/ libtool: install: (cd /tmp/am-dc-23570/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-23570/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-23570/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-23570/ libtool: install: chmod 644 /tmp/am-dc-23570/ libtool: install: ranlib /tmp/am-dc-23570/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-23570/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-23570/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-23570/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-23570/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-23570/ /bin/mkdir -p '/tmp/am-dc-23570/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-23570/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-23570/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-23570/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-23570/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-23570/ libtool: uninstall: rm -f /tmp/am-dc-23570/ /tmp/am-dc-23570/ /tmp/am-dc-23570/ /tmp/am-dc-23570/ /tmp/am-dc-23570/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-23570/ && rm -f html.tar ) ( cd '/tmp/am-dc-23570/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-23570/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Sun May 20 00:08:23 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 May 2018 00:08:23 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#483?= In-Reply-To: <658274697.100.1526715255462.JavaMail.jenkins@jenkins.osmocom.org> References: <658274697.100.1526715255462.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <259992017.103.1526774903475.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sun May 20 06:54:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 May 2018 06:54:35 +0000 Subject: Change in osmo-mgw[master]: api doc: fix parameter name for mgcp_conn_create() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9226 ) Change subject: api doc: fix parameter name for mgcp_conn_create() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib6ea230c2e1918bd4e431208610b53e468e534c7 Gerrit-Change-Number: 9226 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 20 May 2018 06:54:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 20 06:54:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 May 2018 06:54:38 +0000 Subject: Change in osmo-mgw[master]: api doc: fix parameter name for mgcp_conn_create() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9226 ) Change subject: api doc: fix parameter name for mgcp_conn_create() ...................................................................... api doc: fix parameter name for mgcp_conn_create() Change-Id: Ib6ea230c2e1918bd4e431208610b53e468e534c7 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 3c755be..6e1e7b8 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -548,7 +548,7 @@ /*! allocate FSM, and create a new connection on the MGW. * \param[in] mgcp MGCP client descriptor. - * \param[in] mgcpparent_fi Parent FSM instance. + * \param[in] parent_fi Parent FSM instance. * \param[in] parent_term_evt Event to be sent to parent when terminating. * \param[in] parent_evt Event to be sent to parent when operation is done. * \param[in] conn_peer Connection parameters (ip, port...). -- To view, visit https://gerrit.osmocom.org/9226 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib6ea230c2e1918bd4e431208610b53e468e534c7 Gerrit-Change-Number: 9226 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 20 06:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 May 2018 06:56:11 +0000 Subject: Change in osmo-bsc[master]: nat: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9214 ) Change subject: nat: Add jitter buffer on the uplink receiver ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9214/1/include/osmocom/bsc/bsc_nat.h File include/osmocom/bsc/bsc_nat.h: https://gerrit.osmocom.org/#/c/9214/1/include/osmocom/bsc/bsc_nat.h at 180 PS1, Line 180: bool bts_use_jibuf; I would prefer something like a sub-structure struct { .... } bts_jitter; This way it's very clear whihc members of the master struct are related to the jitter buffer [only] and which not. -- To view, visit https://gerrit.osmocom.org/9214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 Gerrit-Change-Number: 9214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 20 May 2018 06:56:11 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 20 06:57:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 20 May 2018 06:57:40 +0000 Subject: Change in libosmocore[master]: core/timer_compat: define CLOCK_BOOTTIME In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7906 ) Change subject: core/timer_compat: define CLOCK_BOOTTIME ...................................................................... Patch Set 1: Code-Review-1 I agree with Neels and Pau here. What's the point of introducing this #define? In which particular use case will it fix what, and how? -- To view, visit https://gerrit.osmocom.org/7906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia3d3a829700272ec8e5cf67379d8d85368230726 Gerrit-Change-Number: 7906 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sun, 20 May 2018 06:57:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun May 20 07:34:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 May 2018 07:34:16 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#484?= Message-ID: <2136885872.111.1526801656457.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 126.63 KB...] make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.3-7a9c] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.3-7a9c/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-20 07:34:14.968024152 +0000 +++ 2018-05-20 07:34:15.008024136 +0000 @@ -4651,6 +4651,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink (V(A)==0 .. V(S)==7) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Sending new block at BSN 7, CS=MCS-6 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Complete DL frame, len=512 +../../../src/gprs_rlcmac_meas.cpp:178:40: runtime error: left shift of negative value -999718 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Empty chunk, added LLC dummy command of size 6, drained_since=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) data block (BSN 7, MCS-6): 89 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 43 c0 01 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) need_padding 0 spb_status 0 spb 0 (BSN1 7 BSN2 -1) @@ -4674,6 +4675,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-6): 07 00 02 80 c0 e3 ca 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Final ACK received. +../../../src/gprs_rlcmac_meas.cpp:134:42: runtime error: left shift of negative value -999631 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to WAIT RELEASE TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) starting timer T3193 [release (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_WAIT_ACK to GPRS_RLCMAC_DL_ASS_NONE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun May 20 12:28:56 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Sun, 20 May 2018 12:28:56 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9236 Change subject: include/osmocore: remove unused headers ...................................................................... include/osmocore: remove unused headers Both removed headers are not used anywhere, and probably left from the time when there was no libosmocore as a shared library. Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 --- D include/osmocore/rsl.h D include/osmocore/utils.h 2 files changed, 0 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/36/9236/1 diff --git a/include/osmocore/rsl.h b/include/osmocore/rsl.h deleted file mode 100644 index c9375a7..0000000 --- a/include/osmocore/rsl.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _OSMOCORE_RSL_H -#define _OSMOCORE_RSL_H - -#include -#include -#include - -void rsl_init_rll_hdr(struct abis_rsl_rll_hdr *dh, uint8_t msg_type); - -extern const struct tlv_definition rsl_att_tlvdef; -#define rsl_tlv_parse(dec, buf, len) \ - tlv_parse(dec, &rsl_att_tlvdef, buf, len, 0, 0) - -/* encode channel number as per Section 9.3.1 */ -uint8_t rsl_enc_chan_nr(uint8_t type, uint8_t subch, uint8_t timeslot); - -const struct value_string rsl_rlm_cause_strs[]; - -const char *rsl_err_name(uint8_t err); - -/* Section 3.3.2.3 TS 05.02. I think this looks like a table */ -int rsl_ccch_conf_to_bs_cc_chans(int ccch_conf); - -#endif /* _OSMOCORE_RSL_H */ diff --git a/include/osmocore/utils.h b/include/osmocore/utils.h deleted file mode 100644 index cf3b460..0000000 --- a/include/osmocore/utils.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OSMOCORE_UTIL_H -#define OSMOCORE_UTIL_H - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - -#include - -struct value_string { - unsigned int value; - const char *str; -}; - -const char *get_value_string(const struct value_string *vs, uint32_t val); -int get_string_value(const struct value_string *vs, const char *str); - - -#endif -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun May 20 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 20 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#40?= In-Reply-To: <300823797.102.1526769681646.JavaMail.jenkins@jenkins.osmocom.org> References: <300823797.102.1526769681646.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1726626918.112.1526856081215.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-31436/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-31436/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-31436/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-31436/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-31436/ libtool: install: (cd /tmp/am-dc-31436/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-31436/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-31436/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-31436/ libtool: install: chmod 644 /tmp/am-dc-31436/ libtool: install: ranlib /tmp/am-dc-31436/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-31436/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-31436/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-31436/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-31436/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-31436/ /bin/mkdir -p '/tmp/am-dc-31436/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-31436/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-31436/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-31436/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-31436/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-31436/ libtool: uninstall: rm -f /tmp/am-dc-31436/ /tmp/am-dc-31436/ /tmp/am-dc-31436/ /tmp/am-dc-31436/ /tmp/am-dc-31436/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-31436/ && rm -f html.tar ) ( cd '/tmp/am-dc-31436/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-31436/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Mon May 21 00:08:16 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 May 2018 00:08:16 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#485?= In-Reply-To: <2136885872.111.1526801656457.JavaMail.jenkins@jenkins.osmocom.org> References: <2136885872.111.1526801656457.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <397892821.113.1526861296023.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon May 21 08:47:51 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 08:47:51 +0000 Subject: Change in osmocom-bb[master]: README.building: cosmetic: correct wiki links Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9237 Change subject: README.building: cosmetic: correct wiki links ...................................................................... README.building: cosmetic: correct wiki links Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c --- M src/README.building 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/37/9237/1 diff --git a/src/README.building b/src/README.building index f73f661..d7cc794 100644 --- a/src/README.building +++ b/src/README.building @@ -8,13 +8,15 @@ this. * Make sure you have compiled and installed a recent version of - libosmocore. See http://bb.osmocom.org/trac/wiki/libosmocore + libosmocore. See https://osmocom.org/projects/libosmocore/wiki/Libosmocore DO NOT USE the libosmocore version embedded in this git tree. This is a special version used internally and MUST NOT be used as system-wide libosmocore. * Get a GNU toolchain (gcc/binutils) for ARM (e.g. from http://gnuarm.com/) + See https://osmocom.org/projects/baseband/wiki/GnuArmToolchain + * Set your path to include the arm-elf-* executables of your toolchain * call 'make' in this (the src) subdirectory -- To view, visit https://gerrit.osmocom.org/9237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c Gerrit-Change-Number: 9237 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 08:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 08:47:53 +0000 Subject: Change in osmocom-bb[master]: README.development: cosmetic: correct/add wiki links Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9238 Change subject: README.development: cosmetic: correct/add wiki links ...................................................................... README.development: cosmetic: correct/add wiki links Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 --- M src/README.development 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/38/9238/1 diff --git a/src/README.development b/src/README.development index 1963b5a..060cbd9 100644 --- a/src/README.development +++ b/src/README.development @@ -1,18 +1,24 @@ = Contributing to OsmocomBB development = Feel free to help us by extending the code. Always make sure to -send back all your patches to the baseband-devel at lists.osmocom.org -mailing list - Free Software is all about sharing. +send back all your patches to Gerrit (recommended) or to the +baseband-devel at lists.osmocom.org mailing list - Free Software +is all about sharing. For details, see: + +https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit +https://gerrit.osmocom.org/ == Coding Style == Like all C language Osmocom projects, we use the Linux Kernel coding style, you can find it in the Documentation/CodingStyle subdirectory -of any Linux Kernel source. +of any Linux Kernel source. For details, see: + +https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards == More Information == -Please consult the http://bb.osmocom.org/ web page / wiki. +Please consult the https://osmocom.org/projects/baseband/wiki/. If you have any technical questions regarding the code, don't hesitate to ask the baseband-devel at lists.osmocom.org mailing list. -- To view, visit https://gerrit.osmocom.org/9238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 Gerrit-Change-Number: 9238 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 08:47:53 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 08:47:53 +0000 Subject: Change in osmocom-bb[master]: README.development: add brief info about the TRX Toolkit Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9239 Change subject: README.development: add brief info about the TRX Toolkit ...................................................................... README.development: add brief info about the TRX Toolkit Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 --- M src/README.development 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/9239/1 diff --git a/src/README.development b/src/README.development index 060cbd9..6482143 100644 --- a/src/README.development +++ b/src/README.development @@ -65,6 +65,15 @@ * board/compal_e99 is the Motorola C155 family * Applications (each app builds one firmware image) in apps/ +=== src/target/trx_toolkit === + +A set of tools in Python for debugging TRX interface and creating +a virtual Um-interface between OsmocomBB and OsmoBTS. For details, +please refer: + +https://osmocom.org/projects/baseband/wiki/TRX_Interface +https://osmocom.org/projects/baseband/wiki/FakeTRX +target/trx_toolkit/README === src/target_dsp/calypso === @@ -75,4 +84,3 @@ The Layer2 (LAPDm / TS 04.06) and Layer3 (CC/MM/RR / TS 04.08) implementations, as they are growing. - -- To view, visit https://gerrit.osmocom.org/9239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 Gerrit-Change-Number: 9239 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 08:47:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 08:47:54 +0000 Subject: Change in osmocom-bb[master]: Remove the patches for Wireshark Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9240 Change subject: Remove the patches for Wireshark ...................................................................... Remove the patches for Wireshark GSMTAP support is already merged to the mainline, while the status of SMSCB support is unknown. In any case, OsmocomBB is not a good place for storing the patches for Wireshark, so let's remove them. Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b --- D src/wireshark/gsmtap.patch D src/wireshark/smscb.patch 2 files changed, 0 insertions(+), 1,188 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/9240/1 diff --git a/src/wireshark/gsmtap.patch b/src/wireshark/gsmtap.patch deleted file mode 100644 index 019c8b4..0000000 --- a/src/wireshark/gsmtap.patch +++ /dev/null @@ -1,445 +0,0 @@ -Index: epan/dissectors/packet-gsmtap.c -=================================================================== ---- /dev/null -+++ epan/dissectors/packet-gsmtap.c -@@ -0,0 +1,345 @@ -+/* packet-gsmtap.c -+ * Routines for GSMTAP captures -+ * -+ * (C) 2008-2010 by Harald Welte -+ * -+ * $Id$ -+ * -+ * Wireshark - Network traffic analyzer -+ * By Gerald Combs -+ * Copyright 1998 Gerald Combs -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ * -+ */ -+ -+/* GSMTAP is a generic header format for GSM protocol captures, -+ * it uses the IANA-assigned UDP port number 4729 and carries -+ * payload in various formats of GSM interfaces such as Um MAC -+ * blocks or Um bursts. -+ * -+ * Example programs generating GSMTAP data are airprobe -+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/) -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+#include -+#include -+ -+#include "packet-gsmtap.h" -+ -+static int proto_gsmtap = -1; -+ -+static int hf_gsmtap_version = -1; -+static int hf_gsmtap_hdrlen = -1; -+static int hf_gsmtap_type = -1; -+static int hf_gsmtap_timeslot = -1; -+static int hf_gsmtap_subslot = -1; -+static int hf_gsmtap_arfcn = -1; -+static int hf_gsmtap_uplink = -1; -+static int hf_gsmtap_noise_dbm = -1; -+static int hf_gsmtap_signal_dbm = -1; -+static int hf_gsmtap_frame_nr = -1; -+static int hf_gsmtap_burst_type = -1; -+static int hf_gsmtap_channel_type = -1; -+static int hf_gsmtap_antenna = -1; -+ -+static int hf_sacch_l1h_power_lev = -1; -+static int hf_sacch_l1h_fpc = -1; -+static int hf_sacch_l1h_ta = -1; -+ -+static gint ett_gsmtap = -1; -+ -+enum { -+ GSMTAP_SUB_DATA = 0, -+ GSMTAP_SUB_UM, -+ GSMTAP_SUB_UM_LAPDM, -+ GSMTAP_SUB_ABIS, -+ -+ GSMTAP_SUB_MAX -+}; -+ -+static dissector_handle_t sub_handles[GSMTAP_SUB_MAX]; -+ -+static const value_string gsmtap_bursts[] = { -+ { GSMTAP_BURST_UNKNOWN, "UNKNOWN" }, -+ { GSMTAP_BURST_FCCH, "FCCH" }, -+ { GSMTAP_BURST_PARTIAL_SCH, "PARTIAL SCH" }, -+ { GSMTAP_BURST_SCH, "SCH" }, -+ { GSMTAP_BURST_CTS_SCH, "CTS SCH" }, -+ { GSMTAP_BURST_COMPACT_SCH, "COMPACT SCH" }, -+ { GSMTAP_BURST_NORMAL, "NORMAL" }, -+ { GSMTAP_BURST_DUMMY, "DUMMY" }, -+ { GSMTAP_BURST_ACCESS, "RACH" }, -+ { 0, NULL }, -+}; -+ -+static const value_string gsmtap_channels[] = { -+ { GSMTAP_CHANNEL_UNKNOWN, "UNKNOWN" }, -+ { GSMTAP_CHANNEL_BCCH, "BCCH" }, -+ { GSMTAP_CHANNEL_CCCH, "CCCH" }, -+ { GSMTAP_CHANNEL_RACH, "RACH" }, -+ { GSMTAP_CHANNEL_AGCH, "AGCH" }, -+ { GSMTAP_CHANNEL_PCH, "PCH" }, -+ { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, -+ { GSMTAP_CHANNEL_SDCCH4, "SDCCH/4" }, -+ { GSMTAP_CHANNEL_SDCCH8, "SDCCH/8" }, -+ { GSMTAP_CHANNEL_TCH_F, "FACCH/F" }, -+ { GSMTAP_CHANNEL_TCH_H, "FACCH/H" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH, "LSACCH" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH4, "SACCH/4" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH8, "SACCH/8" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_TCH_F, "SACCH/F" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_TCH_F, "SACCH/H" }, -+ { 0, NULL }, -+}; -+ -+static const value_string gsmtap_types[] = { -+ { GSMTAP_TYPE_UM, "GSM Um (MS<->BTS)" }, -+ { GSMTAP_TYPE_ABIS, "GSM Abis (BTS<->BSC)" }, -+ { GSMTAP_TYPE_UM_BURST, "GSM Um burst (MS<->BTS)" }, -+ { 0, NULL }, -+}; -+ -+/* dissect a SACCH L1 header which is included in the first 2 bytes -+ * of every SACCH frame (according to TS 04.04) */ -+static void -+dissect_sacch_l1h(tvbuff_t *tvb, proto_tree *tree) -+{ -+ proto_item *ti; -+ proto_tree *l1h_tree = NULL; -+ -+ if (!tree) -+ return; -+ -+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, 2, -+ "SACCH L1 Header, Power Level: %u, Timing Advance: %u", -+ tvb_get_guint8(tvb, 0) & 0x1f, -+ tvb_get_guint8(tvb, 1)); -+ l1h_tree = proto_item_add_subtree(ti, ett_gsmtap); -+ /* Power Level */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, FALSE); -+ /* Fast Power Control */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, FALSE); -+ /* Acutal Timing Advance */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, FALSE); -+} -+ -+/* dissect a GSMTAP header and hand payload off to respective dissector */ -+static void -+dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ int sub_handle, len, offset = 0; -+ proto_item *ti; -+ proto_tree *gsmtap_tree = NULL; -+ tvbuff_t *payload_tvb, *l1h_tvb = NULL; -+ guint8 hdr_len, type, sub_type; -+ guint16 arfcn; -+ -+ len = tvb_length(tvb); -+ -+ hdr_len = tvb_get_guint8(tvb, offset + 1) <<2; -+ type = tvb_get_guint8(tvb, offset + 2); -+ sub_type = tvb_get_guint8(tvb, offset + 12); -+ arfcn = tvb_get_ntohs(tvb, offset + 4); -+ -+ /* In case of a SACCH, there is a two-byte L1 header in front -+ * of the packet (see TS 04.04) */ -+ if (type == GSMTAP_TYPE_UM && -+ sub_type & GSMTAP_CHANNEL_ACCH) { -+ l1h_tvb = tvb_new_subset(tvb, hdr_len, 2, 2); -+ payload_tvb = tvb_new_subset(tvb, hdr_len+2, len-(hdr_len+2), -+ len-(hdr_len+2)); -+ } else { -+ payload_tvb = tvb_new_subset(tvb, hdr_len, len-hdr_len, -+ len-hdr_len); -+ } -+ -+ /* We don't want any UDP related info left in the INFO field, as the -+ * gsm_a_dtap dissector will not clear but only append */ -+ col_clear(pinfo->cinfo, COL_INFO); -+ -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSMTAP"); -+ -+ if (arfcn & GSMTAP_ARFCN_F_UPLINK) { -+ col_append_str(pinfo->cinfo, COL_RES_NET_SRC, "MS"); -+ col_append_str(pinfo->cinfo, COL_RES_NET_DST, "BTS"); -+ /* p2p_dir is used by the LAPDm dissector */ -+ pinfo->p2p_dir = P2P_DIR_SENT; -+ } else { -+ col_set_str(pinfo->cinfo, COL_RES_NET_SRC, "BTS"); -+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) { -+ case GSMTAP_CHANNEL_BCCH: -+ case GSMTAP_CHANNEL_CCCH: -+ case GSMTAP_CHANNEL_PCH: -+ case GSMTAP_CHANNEL_AGCH: -+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "Broadcast"); -+ break; -+ default: -+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "MS"); -+ break; -+ } -+ /* p2p_dir is used by the LAPDm dissector */ -+ pinfo->p2p_dir = P2P_DIR_RECV; -+ } -+ -+ if (tree) { -+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, hdr_len, -+ "GSM TAP Header, ARFCN: %u (%s), TS: %u, Channel: %s (%u)", -+ arfcn & GSMTAP_ARFCN_MASK, -+ arfcn & GSMTAP_ARFCN_F_UPLINK ? "Uplink" : "Downlink", -+ tvb_get_guint8(tvb, offset+3), -+ match_strval(tvb_get_guint8(tvb, offset+12), gsmtap_channels), -+ tvb_get_guint8(tvb, offset+14)); -+ gsmtap_tree = proto_item_add_subtree(ti, ett_gsmtap); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_version, -+ tvb, offset, 1, FALSE); -+ proto_tree_add_uint_format(gsmtap_tree, hf_gsmtap_hdrlen, -+ tvb, offset+1, 1, hdr_len, -+ "Header length: %u bytes", hdr_len); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_type, -+ tvb, offset+2, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_timeslot, -+ tvb, offset+3, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_arfcn, -+ tvb, offset+4, 2, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_uplink, -+ tvb, offset+4, 2, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_noise_dbm, -+ tvb, offset+6, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_signal_dbm, -+ tvb, offset+7, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_frame_nr, -+ tvb, offset+8, 4, FALSE); -+ if (type == GSMTAP_TYPE_UM_BURST) -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_burst_type, -+ tvb, offset+12, 1, FALSE); -+ else if (type == GSMTAP_TYPE_UM) -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_channel_type, -+ tvb, offset+12, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_antenna, -+ tvb, offset+13, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_subslot, -+ tvb, offset+14, 1, FALSE); -+ } -+ -+ switch (type) { -+ case GSMTAP_TYPE_UM: -+ if (l1h_tvb) -+ dissect_sacch_l1h(l1h_tvb, tree); -+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) { -+ case GSMTAP_CHANNEL_BCCH: -+ case GSMTAP_CHANNEL_CCCH: -+ case GSMTAP_CHANNEL_PCH: -+ case GSMTAP_CHANNEL_AGCH: -+ /* FIXME: we might want to skip idle frames */ -+ sub_handle = GSMTAP_SUB_UM; -+ break; -+ case GSMTAP_CHANNEL_SDCCH: -+ case GSMTAP_CHANNEL_SDCCH4: -+ case GSMTAP_CHANNEL_SDCCH8: -+ case GSMTAP_CHANNEL_TCH_F: -+ case GSMTAP_CHANNEL_TCH_H: -+ sub_handle = GSMTAP_SUB_UM_LAPDM; -+ break; -+ case GSMTAP_CHANNEL_RACH: -+ default: -+ sub_handle = GSMTAP_SUB_DATA; -+ break; -+ } -+ break; -+ case GSMTAP_TYPE_UM_BURST: -+ default: -+ sub_handle = GSMTAP_SUB_DATA; -+ break; -+ } -+ call_dissector(sub_handles[sub_handle], payload_tvb, pinfo, tree); -+} -+ -+static const true_false_string sacch_l1h_fpc_mode_vals = { -+ "In use", -+ "Not in use" -+}; -+ -+void -+proto_register_gsmtap(void) -+{ -+ static hf_register_info hf[] = { -+ { &hf_gsmtap_version, { "Version", "gsmtap.version", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_hdrlen, { "Header Length", "gsmtap.hdr_len", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_type, { "Payload Type", "gsmtap.type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_types), 0, NULL, HFILL } }, -+ { &hf_gsmtap_timeslot, { "Time Slot", "gsmtap.ts", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_arfcn, { "ARFCN", "gsmtap.arfcn", -+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_MASK, NULL, HFILL } }, -+ { &hf_gsmtap_uplink, { "Uplink", "gsmtap.uplink", -+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_F_UPLINK, NULL, HFILL } }, -+ { &hf_gsmtap_noise_dbm, { "Signal/Noise Ratio (dB)", "gsmtap.snr_db", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_signal_dbm, { "Signal Level (dBm)", "gsmtap.signal_dbm", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_frame_nr, { "GSM Frame Number", "gsmtap.frame_nr", -+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_burst_type, { "Burst Type", "gsmtap.burst_type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_bursts), 0, NULL, HFILL }}, -+ { &hf_gsmtap_channel_type, { "Channel Type", "gsmtap.chan_type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_channels), 0, NULL, HFILL }}, -+ { &hf_gsmtap_antenna, { "Antenna Number", "gsmtap.antenna", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_subslot, { "Sub-Slot", "gsmtap.sub_slot", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ -+ { &hf_sacch_l1h_power_lev, { "MS power level", "gsmtap.sacch_l1.power_lev", -+ FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } }, -+ { &hf_sacch_l1h_fpc, { "FPC", "gsmtap.sacch_l1.fpc", -+ FT_BOOLEAN, 8, TFS(&sacch_l1h_fpc_mode_vals), 0x04, -+ NULL, HFILL } }, -+ { &hf_sacch_l1h_ta, { "Actual Timing Advance", "gsmtap.sacch_l1.ta", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ }; -+ static gint *ett[] = { -+ &ett_gsmtap -+ }; -+ -+ proto_gsmtap = proto_register_protocol("GSM Radiotap", "GSMTAP", "gsmtap"); -+ proto_register_field_array(proto_gsmtap, hf, array_length(hf)); -+ proto_register_subtree_array(ett, array_length(ett)); -+} -+ -+void -+proto_reg_handoff_gsmtap(void) -+{ -+ dissector_handle_t gsmtap_handle; -+ -+ sub_handles[GSMTAP_SUB_DATA] = find_dissector("data"); -+ sub_handles[GSMTAP_SUB_UM] = find_dissector("gsm_a_ccch"); -+ sub_handles[GSMTAP_SUB_UM_LAPDM] = find_dissector("lapdm"); -+ sub_handles[GSMTAP_SUB_ABIS] = find_dissector("gsm_a_dtap"); -+ gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap); -+ dissector_add("udp.port", GSMTAP_UDP_PORT, gsmtap_handle); -+} -Index: epan/dissectors/packet-gsmtap.h -=================================================================== ---- /dev/null -+++ epan/dissectors/packet-gsmtap.h -@@ -0,0 +1,70 @@ -+#ifndef _GSMTAP_H -+#define _GSMTAP_H -+ -+/* gsmtap header, pseudo-header in front of the actua/ GSM payload */ -+ -+/* GSMTAP is a generic header format for GSM protocol captures, -+ * it uses the IANA-assigned UDP port number 4729 and carries -+ * payload in various formats of GSM interfaces such as Um MAC -+ * blocks or Um bursts. -+ * -+ * Example programs generating GSMTAP data are airprobe -+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/) -+ */ -+ -+#define GSMTAP_TYPE_UM 0x01 -+#define GSMTAP_TYPE_ABIS 0x02 -+#define GSMTAP_TYPE_UM_BURST 0x03 /* raw burst bits */ -+ -+#define GSMTAP_BURST_UNKNOWN 0x00 -+#define GSMTAP_BURST_FCCH 0x01 -+#define GSMTAP_BURST_PARTIAL_SCH 0x02 -+#define GSMTAP_BURST_SCH 0x03 -+#define GSMTAP_BURST_CTS_SCH 0x04 -+#define GSMTAP_BURST_COMPACT_SCH 0x05 -+#define GSMTAP_BURST_NORMAL 0x06 -+#define GSMTAP_BURST_DUMMY 0x07 -+#define GSMTAP_BURST_ACCESS 0x08 -+#define GSMTAP_BURST_NONE 0x09 -+ -+#define GSMTAP_CHANNEL_UNKNOWN 0x00 -+#define GSMTAP_CHANNEL_BCCH 0x01 -+#define GSMTAP_CHANNEL_CCCH 0x02 -+#define GSMTAP_CHANNEL_RACH 0x03 -+#define GSMTAP_CHANNEL_AGCH 0x04 -+#define GSMTAP_CHANNEL_PCH 0x05 -+#define GSMTAP_CHANNEL_SDCCH 0x06 -+#define GSMTAP_CHANNEL_SDCCH4 0x07 -+#define GSMTAP_CHANNEL_SDCCH8 0x08 -+#define GSMTAP_CHANNEL_TCH_F 0x09 -+#define GSMTAP_CHANNEL_TCH_H 0x0a -+#define GSMTAP_CHANNEL_ACCH 0x80 -+ -+#define GSMTAP_ARFCN_F_PCS 0x8000 -+#define GSMTAP_ARFCN_F_UPLINK 0x4000 -+#define GSMTAP_ARFCN_MASK 0x3fff -+ -+#define GSMTAP_UDP_PORT 4729 -+ -+/* This is the header as it is used by gsmtap-generating software. -+ * It is not used by the wireshark dissector and provided for reference only. -+struct gsmtap_hdr { -+ guint8 version; // version, set to 0x01 currently -+ guint8 hdr_len; // length in number of 32bit words -+ guint8 type; // see GSMTAP_TYPE_* -+ guint8 timeslot; // timeslot (0..7 on Um) -+ -+ guint16 arfcn; // ARFCN (frequency) -+ gint8 signal_dbm; // signal level in dBm -+ gint8 snr_db; // signal/noise ratio in dB -+ -+ guint32 frame_number; // GSM Frame Number (FN) -+ -+ guint8 sub_type; // Type of burst/channel, see above -+ guint8 antenna_nr; // Antenna Number -+ guint8 sub_slot; // sub-slot within timeslot -+ guint8 res; // reserved for future use (RFU) -+} -+ */ -+ -+#endif /* _GSMTAP_H */ -Index: epan/dissectors/Makefile.common -=================================================================== ---- epan/dissectors/Makefile.common.orig -+++ epan/dissectors/Makefile.common -@@ -484,6 +484,7 @@ - packet-gsm_sms.c \ - packet-gsm_sms_ud.c \ - packet-gsm_um.c \ -+ packet-gsmtap.c \ - packet-gssapi.c \ - packet-gtp.c \ - packet-gtpv2.c \ -@@ -1072,6 +1073,7 @@ - packet-gsm_a_common.h \ - packet-gsm_map.h \ - packet-gsm_sms.h \ -+ packet-gsmtap.h \ - packet-gssapi.h \ - packet-gtp.h \ - packet-h223.h \ diff --git a/src/wireshark/smscb.patch b/src/wireshark/smscb.patch deleted file mode 100644 index 80005a3..0000000 --- a/src/wireshark/smscb.patch +++ /dev/null @@ -1,743 +0,0 @@ -Wireshark patch for SMSCB dissection support in LAPDm - -Create a new gsm_smscb dissector module for SMSCB as defined in GSM TS -04.12. Call it from packet-lapdm when the Link Protocol Discriminator -has the value "0 1". - -Signed-off-by: Alex Badea ---- - epan/dissectors/Makefile.common | 1 + - epan/dissectors/packet-gsm_smscb.c | 642 ++++++++++++++++++++++++++++++++++++ - epan/dissectors/packet-lapdm.c | 18 +- - 3 files changed, 658 insertions(+), 3 deletions(-) - -diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common -index 9f9a602..5684579 100644 ---- a/epan/dissectors/Makefile.common -+++ b/epan/dissectors/Makefile.common -@@ -500,6 +500,7 @@ DISSECTOR_SRC = \ - packet-gsm_bssmap_le.c \ - packet-gsm_sms.c \ - packet-gsm_sms_ud.c \ -+ packet-gsm_smscb.c \ - packet-gsm_um.c \ - packet-gsmtap.c \ - packet-gssapi.c \ -diff --git a/epan/dissectors/packet-gsm_smscb.c b/epan/dissectors/packet-gsm_smscb.c -new file mode 100644 -index 0000000..a2f8bee ---- /dev/null -+++ b/epan/dissectors/packet-gsm_smscb.c -@@ -0,0 +1,642 @@ -+/* packet-gsm_smscb.c -+ * Routines for GSM SMSCB (GSM 04.12) dissection -+ * Copyright 2010, Alex Badea -+ * -+ * $Id$ -+ * -+ * Wireshark - Network traffic analyzer -+ * By Gerald Combs -+ * Copyright 1998 Gerald Combs -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include "packet-gsm_map.h" -+#include "packet-gsm_sms.h" -+ -+static gint proto_gsm_smscb = -1; -+static gint hf_smscb_addr = -1; -+static gint hf_smscb_addr_lb = -1; -+static gint hf_smscb_addr_seq = -1; -+static gint hf_smscb_serial_gs = -1; -+static gint hf_smscb_serial_mcode = -1; -+static gint hf_smscb_serial_updnum = -1; -+static gint hf_smscb_page_num = -1; -+static gint hf_smscb_page_cnt = -1; -+static gint hf_smscb_msgid = -1; -+static gint hf_smscb_content = -1; -+static gint hf_smscb_fragments = -1; -+static gint hf_smscb_fragment = -1; -+static gint hf_smscb_fragment_overlap = -1; -+static gint hf_smscb_fragment_overlap_conflicts = -1; -+static gint hf_smscb_fragment_multiple_tails = -1; -+static gint hf_smscb_fragment_too_long_fragment = -1; -+static gint hf_smscb_fragment_error = -1; -+static gint hf_smscb_reassembled_in = -1; -+static gint hf_smscb_reassembled_length = -1; -+static gint hf_smscb_sched_type = -1; -+static gint hf_smscb_sched_spare = -1; -+static gint hf_smscb_sched_begin_slot = -1; -+static gint hf_smscb_sched_end_slot = -1; -+static gint hf_smscb_sched_mdt1 = -1; -+static gint hf_smscb_sched_mdt2 = -1; -+static gint hf_smscb_sched_mdt8 = -1; -+static gint hf_smscb_sched_msgid = -1; -+static gint hf_smscb_sched_repslot = -1; -+ -+static gint ett_smscb = -1; -+static gint ett_smscb_addr = -1; -+static gint ett_smscb_dcs = -1; -+static gint ett_smscb_fragment = -1; -+static gint ett_smscb_fragments = -1; -+static gint ett_smscb_sched_new = -1; -+static gint ett_smscb_sched_other = -1; -+static gint ett_smscb_sched_slot = -1; -+ -+static GHashTable *smscb_fragment_table = NULL; -+static GHashTable *smscb_reassembled_table = NULL; -+ -+static gboolean reassemble_smscb = TRUE; -+ -+static dissector_handle_t data_handle; -+ -+#define SMSCB_HDR_MINLEN 1 -+ -+/* -+ * Bits in the address field. -+ */ -+#define SMSCB_ADDR_LB 0x10 /* Address Last Bit */ -+#define SMSCB_ADDR_SEQ 0x0f /* Address sequence number */ -+#define SMSCB_SERIAL_GS 0xc000 /* CBS Serial Number - Geographical Scope */ -+#define SMSCB_SERIAL_MCODE 0x3ff0 /* CBS Serial Number - Message Code */ -+#define SMSCB_SERIAL_UPDNUM 0x000f /* CBS Serial Number - Update Number */ -+#define SMSCB_PAGE_NUM 0xf0 /* Page number */ -+#define SMSCB_PAGE_CNT 0x0f /* Page total count */ -+ -+/* -+ * Bits in the Schedule message -+ */ -+#define SMSCB_SCHED_TYPE 0xc0 /* Type */ -+#define SMSCB_SCHED_SLOT 0x3f /* Begin/End Slot Number */ -+#define SMSCB_SCHED_SPARE 0xc0 /* Spare */ -+#define SMSCB_SCHED_MDT1 0x8000 /* MDT (1 bit)*/ -+#define SMSCB_SCHED_MSGID 0x7fff /* Message ID */ -+#define SMSCB_SCHED_MDT2 0xc0 /* MDT (2 bits) */ -+#define SMSCB_SCHED_REPSLOT 0x3f /* Repeated Slot Number */ -+ -+#define SMSCB_SEQ_LAST 3 -+#define SMSCB_SEQ_1ST 0 -+#define SMSCB_SEQ_1ST_SCHED 8 -+ -+#define SMSCB_SCHED_SLOT_MAX 48 -+ -+/* 04.12 section 3.3.1 */ -+static const value_string smscb_addr_lb_vals[] = { -+ { 0, "More blocks" }, -+ { 1, "Last block" }, -+ { 0, NULL } -+}; -+ -+/* 04.12 section 3.3.1 */ -+static const value_string smscb_addr_seq_vals[] = { -+ { 0, "First block" }, -+ { 1, "Second block" }, -+ { 2, "Third block" }, -+ { 3, "Fourth block" }, -+ { 8, "First schedule block" }, -+ { 15, "Null message" }, -+ { 0, NULL } -+}; -+ -+/* 03.41 section 9.3.2.1 */ -+static const value_string smscb_serial_gs_vals[] = { -+ { 0, "Cell wide (immediate)" }, -+ { 1, "PLMN wide" }, -+ { 2, "Location Area wide" }, -+ { 3, "Cell wide" }, -+ { 0, NULL } -+}; -+ -+/* 04.14 section 3.5.5 */ -+static const value_string smscb_sched_mdt8_vals[] = { -+ { 0x00, "Retransmission indication" }, -+ { 0x80, "First transmission of an SMSCB within the Schedule Period" }, -+ { 0x40, "Free Message Slot, optional reading" }, -+ { 0x41, "Free Message Slot, reading advised" }, -+ { 0, NULL } -+}; -+ -+static const fragment_items smscb_frag_items = { -+ /* Fragment subtrees */ -+ &ett_smscb_fragment, -+ &ett_smscb_fragments, -+ /* Fragment fields */ -+ &hf_smscb_fragments, -+ &hf_smscb_fragment, -+ &hf_smscb_fragment_overlap, -+ &hf_smscb_fragment_overlap_conflicts, -+ &hf_smscb_fragment_multiple_tails, -+ &hf_smscb_fragment_too_long_fragment, -+ &hf_smscb_fragment_error, -+ /* Reassembled in field */ -+ &hf_smscb_reassembled_in, -+ /* Reassembled length field */ -+ &hf_smscb_reassembled_length, -+ /* Tag */ -+ "fragments" -+}; -+ -+static void smscb_defragment_init(void) -+{ -+ fragment_table_init(&smscb_fragment_table); -+ reassembled_table_init(&smscb_reassembled_table); -+} -+ -+/* [3GPP TS 03.41 section 9.3] */ -+static int dissect_smscb_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ gint offset = 0; -+ gint length, out_len, textlen; -+ guint8 encoding; -+ gchar msgbuf[88 + 1]; -+ gchar *utf8_text, *p; -+ -+ proto_tree_add_item(tree, hf_smscb_serial_gs, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_serial_mcode, tvb, offset, 2, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_serial_updnum, tvb, offset, 1, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_msgid, tvb, offset, 2, ENC_BIG_ENDIAN); -+ col_append_fstr(pinfo->cinfo, COL_INFO, " - Message ID %d", tvb_get_ntohs(tvb, offset)); -+ offset += 2; -+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Data Coding Scheme"); -+ encoding = dissect_cbs_data_coding_scheme( -+ tvb_new_subset(tvb, offset, 1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_dcs)); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_page_num, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_page_cnt, tvb, offset, 1, ENC_NA); -+ offset++; -+ -+ length = tvb_length(tvb) - offset; -+ switch (encoding) { -+ case SMS_ENCODING_7BIT: -+ case SMS_ENCODING_7BIT_LANG: -+ out_len = gsm_sms_char_7bit_unpack(0, length, sizeof(msgbuf) - 1, -+ tvb_get_ptr(tvb, offset, length), msgbuf); -+ msgbuf[out_len] = '\0'; -+ utf8_text = gsm_sms_chars_to_utf8(msgbuf, out_len); -+ textlen = strlen(utf8_text); -+ break; -+ /* TODO: UCS2? */ -+ case SMS_ENCODING_8BIT: -+ default: -+ utf8_text = tvb_get_ephemeral_string(tvb, offset, length); -+ textlen = length; -+ break; -+ } -+ -+ proto_tree_add_string(tree, hf_smscb_content, tvb, offset, length, utf8_text); -+ -+ /* strip padding */ -+ if ((p = strchr( utf8_text, '\r'))) -+ *p = 0; -+ col_append_fstr(pinfo->cinfo, COL_INFO, " \"%s\"", utf8_text); -+ -+ return tvb_length(tvb); -+} -+ -+/* [3GPP TS 04.14 section 3.5.5] */ -+static int dissect_sched_msg_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, -+ gint *slot_list, gint slot_count) -+{ -+ gint offset = 0; -+ gint k; -+ proto_item *ti; -+ proto_tree *subtree; -+ guint8 mdt; -+ -+ for (k = 0; k < slot_count; k++) { -+ mdt = tvb_get_guint8(tvb, offset); -+ -+ if (mdt & 0x80) -+ mdt = 0x80; -+ else if (!(mdt & 0x40)) -+ mdt = 0; -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Slot %d - %s", -+ slot_list[k], -+ val_to_str(mdt, smscb_sched_mdt8_vals, "Unknown (0x%02x)")); -+ subtree = proto_item_add_subtree(ti, ett_smscb_sched_slot); -+ -+ if (mdt & 0x80) { -+ guint16 msgid = tvb_get_ntohs(tvb, offset) & SMSCB_SCHED_MSGID; -+ proto_item_append_text(ti, " (message ID %d)", msgid); -+ proto_item_set_len(ti, 2); -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt1, tvb, offset, 2, ENC_BIG_ENDIAN); -+ proto_tree_add_item(subtree, hf_smscb_sched_msgid, tvb, offset, 2, ENC_BIG_ENDIAN); -+ offset += 2; -+ } else if (!(mdt & 0xc0)) { -+ guint8 slot = tvb_get_guint8(tvb, offset) & SMSCB_SCHED_SLOT; -+ proto_item_append_text(ti, " (slot %d)", slot); -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt2, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(subtree, hf_smscb_sched_repslot, tvb, offset, 1, ENC_NA); -+ offset++; -+ } else { -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt8, tvb, offset, 1, ENC_NA); -+ offset++; -+ } -+ } -+ return offset; -+} -+ -+/* [3GPP TS 04.14 section 3.5] */ -+static int dissect_sched_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ gint offset = 0; -+ gint first, last, nm, len; -+ gint new_count = 0; -+ gint other_count = 0; -+ gint new_list[SMSCB_SCHED_SLOT_MAX]; -+ gint other_list[SMSCB_SCHED_SLOT_MAX]; -+ -+ col_append_str(pinfo->cinfo, COL_INFO, " - Schedule message"); -+ -+ proto_tree_add_item(tree, hf_smscb_sched_type, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_sched_begin_slot, tvb, offset, 1, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_sched_spare, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_sched_end_slot, tvb, offset, 1, ENC_NA); -+ offset++; -+ -+ first = tvb_get_guint8(tvb, 0) & SMSCB_SCHED_SLOT; -+ last = tvb_get_guint8(tvb, 1) & SMSCB_SCHED_SLOT; -+ last = MIN(last, SMSCB_SCHED_SLOT_MAX); -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 6, "List of new message slots ="); -+ for (nm = first; nm <= last; nm++) { -+ if (tvb_get_bits8(tvb, offset * 8 + nm - first, 1)) { -+ proto_item_append_text(ti, " %d", nm); -+ new_list[new_count++] = nm; -+ } else { -+ other_list[other_count++] = nm; -+ } -+ } -+ offset += 6; -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 0, "New Message Descriptions"); -+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_sched_new), -+ new_list, new_count); -+ offset += len; -+ proto_item_set_len(ti, len); -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 0, "Other Message Descriptions"); -+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_sched_other), -+ other_list, other_count); -+ offset += len; -+ proto_item_set_len(ti, len); -+ -+ return offset; -+} -+ -+static inline int seq_any_frags(guint8 seq) -+{ -+ return seq <= SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_more_frags(guint8 seq) -+{ -+ return seq < SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_first(guint8 seq) -+{ -+ return seq == SMSCB_SEQ_1ST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_bits(guint8 seq) -+{ -+ return seq & 3; -+} -+ -+/* -+ * Do the reassembly thing. -+ * -+ * SMSCB fragmentation doesn't really fit in with the wireshark -+ * reassembler. There are only two valid fragment sequences: -+ * i) 0,1,2,3 for a SMSCB message -+ * ii) 8,1,2,3 for a schedule message -+ * -+ * We can't use different fragment-IDs for each content type, -+ * since the last 3 blocks have identical sequence numbers. -+ * -+ * We can't just mask the lower 2 bits, because when reassembly -+ * completes (which is on the last block, sequence #3) we won't -+ * know which content type we've reassembled. -+ * -+ * We also can't munge e.g. the schedule sequence to 8,9,10,11, -+ * since the reassembler will think we're missing the first 8 -+ * blocks and not do anything. -+ * -+ * Also, according to TS 03.41 section 8 we must discard -+ * non-consecutive sequences. -+ * -+ * So the approach here is to include the address header byte -+ * in the first fragment. This way after reassembly we can peek -+ * at it and dissect accordingly. -+ * -+ * A clean implementation would likely be to add a FD_* reassembler -+ * flag to special-case this behaviour. -+ */ -+static tvbuff_t *smscb_try_reassembly(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+ guint8 *seq_p, guint8 more) -+{ -+ guint8 seq = *seq_p; -+ fragment_data *frag; -+ guint32 frag_id = 0x42; -+ guchar expected_seq = 0; -+ tvbuff_t *reassembled = NULL; -+ gboolean save_fragmented = pinfo->fragmented; -+ -+ if (!reassemble_smscb || !seq_any_frags(seq)) -+ return tvb; -+ -+ frag = fragment_get(pinfo, frag_id, smscb_fragment_table); -+ if (frag) { -+ while (frag->next) -+ frag = frag->next; -+ expected_seq = frag->offset + 1; -+ } -+ -+ if (seq != expected_seq) -+ g_free(fragment_delete(pinfo, frag_id, smscb_fragment_table)); -+ -+ if (!seq_first(seq)) -+ tvb = tvb_new_subset(tvb, 1, -1, -1); -+ -+ pinfo->fragmented = more; -+ frag = fragment_add_seq_check(tvb, 0, pinfo, frag_id, -+ smscb_fragment_table, -+ smscb_reassembled_table, seq_bits(seq), -+ tvb_length(tvb), -+ more); -+ -+ reassembled = process_reassembled_data(tvb, 0, pinfo, -+ "Reassembled SMSCB", frag, &smscb_frag_items, NULL, tree); -+ -+ if (frag && pinfo->fd->num == frag->reassembled_in) { -+ *seq_p = tvb_get_guint8(reassembled, 0) & SMSCB_ADDR_SEQ; -+ reassembled = tvb_new_subset(reassembled, 1, -1, -1); -+ } else { -+ col_append_str(pinfo->cinfo, COL_INFO, " (Fragment)"); -+ proto_tree_add_text(tree, tvb, 0, -1, "Fragment Data"); -+ reassembled = NULL; -+ } -+ -+ pinfo->fragmented = save_fragmented; -+ return reassembled; -+} -+ -+static int dissect_gsm_smscb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ proto_tree *gsm_smscb_tree = NULL; -+ proto_tree *subtree = NULL; -+ guint8 addr, seq, more; -+ tvbuff_t *payload; -+ -+ if (tvb_length(tvb) < SMSCB_HDR_MINLEN) -+ return 0; -+ -+ addr = tvb_get_guint8(tvb, 0); -+ seq = addr & SMSCB_ADDR_SEQ; -+ more = !(addr & SMSCB_ADDR_LB) && seq_more_frags(seq); -+ -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMSCB"); -+ -+ col_clear(pinfo->cinfo, COL_INFO); -+ col_append_str(pinfo->cinfo, COL_INFO, -+ val_to_str(seq, smscb_addr_seq_vals, "Unknown block #%d")); -+ -+ if (tree) { -+ ti = proto_tree_add_item(tree, proto_gsm_smscb, tvb, 0, -1, ENC_NA); -+ gsm_smscb_tree = proto_item_add_subtree(ti, ett_smscb); -+ -+ ti = proto_tree_add_item(gsm_smscb_tree, hf_smscb_addr, tvb, 0, 1, ENC_NA); -+ subtree = proto_item_add_subtree(ti, ett_smscb_addr); -+ proto_tree_add_item(subtree, hf_smscb_addr_lb, tvb, 0, 1, ENC_NA); -+ proto_tree_add_item(subtree, hf_smscb_addr_seq, tvb, 0, 1, ENC_NA); -+ } -+ -+ payload = smscb_try_reassembly(tvb, pinfo, gsm_smscb_tree, &seq, more); -+ if (payload) { -+ switch (seq) { -+ case SMSCB_SEQ_1ST: -+ dissect_smscb_message(payload, pinfo, gsm_smscb_tree); -+ break; -+ case SMSCB_SEQ_1ST_SCHED: -+ dissect_sched_message(payload, pinfo, gsm_smscb_tree); -+ break; -+ } -+ } -+ -+ return tvb_length(tvb); -+} -+ -+static hf_register_info hf[] = { -+ { &hf_smscb_addr, { -+ "Address Field", "smscb.addr", FT_UINT8, BASE_HEX, -+ NULL, 0x0, -+ "Address", HFILL, -+ }}, -+ { &hf_smscb_addr_lb, { -+ "LB", "smscb.addr.lb", FT_UINT8, BASE_DEC, -+ VALS(smscb_addr_lb_vals), SMSCB_ADDR_LB, -+ "Last Block bit", HFILL, -+ }}, -+ { &hf_smscb_addr_seq, { -+ "SEQ", "smscb.addr.seq", FT_UINT8, BASE_DEC, -+ VALS(smscb_addr_seq_vals), SMSCB_ADDR_SEQ, -+ "Sequence Number", HFILL, -+ }}, -+ -+ { &hf_smscb_serial_gs, { -+ "Geographic Scope", "smscb.serial.gs", FT_UINT16, BASE_DEC, -+ VALS(smscb_serial_gs_vals), SMSCB_SERIAL_GS, NULL, HFILL, -+ }}, -+ { &hf_smscb_serial_mcode, { -+ "Message Code", "smscb.serial.mcode", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SERIAL_MCODE, NULL, HFILL, -+ }}, -+ { &hf_smscb_serial_updnum, { -+ "Update Number", "smscb.serial.updnum", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SERIAL_UPDNUM, NULL, HFILL, -+ }}, -+ -+ { &hf_smscb_msgid, { -+ "Message Identifier", "smscb.msgid", FT_UINT16, BASE_DEC, -+ NULL, 0, NULL, HFILL, -+ }}, -+ -+ { &hf_smscb_page_num, { -+ "Page number", "smscb.page.num", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_PAGE_NUM, NULL, HFILL, -+ }}, -+ { &hf_smscb_page_cnt, { -+ "Total pages", "smscb.page.cnt", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_PAGE_CNT, NULL, HFILL, -+ }}, -+ { &hf_smscb_content, { -+ "Content of Message", "smscb.content", FT_STRING, BASE_NONE, -+ NULL, 0x00, NULL, HFILL, -+ }}, -+ -+ /* Schedule message */ -+ { &hf_smscb_sched_type, { -+ "Type", "smscb.sched.type", FT_UINT8, BASE_HEX, -+ NULL, SMSCB_SCHED_TYPE, -+ "Type", HFILL, -+ }}, -+ { &hf_smscb_sched_spare, { -+ "Spare", "smscb.sched.spare", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_TYPE, -+ "Spare", HFILL, -+ }}, -+ { &hf_smscb_sched_begin_slot, { -+ "Begin slot", "smscb.sched.begin_slot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_SLOT, -+ "Begin slot", HFILL, -+ }}, -+ { &hf_smscb_sched_end_slot, { -+ "End slot", "smscb.sched.end_slot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_SLOT, -+ "End slot", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt1, { -+ "MDT", "smscb.sched.mdt1", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SCHED_MDT1, -+ "Message Description Type", HFILL, -+ }}, -+ { &hf_smscb_sched_msgid, { -+ "Message ID", "smscb.sched.msg_id", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SCHED_MSGID, -+ "Message ID", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt2, { -+ "MDT", "smscb.sched.mdt2", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_MDT2, -+ "Message Description Type", HFILL, -+ }}, -+ { &hf_smscb_sched_repslot, { -+ "Repeated Slot Number", "smscb.sched.repslot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_REPSLOT, -+ "Repeated Slot Number", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt8, { -+ "MDT", "smscb.sched.mdt8", FT_UINT8, BASE_HEX, -+ VALS(smscb_sched_mdt8_vals), 0x00, -+ "Message Description Type", HFILL, -+ }}, -+ -+ /* Fragment reassembly */ -+ { &hf_smscb_fragments, { -+ "Message fragments", "smscb.fragments", -+ FT_NONE, BASE_NONE, NULL, 0x00, -+ "SMSCB Message fragments", HFILL, -+ }}, -+ { &hf_smscb_fragment, { -+ "Message fragment", "smscb.fragment", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message fragment", HFILL, -+ }}, -+ { &hf_smscb_fragment_overlap, { -+ "Message fragment overlap", "smscb.fragment.overlap", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment overlaps with other fragment(s)", HFILL, -+ }}, -+ { &hf_smscb_fragment_overlap_conflicts, { -+ "Message fragment overlapping with conflicting data", "smscb.fragment.overlap.conflicts", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment overlaps with conflicting data", HFILL, -+ }}, -+ { &hf_smscb_fragment_multiple_tails, { -+ "Message has multiple tail fragments", "smscb.fragment.multiple_tails", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment has multiple tail fragments", HFILL, -+ }}, -+ { &hf_smscb_fragment_too_long_fragment, { -+ "Message fragment too long", "smscb.fragment.too_long_fragment", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment data goes beyond the packet end", HFILL, -+ }}, -+ { &hf_smscb_fragment_error, { -+ "Message defragmentation error", "smscb.fragment.error", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message defragmentation error due to illegal fragments", HFILL, -+ }}, -+ { &hf_smscb_reassembled_in, { -+ "Reassembled in", "smscb.reassembled.in", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message has been reassembled in this packet.", HFILL, -+ }}, -+ { &hf_smscb_reassembled_length, { -+ "Reassembled SMSCB length", "smscb.reassembled.length", -+ FT_UINT32, BASE_DEC, NULL, 0x00, -+ "The total length of the reassembled payload", HFILL, -+ }}, -+}; -+ -+static gint *ett[] = { -+ &ett_smscb, -+ &ett_smscb_addr, -+ &ett_smscb_dcs, -+ &ett_smscb_fragment, -+ &ett_smscb_fragments, -+ &ett_smscb_sched_new, -+ &ett_smscb_sched_other, -+ &ett_smscb_sched_slot, -+}; -+ -+void proto_reg_handoff_gsm_smscb(void) -+{ -+ data_handle = find_dissector("data"); -+} -+ -+void proto_register_gsm_smscb(void) -+{ -+ proto_gsm_smscb = proto_register_protocol( -+ "Short Message Service Cell Broadcast", -+ "SMSCB", "gsm_smscb"); -+ -+ proto_register_field_array(proto_gsm_smscb, hf, array_length(hf)); -+ proto_register_subtree_array(ett, array_length(ett)); -+ -+ new_register_dissector("gsm_smscb", dissect_gsm_smscb, proto_gsm_smscb); -+ register_init_routine(smscb_defragment_init); -+} -diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c -index dbeac85..add859d 100644 ---- a/epan/dissectors/packet-lapdm.c -+++ b/epan/dissectors/packet-lapdm.c -@@ -110,6 +110,7 @@ static GHashTable *lapdm_reassembled_table = NULL; - static dissector_table_t lapdm_sapi_dissector_table; - - static dissector_handle_t data_handle; -+static dissector_handle_t smscb_handle; - - static gboolean reassemble_lapdm = TRUE; - -@@ -121,6 +122,7 @@ static gboolean reassemble_lapdm = TRUE; - #define LAPDM_CR 0x02 /* Command/Response bit */ - #define LAPDM_EA 0x01 /* First Address Extension bit */ - #define LAPDM_LPD 0x60 /* Link Protocol Discriminator */ -+#define LAPDM_LPD_CB 0x20 /* Cell Broadcast LPD */ - - /* - * Bits in the length field. -@@ -219,6 +221,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - tvbuff_t *payload; - int available_length; - gboolean is_response = FALSE; -+ gboolean is_cbs = FALSE; - - /* Check that there's enough data */ - if (tvb_length(tvb) < LAPDM_HEADER_LEN) -@@ -229,6 +232,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - addr = tvb_get_guint8(tvb, 0); - length = tvb_get_guint8(tvb, 2); - -+ is_cbs = (addr & LAPDM_LPD) == LAPDM_LPD_CB; - cr = addr & LAPDM_CR; - if (pinfo->p2p_dir == P2P_DIR_RECV) { - is_response = cr ? FALSE : TRUE; -@@ -245,15 +249,22 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - addr_tree = proto_item_add_subtree(addr_ti, ett_lapdm_address); - - proto_tree_add_uint(addr_tree, hf_lapdm_lpd, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr); -+ if (!is_cbs) { -+ proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr); -+ proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr); -+ proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr); -+ } - } - else { - lapdm_ti = NULL; - lapdm_tree = NULL; - } - -+ if (is_cbs) { -+ call_dissector(smscb_handle, tvb, pinfo, tree); -+ return; -+ } -+ - control = dissect_xdlc_control(tvb, 1, pinfo, lapdm_tree, hf_lapdm_control, - ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesnt support extended */, NULL, NULL, - is_response, FALSE, FALSE); -@@ -486,5 +497,6 @@ void - proto_reg_handoff_lapdm(void) - { - data_handle = find_dissector("data"); -+ smscb_handle = find_dissector("gsm_smscb"); - } - -+ -- To view, visit https://gerrit.osmocom.org/9240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b Gerrit-Change-Number: 9240 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 08:47:54 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 08:47:54 +0000 Subject: Change in osmocom-bb[master]: Move 'src/target_dsp' to 'target/calypso_dsp' Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9241 Change subject: Move 'src/target_dsp' to 'target/calypso_dsp' ...................................................................... Move 'src/target_dsp' to 'target/calypso_dsp' We store the firmware for Calypso based PHY in the 'target' directory, while the 'target_dsp' was outside. Since DSP is a part of the mentioned hardware, let's move it properly... Change-Id: I1338d88fe1cbd6a27cf0bafe27b42ea5116c5b7e --- R src/target/calypso_dsp/.gitignore R src/target/calypso_dsp/Makefile R src/target/calypso_dsp/bin2cfile.py R src/target/calypso_dsp/bl_stage3.S R src/target/calypso_dsp/dsp_dump.lds R src/target/calypso_dsp/dump2coff.py R src/target/calypso_dsp/ida/README.txt R src/target/calypso_dsp/ida/ndb.h R src/target/calypso_dsp/ida/tms320c54.cfg 9 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/9241/1 diff --git a/src/target_dsp/.gitignore b/src/target/calypso_dsp/.gitignore similarity index 100% rename from src/target_dsp/.gitignore rename to src/target/calypso_dsp/.gitignore diff --git a/src/target_dsp/calypso/Makefile b/src/target/calypso_dsp/Makefile similarity index 100% rename from src/target_dsp/calypso/Makefile rename to src/target/calypso_dsp/Makefile diff --git a/src/target_dsp/calypso/bin2cfile.py b/src/target/calypso_dsp/bin2cfile.py similarity index 100% rename from src/target_dsp/calypso/bin2cfile.py rename to src/target/calypso_dsp/bin2cfile.py diff --git a/src/target_dsp/calypso/bl_stage3.S b/src/target/calypso_dsp/bl_stage3.S similarity index 100% rename from src/target_dsp/calypso/bl_stage3.S rename to src/target/calypso_dsp/bl_stage3.S diff --git a/src/target_dsp/calypso/dsp_dump.lds b/src/target/calypso_dsp/dsp_dump.lds similarity index 100% rename from src/target_dsp/calypso/dsp_dump.lds rename to src/target/calypso_dsp/dsp_dump.lds diff --git a/src/target_dsp/calypso/dump2coff.py b/src/target/calypso_dsp/dump2coff.py similarity index 100% rename from src/target_dsp/calypso/dump2coff.py rename to src/target/calypso_dsp/dump2coff.py diff --git a/src/target_dsp/calypso/ida/README.txt b/src/target/calypso_dsp/ida/README.txt similarity index 100% rename from src/target_dsp/calypso/ida/README.txt rename to src/target/calypso_dsp/ida/README.txt diff --git a/src/target_dsp/calypso/ida/ndb.h b/src/target/calypso_dsp/ida/ndb.h similarity index 100% rename from src/target_dsp/calypso/ida/ndb.h rename to src/target/calypso_dsp/ida/ndb.h diff --git a/src/target_dsp/calypso/ida/tms320c54.cfg b/src/target/calypso_dsp/ida/tms320c54.cfg similarity index 100% rename from src/target_dsp/calypso/ida/tms320c54.cfg rename to src/target/calypso_dsp/ida/tms320c54.cfg -- To view, visit https://gerrit.osmocom.org/9241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1338d88fe1cbd6a27cf0bafe27b42ea5116c5b7e Gerrit-Change-Number: 9241 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 09:56:21 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 21 May 2018 09:56:21 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... Patch Set 1: so afaik, we include inside osmocom-bb a libosmocore library for embedded use. Are these include spart of libosmocore? Then afaik we don't do modifications on that code. -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 09:56:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 09:57:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 21 May 2018 09:57:34 +0000 Subject: Change in osmocom-bb[master]: README.building: cosmetic: correct wiki links In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9237 ) Change subject: README.building: cosmetic: correct wiki links ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c Gerrit-Change-Number: 9237 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 09:57:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 09:58:36 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 21 May 2018 09:58:36 +0000 Subject: Change in osmocom-bb[master]: README.development: cosmetic: correct/add wiki links In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9238 ) Change subject: README.development: cosmetic: correct/add wiki links ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 Gerrit-Change-Number: 9238 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 09:58:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 09:59:06 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 21 May 2018 09:59:06 +0000 Subject: Change in osmocom-bb[master]: README.development: add brief info about the TRX Toolkit In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9239 ) Change subject: README.development: add brief info about the TRX Toolkit ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 Gerrit-Change-Number: 9239 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 09:59:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 09:59:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 21 May 2018 09:59:32 +0000 Subject: Change in osmocom-bb[master]: Remove the patches for Wireshark In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9240 ) Change subject: Remove the patches for Wireshark ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b Gerrit-Change-Number: 9240 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 09:59:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 21 12:03:46 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Mon, 21 May 2018 12:03:46 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... Patch Set 1: > so afaik, we include inside osmocom-bb a libosmocore library for > embedded use. Are these include spart of libosmocore? Then afaik we > don't do modifications on that code. Nope, we don't actually include then anywhere in OsmocomBB, nor in an outdated code of libosmocore... Feel free to check with: git grep "/osmocore/". Also, both host and target firmware are building fine without them. -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 21 May 2018 12:03:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon May 21 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 21 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#41?= In-Reply-To: <1726626918.112.1526856081215.JavaMail.jenkins@jenkins.osmocom.org> References: <1726626918.112.1526856081215.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1414275552.121.1526942481151.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-16649/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-16649/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-16649/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-16649/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-16649/ libtool: install: (cd /tmp/am-dc-16649/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-16649/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-16649/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-16649/ libtool: install: chmod 644 /tmp/am-dc-16649/ libtool: install: ranlib /tmp/am-dc-16649/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-16649/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-16649/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-16649/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-16649/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-16649/ /bin/mkdir -p '/tmp/am-dc-16649/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-16649/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-16649/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-16649/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-16649/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-16649/ libtool: uninstall: rm -f /tmp/am-dc-16649/ /tmp/am-dc-16649/ /tmp/am-dc-16649/ /tmp/am-dc-16649/ /tmp/am-dc-16649/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-16649/ && rm -f html.tar ) ( cd '/tmp/am-dc-16649/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-16649/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Tue May 22 00:11:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 May 2018 00:11:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#487?= Message-ID: <2118710097.122.1526947869466.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 116.66 KB...] make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## --------------------------------- ## ## osmo-pcu 0.5.0.3-7a9c test suite. ## ## --------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.3-7a9c] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.3-7a9c/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-22 00:11:07.984568733 +0000 +++ 2018-05-22 00:11:08.028568718 +0000 @@ -438,12 +438,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) ack: (BSN=86)"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR"(BSN=21) R=ACK I=NACK TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) DL analysis, range=21:22, lost=0, recv=1, skipped=0, bsn=21, info='R...............................................................' +../../../src/gprs_rlcmac_meas.cpp:134:42: runtime error: left shift of negative value -999207 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) V(B): (V(A)=22)""(V(S)-1=21) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid Scheduling data message at RTS for DL TFI=0 (TRX=0, TS=4) prio=4 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) downlink (V(A)==22 .. V(S)==22) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Sending new dummy block at BSN 22, CS=CS-1 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Empty chunk, added LLC dummy command of size 19, drained_since=112 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) Complete DL frame, len=19 +../../../src/gprs_rlcmac_meas.cpp:178:40: runtime error: left shift of negative value -999155 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) changes state from FLOW to FINISHED TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) data block (BSN 22, CS-1): 4d 43 c0 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FINISHED) need_padding 0 spb_status 0 spb 0 (BSN1 22 BSN2 -1) 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue May 22 07:34:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 May 2018 07:34:20 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#488?= In-Reply-To: <2118710097.122.1526947869466.JavaMail.jenkins@jenkins.osmocom.org> References: <2118710097.122.1526947869466.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <152004627.130.1526974460878.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue May 22 07:56:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 22 May 2018 07:56:11 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 May 2018 07:56:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 08:15:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 22 May 2018 08:15:44 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 3: > One might think of implementing this somewhere generic in a > library, but I think we still have three IPA. implementations > around. In terms of naming, some reference to abis would be good, > as other interfaces (A, CTRL, ...) May also use IPA Having reviewed the protocol layering between BTS and BSC, I agree that "abis" is a better prefix for the description of this counter. -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 22 May 2018 08:15:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 08:16:18 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 22 May 2018 08:16:18 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9218 to look at the new patch set (#4). Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... add counter for connection attempts from BTS with unknown unit id Add a global counter to the BSC which shows the number of failed connections attempts due to a unit_id mismatch between the BSC and the BTS. Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bts_ipaccess_nanobts.c 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/9218/4 -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:35:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 22 May 2018 09:35:26 +0000 Subject: Change in osmo-bsc[master]: nat: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9214 ) Change subject: nat: Add jitter buffer on the uplink receiver ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9214/1/include/osmocom/bsc/bsc_nat.h File include/osmocom/bsc/bsc_nat.h: https://gerrit.osmocom.org/#/c/9214/1/include/osmocom/bsc/bsc_nat.h at 180 PS1, Line 180: bool bts_use_jibuf; > I would prefer something like a sub-structure [?] Makes sense. However, as this commit is just a forward-port from openbsc, I think it's better to merge this one as it is, and then do these modification in a follow-up commit. -- To view, visit https://gerrit.osmocom.org/9214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 Gerrit-Change-Number: 9214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:35:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:57:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:57:17 +0000 Subject: Change in osmo-bsc[master]: nat: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9214 ) Change subject: nat: Add jitter buffer on the uplink receiver ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 Gerrit-Change-Number: 9214 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:57:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:57:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:57:36 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Tue, 22 May 2018 09:57:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:57:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:57:38 +0000 Subject: Change in osmo-bsc[master]: add counter for connection attempts from BTS with unknown unit id In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9218 ) Change subject: add counter for connection attempts from BTS with unknown unit id ...................................................................... add counter for connection attempts from BTS with unknown unit id Add a global counter to the BSC which shows the number of failed connections attempts due to a unit_id mismatch between the BSC and the BTS. Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Related: OS#3245 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bts_ipaccess_nanobts.c 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6365938..6f854d8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1128,6 +1128,7 @@ BSC_CTR_PAGING_ATTEMPTED, BSC_CTR_PAGING_DETACHED, BSC_CTR_PAGING_RESPONDED, + BSC_CTR_UNKNOWN_UNIT_ID, }; static const struct rate_ctr_desc bsc_ctr_description[] = { @@ -1140,6 +1141,8 @@ [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber."}, [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found."}, [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response."}, + + [BSC_CTR_UNKNOWN_UNIT_ID] = {"abis:unknown_unit_id", "Connection attempts from unknown IPA CCM Unit ID."}, }; diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index d5b3b21..823fd66 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -468,6 +468,7 @@ LOGP(DLINP, LOGL_ERROR, "Unable to find BTS configuration for " " %u/%u/%u, disconnecting\n", dev->site_id, dev->bts_id, dev->trx_id); + rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_UNKNOWN_UNIT_ID]); return NULL; } DEBUGP(DLINP, "Identified BTS %u/%u/%u\n", -- To view, visit https://gerrit.osmocom.org/9218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I58866aff36a1c8463bf84b4392a5124ffeaa32ea Gerrit-Change-Number: 9218 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:57:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:57:42 +0000 Subject: Change in osmo-bsc[master]: nat: Add jitter buffer on the uplink receiver In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9214 ) Change subject: nat: Add jitter buffer on the uplink receiver ...................................................................... nat: Add jitter buffer on the uplink receiver Default usage values are defined in mgcp node, and can be per-BSC overriden on each bsc node. This commit is a forward-port of openbsc.git Change-Id Ibf3932adc07442fb5e9c7a06404853f9d0a20959. Depends on osmo-mgw.git Change-Id Ie19a64ac09f9d51f2434ad0d7925610fc919a90e. Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 --- M include/osmocom/bsc/bsc_nat.h M src/osmo-bsc_nat/bsc_mgcp_utils.c M src/osmo-bsc_nat/bsc_nat_vty.c 3 files changed, 96 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_nat.h b/include/osmocom/bsc/bsc_nat.h index 6146c00..bd78b9d 100644 --- a/include/osmocom/bsc/bsc_nat.h +++ b/include/osmocom/bsc/bsc_nat.h @@ -175,6 +175,16 @@ /* Osmux is enabled/disabled per BSC */ int osmux; + + /* Use a jitterbuffer on the bts-side receiver */ + bool bts_use_jibuf; + /* Minimum and maximum buffer size for the jitter buffer, in ms */ + uint32_t bts_jitter_delay_min; + uint32_t bts_jitter_delay_max; + /* Enabled if explicitly configured through VTY: */ + bool bts_use_jibuf_override; + bool bts_jitter_delay_min_override; + bool bts_jitter_delay_max_override; }; struct bsc_lac_entry { diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c index bf6d0ad..ab06a5e 100644 --- a/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -585,6 +585,17 @@ if (state == MGCP_ENDP_CRCX) { struct sockaddr_in sock; + /* set up jitter buffer parameters */ + if (bsc_endp->bsc->cfg->bts_use_jibuf_override) + mgcp_endp->bts_use_jibuf = bsc_endp->bsc->cfg->bts_use_jibuf; + + if (bsc_endp->bsc->cfg->bts_jitter_delay_min_override) + mgcp_endp->bts_jitter_delay_min = bsc_endp->bsc->cfg->bts_jitter_delay_min; + + if (bsc_endp->bsc->cfg->bts_jitter_delay_max_override) + mgcp_endp->bts_jitter_delay_max = bsc_endp->bsc->cfg->bts_jitter_delay_max; + + /* Annotate the allocated Osmux CID until the bsc confirms that * it agrees to use Osmux for this voice flow. */ diff --git a/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c index 64608bd..5d8d0c7 100644 --- a/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/src/osmo-bsc_nat/bsc_nat_vty.c @@ -173,6 +173,12 @@ vty_out(vty, " osmux only%s", VTY_NEWLINE); break; } + if (bsc->bts_use_jibuf_override) + vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE); + if (bsc->bts_jitter_delay_min_override) + vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE); + if (bsc->bts_jitter_delay_max_override) + vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE); } static int config_write_bsc(struct vty *vty) @@ -1231,6 +1237,71 @@ return CMD_SUCCESS; } +#define DEJITTER_STR "Uplink Jitter Buffer" +DEFUN(cfg_bsc_bts_use_jibuf, + cfg_bsc_bts_use_jibuf_cmd, + "bts-jitter-buffer", + DEJITTER_STR "\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_use_jibuf = true; + conf->bts_use_jibuf_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_no_bts_use_jibuf, + cfg_bsc_no_bts_use_jibuf_cmd, + "no bts-jitter-buffer", + NO_STR DEJITTER_STR "\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_use_jibuf = false; + conf->bts_use_jibuf_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_bts_jitter_delay_min, + cfg_bsc_bts_jitter_delay_min_cmd, + "bts-jitter-buffer-delay-min <1-65535>", + DEJITTER_STR " Minimum Delay in ms\n" "Minimum Delay in ms\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_jitter_delay_min = atoi(argv[0]); + if (!conf->bts_jitter_delay_min) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max && + conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-min cannot be bigger than " \ + "bts-jitter-buffer-delay-max.%s", VTY_NEWLINE); + return CMD_WARNING; + } + conf->bts_jitter_delay_min_override = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_bsc_bts_jitter_delay_max, + cfg_bsc_bts_jitter_delay_max_cmd, + "bts-jitter-buffer-delay-max <1-65535>", + DEJITTER_STR " Maximum Delay in ms\n" "Maximum Delay in ms\n") +{ + struct bsc_config *conf = vty->index; + conf->bts_jitter_delay_max = atoi(argv[0]); + if (!conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be zero.%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (conf->bts_jitter_delay_min && conf->bts_jitter_delay_max && + conf->bts_jitter_delay_min > conf->bts_jitter_delay_max) { + vty_out(vty, "bts-jitter-buffer-delay-max cannot be smaller than " \ + "bts-jitter-buffer-delay-min.%s", VTY_NEWLINE); + return CMD_WARNING; + } + conf->bts_jitter_delay_max_override = true; + return CMD_SUCCESS; +} + int bsc_nat_vty_init(struct bsc_nat *nat) { _nat = nat; @@ -1318,6 +1389,10 @@ install_element(NAT_BSC_NODE, &cfg_bsc_paging_grp_cmd); install_element(NAT_BSC_NODE, &cfg_bsc_no_paging_grp_cmd); install_element(NAT_BSC_NODE, &cfg_bsc_osmux_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_use_jibuf_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_no_bts_use_jibuf_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_min_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_bts_jitter_delay_max_cmd); mgcp_vty_init(); -- To view, visit https://gerrit.osmocom.org/9214 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie07b8a577caf731d59d68e3b3510ae2f9fd3dc93 Gerrit-Change-Number: 9214 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:58:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:58:52 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... Patch Set 1: Code-Review-2 we don't do modifications to the git-subtree of libosmocore here. The libosmocore in osmocom-bb reflects a single, tagged version of upstream libosmocore.git -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 May 2018 09:58:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:59:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:59:06 +0000 Subject: Change in osmocom-bb[master]: README.building: cosmetic: correct wiki links In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9237 ) Change subject: README.building: cosmetic: correct wiki links ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c Gerrit-Change-Number: 9237 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:59:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:59:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:59:18 +0000 Subject: Change in osmocom-bb[master]: README.development: cosmetic: correct/add wiki links In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9238 ) Change subject: README.development: cosmetic: correct/add wiki links ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 Gerrit-Change-Number: 9238 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:59:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:59:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:59:27 +0000 Subject: Change in osmocom-bb[master]: README.development: add brief info about the TRX Toolkit In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9239 ) Change subject: README.development: add brief info about the TRX Toolkit ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 Gerrit-Change-Number: 9239 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:59:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 09:59:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 09:59:29 +0000 Subject: Change in osmocom-bb[master]: Remove the patches for Wireshark In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9240 ) Change subject: Remove the patches for Wireshark ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b Gerrit-Change-Number: 9240 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 22 May 2018 09:59:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 10:00:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 10:00:38 +0000 Subject: Change in osmocom-bb[master]: Move 'src/target_dsp' to 'target/calypso_dsp' In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9241 ) Change subject: Move 'src/target_dsp' to 'target/calypso_dsp' ...................................................................... Patch Set 1: I don't really care about it too much. But I also don't really see the gain of this change, sorry. Adding Sylvain, as it's his code anyway. -- To view, visit https://gerrit.osmocom.org/9241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1338d88fe1cbd6a27cf0bafe27b42ea5116c5b7e Gerrit-Change-Number: 9241 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 22 May 2018 10:00:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 10:04:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 10:04:22 +0000 Subject: Change in osmo-mgw[master]: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9233 ) Change subject: mgcp_sdp: correct apidoc of mgcp_parse_sdp_data ...................................................................... mgcp_sdp: correct apidoc of mgcp_parse_sdp_data The API documentation of mgcp_parse_sdp_data is incorrect. - correct API documentation Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e --- M src/libosmo-mgcp/mgcp_sdp.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 52b4df4..5c66a83 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -205,10 +205,10 @@ * \param[in] endp trunk endpoint. * \param[out] conn associated rtp connection. * \param[out] caller provided memory to store the parsing results. - * \returns 0 on success, -1 on failure. + * \returns 1 when codecs are assigned, 0 when no codecs are assigned. * * Note: In conn (conn->end) the function returns the packet duration, - * the rtp port and the rtcp port */ + * rtp port, rtcp port and the assigned codecs (codec and alt_codec). */ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, struct mgcp_parse_data *p) -- To view, visit https://gerrit.osmocom.org/9233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9906f1dd6811c7092b93d60c9348221fef68cc3e Gerrit-Change-Number: 9233 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 10:15:55 2018 From: gerrit-no-reply at lists.osmocom.org (tnt) Date: Tue, 22 May 2018 10:15:55 +0000 Subject: Change in osmocom-bb[master]: Move 'src/target_dsp' to 'target/calypso_dsp' In-Reply-To: References: Message-ID: tnt has posted comments on this change. ( https://gerrit.osmocom.org/9241 ) Change subject: Move 'src/target_dsp' to 'target/calypso_dsp' ...................................................................... Patch Set 1: Err .. yeah, pretty much same as Harald. Doesn't bother me to have this merged, but it seems a bit pointless. -- To view, visit https://gerrit.osmocom.org/9241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1338d88fe1cbd6a27cf0bafe27b42ea5116c5b7e Gerrit-Change-Number: 9241 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 22 May 2018 10:15:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 10:21:12 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 22 May 2018 10:21:12 +0000 Subject: Change in osmo-bsc[master]: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9242 Change subject: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() ...................................................................... fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() Use memcpy() to avoid unaligned access, instead of writing through a pointer cast to uint32_t. Problem spotted by address sanitizer: abis_nm.c:2802:24: runtime error: store to misaligned address 0x7ffc95396706 for type 'uint32_t', which requires 4 byte alignment 0x7ffc95396706: note: pointer points here 81 0b bb 80 00 00 00 00 ed 79 28 56 00 00 e0 9c 00 00 a0 61 00 00 ... ^ Related: OS#3196 Change-Id: I8e591a56ae522b371da01ea968151a7e6fa24bb9 --- M src/libbsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/9242/1 diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index b2cfa53..ea94d37 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -2799,7 +2799,7 @@ attr[1] = stream; attr[3] = port >> 8; attr[4] = port & 0xff; - *(uint32_t *)(attr+6) = ia.s_addr; + memcpy(attr + 6, &ia.s_addr, sizeof(uint32_t)); /* if ip == 0, we use the default IP */ if (ip == 0) -- To view, visit https://gerrit.osmocom.org/9242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8e591a56ae522b371da01ea968151a7e6fa24bb9 Gerrit-Change-Number: 9242 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:43 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... Patch Set 1: Code-Review+2 no idea why we have those additional include files. Remove them, sure. -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 May 2018 12:05:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:48 +0000 Subject: Change in osmocom-bb[master]: include/osmocore: remove unused headers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9236 ) Change subject: include/osmocore: remove unused headers ...................................................................... include/osmocore: remove unused headers Both removed headers are not used anywhere, and probably left from the time when there was no libosmocore as a shared library. Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 --- D include/osmocore/rsl.h D include/osmocore/utils.h 2 files changed, 0 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocore/rsl.h b/include/osmocore/rsl.h deleted file mode 100644 index c9375a7..0000000 --- a/include/osmocore/rsl.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _OSMOCORE_RSL_H -#define _OSMOCORE_RSL_H - -#include -#include -#include - -void rsl_init_rll_hdr(struct abis_rsl_rll_hdr *dh, uint8_t msg_type); - -extern const struct tlv_definition rsl_att_tlvdef; -#define rsl_tlv_parse(dec, buf, len) \ - tlv_parse(dec, &rsl_att_tlvdef, buf, len, 0, 0) - -/* encode channel number as per Section 9.3.1 */ -uint8_t rsl_enc_chan_nr(uint8_t type, uint8_t subch, uint8_t timeslot); - -const struct value_string rsl_rlm_cause_strs[]; - -const char *rsl_err_name(uint8_t err); - -/* Section 3.3.2.3 TS 05.02. I think this looks like a table */ -int rsl_ccch_conf_to_bs_cc_chans(int ccch_conf); - -#endif /* _OSMOCORE_RSL_H */ diff --git a/include/osmocore/utils.h b/include/osmocore/utils.h deleted file mode 100644 index cf3b460..0000000 --- a/include/osmocore/utils.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OSMOCORE_UTIL_H -#define OSMOCORE_UTIL_H - -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - -#include - -struct value_string { - unsigned int value; - const char *str; -}; - -const char *get_value_string(const struct value_string *vs, uint32_t val); -int get_string_value(const struct value_string *vs, const char *str); - - -#endif -- To view, visit https://gerrit.osmocom.org/9236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I821e2958e07176c1031c636019dffd1cee62bb10 Gerrit-Change-Number: 9236 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:49 +0000 Subject: Change in osmocom-bb[master]: README.building: cosmetic: correct wiki links In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9237 ) Change subject: README.building: cosmetic: correct wiki links ...................................................................... README.building: cosmetic: correct wiki links Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c --- M src/README.building 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/README.building b/src/README.building index f73f661..d7cc794 100644 --- a/src/README.building +++ b/src/README.building @@ -8,13 +8,15 @@ this. * Make sure you have compiled and installed a recent version of - libosmocore. See http://bb.osmocom.org/trac/wiki/libosmocore + libosmocore. See https://osmocom.org/projects/libosmocore/wiki/Libosmocore DO NOT USE the libosmocore version embedded in this git tree. This is a special version used internally and MUST NOT be used as system-wide libosmocore. * Get a GNU toolchain (gcc/binutils) for ARM (e.g. from http://gnuarm.com/) + See https://osmocom.org/projects/baseband/wiki/GnuArmToolchain + * Set your path to include the arm-elf-* executables of your toolchain * call 'make' in this (the src) subdirectory -- To view, visit https://gerrit.osmocom.org/9237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0fd8fdc7aecdf04266898eaadd05f1f0c705bb5c Gerrit-Change-Number: 9237 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:50 +0000 Subject: Change in osmocom-bb[master]: README.development: cosmetic: correct/add wiki links In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9238 ) Change subject: README.development: cosmetic: correct/add wiki links ...................................................................... README.development: cosmetic: correct/add wiki links Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 --- M src/README.development 1 file changed, 10 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/README.development b/src/README.development index 1963b5a..060cbd9 100644 --- a/src/README.development +++ b/src/README.development @@ -1,18 +1,24 @@ = Contributing to OsmocomBB development = Feel free to help us by extending the code. Always make sure to -send back all your patches to the baseband-devel at lists.osmocom.org -mailing list - Free Software is all about sharing. +send back all your patches to Gerrit (recommended) or to the +baseband-devel at lists.osmocom.org mailing list - Free Software +is all about sharing. For details, see: + +https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit +https://gerrit.osmocom.org/ == Coding Style == Like all C language Osmocom projects, we use the Linux Kernel coding style, you can find it in the Documentation/CodingStyle subdirectory -of any Linux Kernel source. +of any Linux Kernel source. For details, see: + +https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards == More Information == -Please consult the http://bb.osmocom.org/ web page / wiki. +Please consult the https://osmocom.org/projects/baseband/wiki/. If you have any technical questions regarding the code, don't hesitate to ask the baseband-devel at lists.osmocom.org mailing list. -- To view, visit https://gerrit.osmocom.org/9238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib17196044f276d05269dbdb5a5a1444202fa0e07 Gerrit-Change-Number: 9238 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:51 +0000 Subject: Change in osmocom-bb[master]: README.development: add brief info about the TRX Toolkit In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9239 ) Change subject: README.development: add brief info about the TRX Toolkit ...................................................................... README.development: add brief info about the TRX Toolkit Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 --- M src/README.development 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/README.development b/src/README.development index 060cbd9..6482143 100644 --- a/src/README.development +++ b/src/README.development @@ -65,6 +65,15 @@ * board/compal_e99 is the Motorola C155 family * Applications (each app builds one firmware image) in apps/ +=== src/target/trx_toolkit === + +A set of tools in Python for debugging TRX interface and creating +a virtual Um-interface between OsmocomBB and OsmoBTS. For details, +please refer: + +https://osmocom.org/projects/baseband/wiki/TRX_Interface +https://osmocom.org/projects/baseband/wiki/FakeTRX +target/trx_toolkit/README === src/target_dsp/calypso === @@ -75,4 +84,3 @@ The Layer2 (LAPDm / TS 04.06) and Layer3 (CC/MM/RR / TS 04.08) implementations, as they are growing. - -- To view, visit https://gerrit.osmocom.org/9239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I589a5e0a1b41439aabc59e97aca378d16f4e4cc5 Gerrit-Change-Number: 9239 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:05:51 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 12:05:51 +0000 Subject: Change in osmocom-bb[master]: Remove the patches for Wireshark In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9240 ) Change subject: Remove the patches for Wireshark ...................................................................... Remove the patches for Wireshark GSMTAP support is already merged to the mainline, while the status of SMSCB support is unknown. In any case, OsmocomBB is not a good place for storing the patches for Wireshark, so let's remove them. Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b --- D src/wireshark/gsmtap.patch D src/wireshark/smscb.patch 2 files changed, 0 insertions(+), 1,188 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/wireshark/gsmtap.patch b/src/wireshark/gsmtap.patch deleted file mode 100644 index 019c8b4..0000000 --- a/src/wireshark/gsmtap.patch +++ /dev/null @@ -1,445 +0,0 @@ -Index: epan/dissectors/packet-gsmtap.c -=================================================================== ---- /dev/null -+++ epan/dissectors/packet-gsmtap.c -@@ -0,0 +1,345 @@ -+/* packet-gsmtap.c -+ * Routines for GSMTAP captures -+ * -+ * (C) 2008-2010 by Harald Welte -+ * -+ * $Id$ -+ * -+ * Wireshark - Network traffic analyzer -+ * By Gerald Combs -+ * Copyright 1998 Gerald Combs -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ * -+ */ -+ -+/* GSMTAP is a generic header format for GSM protocol captures, -+ * it uses the IANA-assigned UDP port number 4729 and carries -+ * payload in various formats of GSM interfaces such as Um MAC -+ * blocks or Um bursts. -+ * -+ * Example programs generating GSMTAP data are airprobe -+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/) -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+#include -+#include -+ -+#include "packet-gsmtap.h" -+ -+static int proto_gsmtap = -1; -+ -+static int hf_gsmtap_version = -1; -+static int hf_gsmtap_hdrlen = -1; -+static int hf_gsmtap_type = -1; -+static int hf_gsmtap_timeslot = -1; -+static int hf_gsmtap_subslot = -1; -+static int hf_gsmtap_arfcn = -1; -+static int hf_gsmtap_uplink = -1; -+static int hf_gsmtap_noise_dbm = -1; -+static int hf_gsmtap_signal_dbm = -1; -+static int hf_gsmtap_frame_nr = -1; -+static int hf_gsmtap_burst_type = -1; -+static int hf_gsmtap_channel_type = -1; -+static int hf_gsmtap_antenna = -1; -+ -+static int hf_sacch_l1h_power_lev = -1; -+static int hf_sacch_l1h_fpc = -1; -+static int hf_sacch_l1h_ta = -1; -+ -+static gint ett_gsmtap = -1; -+ -+enum { -+ GSMTAP_SUB_DATA = 0, -+ GSMTAP_SUB_UM, -+ GSMTAP_SUB_UM_LAPDM, -+ GSMTAP_SUB_ABIS, -+ -+ GSMTAP_SUB_MAX -+}; -+ -+static dissector_handle_t sub_handles[GSMTAP_SUB_MAX]; -+ -+static const value_string gsmtap_bursts[] = { -+ { GSMTAP_BURST_UNKNOWN, "UNKNOWN" }, -+ { GSMTAP_BURST_FCCH, "FCCH" }, -+ { GSMTAP_BURST_PARTIAL_SCH, "PARTIAL SCH" }, -+ { GSMTAP_BURST_SCH, "SCH" }, -+ { GSMTAP_BURST_CTS_SCH, "CTS SCH" }, -+ { GSMTAP_BURST_COMPACT_SCH, "COMPACT SCH" }, -+ { GSMTAP_BURST_NORMAL, "NORMAL" }, -+ { GSMTAP_BURST_DUMMY, "DUMMY" }, -+ { GSMTAP_BURST_ACCESS, "RACH" }, -+ { 0, NULL }, -+}; -+ -+static const value_string gsmtap_channels[] = { -+ { GSMTAP_CHANNEL_UNKNOWN, "UNKNOWN" }, -+ { GSMTAP_CHANNEL_BCCH, "BCCH" }, -+ { GSMTAP_CHANNEL_CCCH, "CCCH" }, -+ { GSMTAP_CHANNEL_RACH, "RACH" }, -+ { GSMTAP_CHANNEL_AGCH, "AGCH" }, -+ { GSMTAP_CHANNEL_PCH, "PCH" }, -+ { GSMTAP_CHANNEL_SDCCH, "SDCCH" }, -+ { GSMTAP_CHANNEL_SDCCH4, "SDCCH/4" }, -+ { GSMTAP_CHANNEL_SDCCH8, "SDCCH/8" }, -+ { GSMTAP_CHANNEL_TCH_F, "FACCH/F" }, -+ { GSMTAP_CHANNEL_TCH_H, "FACCH/H" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH, "LSACCH" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH4, "SACCH/4" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_SDCCH8, "SACCH/8" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_TCH_F, "SACCH/F" }, -+ { GSMTAP_CHANNEL_ACCH| -+ GSMTAP_CHANNEL_TCH_F, "SACCH/H" }, -+ { 0, NULL }, -+}; -+ -+static const value_string gsmtap_types[] = { -+ { GSMTAP_TYPE_UM, "GSM Um (MS<->BTS)" }, -+ { GSMTAP_TYPE_ABIS, "GSM Abis (BTS<->BSC)" }, -+ { GSMTAP_TYPE_UM_BURST, "GSM Um burst (MS<->BTS)" }, -+ { 0, NULL }, -+}; -+ -+/* dissect a SACCH L1 header which is included in the first 2 bytes -+ * of every SACCH frame (according to TS 04.04) */ -+static void -+dissect_sacch_l1h(tvbuff_t *tvb, proto_tree *tree) -+{ -+ proto_item *ti; -+ proto_tree *l1h_tree = NULL; -+ -+ if (!tree) -+ return; -+ -+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, 2, -+ "SACCH L1 Header, Power Level: %u, Timing Advance: %u", -+ tvb_get_guint8(tvb, 0) & 0x1f, -+ tvb_get_guint8(tvb, 1)); -+ l1h_tree = proto_item_add_subtree(ti, ett_gsmtap); -+ /* Power Level */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_power_lev, tvb, 0, 1, FALSE); -+ /* Fast Power Control */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_fpc, tvb, 0, 1, FALSE); -+ /* Acutal Timing Advance */ -+ proto_tree_add_item(l1h_tree, hf_sacch_l1h_ta, tvb, 1, 1, FALSE); -+} -+ -+/* dissect a GSMTAP header and hand payload off to respective dissector */ -+static void -+dissect_gsmtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ int sub_handle, len, offset = 0; -+ proto_item *ti; -+ proto_tree *gsmtap_tree = NULL; -+ tvbuff_t *payload_tvb, *l1h_tvb = NULL; -+ guint8 hdr_len, type, sub_type; -+ guint16 arfcn; -+ -+ len = tvb_length(tvb); -+ -+ hdr_len = tvb_get_guint8(tvb, offset + 1) <<2; -+ type = tvb_get_guint8(tvb, offset + 2); -+ sub_type = tvb_get_guint8(tvb, offset + 12); -+ arfcn = tvb_get_ntohs(tvb, offset + 4); -+ -+ /* In case of a SACCH, there is a two-byte L1 header in front -+ * of the packet (see TS 04.04) */ -+ if (type == GSMTAP_TYPE_UM && -+ sub_type & GSMTAP_CHANNEL_ACCH) { -+ l1h_tvb = tvb_new_subset(tvb, hdr_len, 2, 2); -+ payload_tvb = tvb_new_subset(tvb, hdr_len+2, len-(hdr_len+2), -+ len-(hdr_len+2)); -+ } else { -+ payload_tvb = tvb_new_subset(tvb, hdr_len, len-hdr_len, -+ len-hdr_len); -+ } -+ -+ /* We don't want any UDP related info left in the INFO field, as the -+ * gsm_a_dtap dissector will not clear but only append */ -+ col_clear(pinfo->cinfo, COL_INFO); -+ -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSMTAP"); -+ -+ if (arfcn & GSMTAP_ARFCN_F_UPLINK) { -+ col_append_str(pinfo->cinfo, COL_RES_NET_SRC, "MS"); -+ col_append_str(pinfo->cinfo, COL_RES_NET_DST, "BTS"); -+ /* p2p_dir is used by the LAPDm dissector */ -+ pinfo->p2p_dir = P2P_DIR_SENT; -+ } else { -+ col_set_str(pinfo->cinfo, COL_RES_NET_SRC, "BTS"); -+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) { -+ case GSMTAP_CHANNEL_BCCH: -+ case GSMTAP_CHANNEL_CCCH: -+ case GSMTAP_CHANNEL_PCH: -+ case GSMTAP_CHANNEL_AGCH: -+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "Broadcast"); -+ break; -+ default: -+ col_set_str(pinfo->cinfo, COL_RES_NET_DST, "MS"); -+ break; -+ } -+ /* p2p_dir is used by the LAPDm dissector */ -+ pinfo->p2p_dir = P2P_DIR_RECV; -+ } -+ -+ if (tree) { -+ ti = proto_tree_add_protocol_format(tree, proto_gsmtap, tvb, 0, hdr_len, -+ "GSM TAP Header, ARFCN: %u (%s), TS: %u, Channel: %s (%u)", -+ arfcn & GSMTAP_ARFCN_MASK, -+ arfcn & GSMTAP_ARFCN_F_UPLINK ? "Uplink" : "Downlink", -+ tvb_get_guint8(tvb, offset+3), -+ match_strval(tvb_get_guint8(tvb, offset+12), gsmtap_channels), -+ tvb_get_guint8(tvb, offset+14)); -+ gsmtap_tree = proto_item_add_subtree(ti, ett_gsmtap); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_version, -+ tvb, offset, 1, FALSE); -+ proto_tree_add_uint_format(gsmtap_tree, hf_gsmtap_hdrlen, -+ tvb, offset+1, 1, hdr_len, -+ "Header length: %u bytes", hdr_len); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_type, -+ tvb, offset+2, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_timeslot, -+ tvb, offset+3, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_arfcn, -+ tvb, offset+4, 2, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_uplink, -+ tvb, offset+4, 2, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_noise_dbm, -+ tvb, offset+6, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_signal_dbm, -+ tvb, offset+7, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_frame_nr, -+ tvb, offset+8, 4, FALSE); -+ if (type == GSMTAP_TYPE_UM_BURST) -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_burst_type, -+ tvb, offset+12, 1, FALSE); -+ else if (type == GSMTAP_TYPE_UM) -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_channel_type, -+ tvb, offset+12, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_antenna, -+ tvb, offset+13, 1, FALSE); -+ proto_tree_add_item(gsmtap_tree, hf_gsmtap_subslot, -+ tvb, offset+14, 1, FALSE); -+ } -+ -+ switch (type) { -+ case GSMTAP_TYPE_UM: -+ if (l1h_tvb) -+ dissect_sacch_l1h(l1h_tvb, tree); -+ switch (sub_type & ~GSMTAP_CHANNEL_ACCH) { -+ case GSMTAP_CHANNEL_BCCH: -+ case GSMTAP_CHANNEL_CCCH: -+ case GSMTAP_CHANNEL_PCH: -+ case GSMTAP_CHANNEL_AGCH: -+ /* FIXME: we might want to skip idle frames */ -+ sub_handle = GSMTAP_SUB_UM; -+ break; -+ case GSMTAP_CHANNEL_SDCCH: -+ case GSMTAP_CHANNEL_SDCCH4: -+ case GSMTAP_CHANNEL_SDCCH8: -+ case GSMTAP_CHANNEL_TCH_F: -+ case GSMTAP_CHANNEL_TCH_H: -+ sub_handle = GSMTAP_SUB_UM_LAPDM; -+ break; -+ case GSMTAP_CHANNEL_RACH: -+ default: -+ sub_handle = GSMTAP_SUB_DATA; -+ break; -+ } -+ break; -+ case GSMTAP_TYPE_UM_BURST: -+ default: -+ sub_handle = GSMTAP_SUB_DATA; -+ break; -+ } -+ call_dissector(sub_handles[sub_handle], payload_tvb, pinfo, tree); -+} -+ -+static const true_false_string sacch_l1h_fpc_mode_vals = { -+ "In use", -+ "Not in use" -+}; -+ -+void -+proto_register_gsmtap(void) -+{ -+ static hf_register_info hf[] = { -+ { &hf_gsmtap_version, { "Version", "gsmtap.version", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_hdrlen, { "Header Length", "gsmtap.hdr_len", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_type, { "Payload Type", "gsmtap.type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_types), 0, NULL, HFILL } }, -+ { &hf_gsmtap_timeslot, { "Time Slot", "gsmtap.ts", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_arfcn, { "ARFCN", "gsmtap.arfcn", -+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_MASK, NULL, HFILL } }, -+ { &hf_gsmtap_uplink, { "Uplink", "gsmtap.uplink", -+ FT_UINT16, BASE_DEC, NULL, GSMTAP_ARFCN_F_UPLINK, NULL, HFILL } }, -+ { &hf_gsmtap_noise_dbm, { "Signal/Noise Ratio (dB)", "gsmtap.snr_db", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_signal_dbm, { "Signal Level (dBm)", "gsmtap.signal_dbm", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_frame_nr, { "GSM Frame Number", "gsmtap.frame_nr", -+ FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_burst_type, { "Burst Type", "gsmtap.burst_type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_bursts), 0, NULL, HFILL }}, -+ { &hf_gsmtap_channel_type, { "Channel Type", "gsmtap.chan_type", -+ FT_UINT8, BASE_DEC, VALS(gsmtap_channels), 0, NULL, HFILL }}, -+ { &hf_gsmtap_antenna, { "Antenna Number", "gsmtap.antenna", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ { &hf_gsmtap_subslot, { "Sub-Slot", "gsmtap.sub_slot", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ -+ { &hf_sacch_l1h_power_lev, { "MS power level", "gsmtap.sacch_l1.power_lev", -+ FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL } }, -+ { &hf_sacch_l1h_fpc, { "FPC", "gsmtap.sacch_l1.fpc", -+ FT_BOOLEAN, 8, TFS(&sacch_l1h_fpc_mode_vals), 0x04, -+ NULL, HFILL } }, -+ { &hf_sacch_l1h_ta, { "Actual Timing Advance", "gsmtap.sacch_l1.ta", -+ FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } }, -+ }; -+ static gint *ett[] = { -+ &ett_gsmtap -+ }; -+ -+ proto_gsmtap = proto_register_protocol("GSM Radiotap", "GSMTAP", "gsmtap"); -+ proto_register_field_array(proto_gsmtap, hf, array_length(hf)); -+ proto_register_subtree_array(ett, array_length(ett)); -+} -+ -+void -+proto_reg_handoff_gsmtap(void) -+{ -+ dissector_handle_t gsmtap_handle; -+ -+ sub_handles[GSMTAP_SUB_DATA] = find_dissector("data"); -+ sub_handles[GSMTAP_SUB_UM] = find_dissector("gsm_a_ccch"); -+ sub_handles[GSMTAP_SUB_UM_LAPDM] = find_dissector("lapdm"); -+ sub_handles[GSMTAP_SUB_ABIS] = find_dissector("gsm_a_dtap"); -+ gsmtap_handle = create_dissector_handle(dissect_gsmtap, proto_gsmtap); -+ dissector_add("udp.port", GSMTAP_UDP_PORT, gsmtap_handle); -+} -Index: epan/dissectors/packet-gsmtap.h -=================================================================== ---- /dev/null -+++ epan/dissectors/packet-gsmtap.h -@@ -0,0 +1,70 @@ -+#ifndef _GSMTAP_H -+#define _GSMTAP_H -+ -+/* gsmtap header, pseudo-header in front of the actua/ GSM payload */ -+ -+/* GSMTAP is a generic header format for GSM protocol captures, -+ * it uses the IANA-assigned UDP port number 4729 and carries -+ * payload in various formats of GSM interfaces such as Um MAC -+ * blocks or Um bursts. -+ * -+ * Example programs generating GSMTAP data are airprobe -+ * (http://airprobe.org/) or OsmocomBB (http://bb.osmocom.org/) -+ */ -+ -+#define GSMTAP_TYPE_UM 0x01 -+#define GSMTAP_TYPE_ABIS 0x02 -+#define GSMTAP_TYPE_UM_BURST 0x03 /* raw burst bits */ -+ -+#define GSMTAP_BURST_UNKNOWN 0x00 -+#define GSMTAP_BURST_FCCH 0x01 -+#define GSMTAP_BURST_PARTIAL_SCH 0x02 -+#define GSMTAP_BURST_SCH 0x03 -+#define GSMTAP_BURST_CTS_SCH 0x04 -+#define GSMTAP_BURST_COMPACT_SCH 0x05 -+#define GSMTAP_BURST_NORMAL 0x06 -+#define GSMTAP_BURST_DUMMY 0x07 -+#define GSMTAP_BURST_ACCESS 0x08 -+#define GSMTAP_BURST_NONE 0x09 -+ -+#define GSMTAP_CHANNEL_UNKNOWN 0x00 -+#define GSMTAP_CHANNEL_BCCH 0x01 -+#define GSMTAP_CHANNEL_CCCH 0x02 -+#define GSMTAP_CHANNEL_RACH 0x03 -+#define GSMTAP_CHANNEL_AGCH 0x04 -+#define GSMTAP_CHANNEL_PCH 0x05 -+#define GSMTAP_CHANNEL_SDCCH 0x06 -+#define GSMTAP_CHANNEL_SDCCH4 0x07 -+#define GSMTAP_CHANNEL_SDCCH8 0x08 -+#define GSMTAP_CHANNEL_TCH_F 0x09 -+#define GSMTAP_CHANNEL_TCH_H 0x0a -+#define GSMTAP_CHANNEL_ACCH 0x80 -+ -+#define GSMTAP_ARFCN_F_PCS 0x8000 -+#define GSMTAP_ARFCN_F_UPLINK 0x4000 -+#define GSMTAP_ARFCN_MASK 0x3fff -+ -+#define GSMTAP_UDP_PORT 4729 -+ -+/* This is the header as it is used by gsmtap-generating software. -+ * It is not used by the wireshark dissector and provided for reference only. -+struct gsmtap_hdr { -+ guint8 version; // version, set to 0x01 currently -+ guint8 hdr_len; // length in number of 32bit words -+ guint8 type; // see GSMTAP_TYPE_* -+ guint8 timeslot; // timeslot (0..7 on Um) -+ -+ guint16 arfcn; // ARFCN (frequency) -+ gint8 signal_dbm; // signal level in dBm -+ gint8 snr_db; // signal/noise ratio in dB -+ -+ guint32 frame_number; // GSM Frame Number (FN) -+ -+ guint8 sub_type; // Type of burst/channel, see above -+ guint8 antenna_nr; // Antenna Number -+ guint8 sub_slot; // sub-slot within timeslot -+ guint8 res; // reserved for future use (RFU) -+} -+ */ -+ -+#endif /* _GSMTAP_H */ -Index: epan/dissectors/Makefile.common -=================================================================== ---- epan/dissectors/Makefile.common.orig -+++ epan/dissectors/Makefile.common -@@ -484,6 +484,7 @@ - packet-gsm_sms.c \ - packet-gsm_sms_ud.c \ - packet-gsm_um.c \ -+ packet-gsmtap.c \ - packet-gssapi.c \ - packet-gtp.c \ - packet-gtpv2.c \ -@@ -1072,6 +1073,7 @@ - packet-gsm_a_common.h \ - packet-gsm_map.h \ - packet-gsm_sms.h \ -+ packet-gsmtap.h \ - packet-gssapi.h \ - packet-gtp.h \ - packet-h223.h \ diff --git a/src/wireshark/smscb.patch b/src/wireshark/smscb.patch deleted file mode 100644 index 80005a3..0000000 --- a/src/wireshark/smscb.patch +++ /dev/null @@ -1,743 +0,0 @@ -Wireshark patch for SMSCB dissection support in LAPDm - -Create a new gsm_smscb dissector module for SMSCB as defined in GSM TS -04.12. Call it from packet-lapdm when the Link Protocol Discriminator -has the value "0 1". - -Signed-off-by: Alex Badea ---- - epan/dissectors/Makefile.common | 1 + - epan/dissectors/packet-gsm_smscb.c | 642 ++++++++++++++++++++++++++++++++++++ - epan/dissectors/packet-lapdm.c | 18 +- - 3 files changed, 658 insertions(+), 3 deletions(-) - -diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common -index 9f9a602..5684579 100644 ---- a/epan/dissectors/Makefile.common -+++ b/epan/dissectors/Makefile.common -@@ -500,6 +500,7 @@ DISSECTOR_SRC = \ - packet-gsm_bssmap_le.c \ - packet-gsm_sms.c \ - packet-gsm_sms_ud.c \ -+ packet-gsm_smscb.c \ - packet-gsm_um.c \ - packet-gsmtap.c \ - packet-gssapi.c \ -diff --git a/epan/dissectors/packet-gsm_smscb.c b/epan/dissectors/packet-gsm_smscb.c -new file mode 100644 -index 0000000..a2f8bee ---- /dev/null -+++ b/epan/dissectors/packet-gsm_smscb.c -@@ -0,0 +1,642 @@ -+/* packet-gsm_smscb.c -+ * Routines for GSM SMSCB (GSM 04.12) dissection -+ * Copyright 2010, Alex Badea -+ * -+ * $Id$ -+ * -+ * Wireshark - Network traffic analyzer -+ * By Gerald Combs -+ * Copyright 1998 Gerald Combs -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include "packet-gsm_map.h" -+#include "packet-gsm_sms.h" -+ -+static gint proto_gsm_smscb = -1; -+static gint hf_smscb_addr = -1; -+static gint hf_smscb_addr_lb = -1; -+static gint hf_smscb_addr_seq = -1; -+static gint hf_smscb_serial_gs = -1; -+static gint hf_smscb_serial_mcode = -1; -+static gint hf_smscb_serial_updnum = -1; -+static gint hf_smscb_page_num = -1; -+static gint hf_smscb_page_cnt = -1; -+static gint hf_smscb_msgid = -1; -+static gint hf_smscb_content = -1; -+static gint hf_smscb_fragments = -1; -+static gint hf_smscb_fragment = -1; -+static gint hf_smscb_fragment_overlap = -1; -+static gint hf_smscb_fragment_overlap_conflicts = -1; -+static gint hf_smscb_fragment_multiple_tails = -1; -+static gint hf_smscb_fragment_too_long_fragment = -1; -+static gint hf_smscb_fragment_error = -1; -+static gint hf_smscb_reassembled_in = -1; -+static gint hf_smscb_reassembled_length = -1; -+static gint hf_smscb_sched_type = -1; -+static gint hf_smscb_sched_spare = -1; -+static gint hf_smscb_sched_begin_slot = -1; -+static gint hf_smscb_sched_end_slot = -1; -+static gint hf_smscb_sched_mdt1 = -1; -+static gint hf_smscb_sched_mdt2 = -1; -+static gint hf_smscb_sched_mdt8 = -1; -+static gint hf_smscb_sched_msgid = -1; -+static gint hf_smscb_sched_repslot = -1; -+ -+static gint ett_smscb = -1; -+static gint ett_smscb_addr = -1; -+static gint ett_smscb_dcs = -1; -+static gint ett_smscb_fragment = -1; -+static gint ett_smscb_fragments = -1; -+static gint ett_smscb_sched_new = -1; -+static gint ett_smscb_sched_other = -1; -+static gint ett_smscb_sched_slot = -1; -+ -+static GHashTable *smscb_fragment_table = NULL; -+static GHashTable *smscb_reassembled_table = NULL; -+ -+static gboolean reassemble_smscb = TRUE; -+ -+static dissector_handle_t data_handle; -+ -+#define SMSCB_HDR_MINLEN 1 -+ -+/* -+ * Bits in the address field. -+ */ -+#define SMSCB_ADDR_LB 0x10 /* Address Last Bit */ -+#define SMSCB_ADDR_SEQ 0x0f /* Address sequence number */ -+#define SMSCB_SERIAL_GS 0xc000 /* CBS Serial Number - Geographical Scope */ -+#define SMSCB_SERIAL_MCODE 0x3ff0 /* CBS Serial Number - Message Code */ -+#define SMSCB_SERIAL_UPDNUM 0x000f /* CBS Serial Number - Update Number */ -+#define SMSCB_PAGE_NUM 0xf0 /* Page number */ -+#define SMSCB_PAGE_CNT 0x0f /* Page total count */ -+ -+/* -+ * Bits in the Schedule message -+ */ -+#define SMSCB_SCHED_TYPE 0xc0 /* Type */ -+#define SMSCB_SCHED_SLOT 0x3f /* Begin/End Slot Number */ -+#define SMSCB_SCHED_SPARE 0xc0 /* Spare */ -+#define SMSCB_SCHED_MDT1 0x8000 /* MDT (1 bit)*/ -+#define SMSCB_SCHED_MSGID 0x7fff /* Message ID */ -+#define SMSCB_SCHED_MDT2 0xc0 /* MDT (2 bits) */ -+#define SMSCB_SCHED_REPSLOT 0x3f /* Repeated Slot Number */ -+ -+#define SMSCB_SEQ_LAST 3 -+#define SMSCB_SEQ_1ST 0 -+#define SMSCB_SEQ_1ST_SCHED 8 -+ -+#define SMSCB_SCHED_SLOT_MAX 48 -+ -+/* 04.12 section 3.3.1 */ -+static const value_string smscb_addr_lb_vals[] = { -+ { 0, "More blocks" }, -+ { 1, "Last block" }, -+ { 0, NULL } -+}; -+ -+/* 04.12 section 3.3.1 */ -+static const value_string smscb_addr_seq_vals[] = { -+ { 0, "First block" }, -+ { 1, "Second block" }, -+ { 2, "Third block" }, -+ { 3, "Fourth block" }, -+ { 8, "First schedule block" }, -+ { 15, "Null message" }, -+ { 0, NULL } -+}; -+ -+/* 03.41 section 9.3.2.1 */ -+static const value_string smscb_serial_gs_vals[] = { -+ { 0, "Cell wide (immediate)" }, -+ { 1, "PLMN wide" }, -+ { 2, "Location Area wide" }, -+ { 3, "Cell wide" }, -+ { 0, NULL } -+}; -+ -+/* 04.14 section 3.5.5 */ -+static const value_string smscb_sched_mdt8_vals[] = { -+ { 0x00, "Retransmission indication" }, -+ { 0x80, "First transmission of an SMSCB within the Schedule Period" }, -+ { 0x40, "Free Message Slot, optional reading" }, -+ { 0x41, "Free Message Slot, reading advised" }, -+ { 0, NULL } -+}; -+ -+static const fragment_items smscb_frag_items = { -+ /* Fragment subtrees */ -+ &ett_smscb_fragment, -+ &ett_smscb_fragments, -+ /* Fragment fields */ -+ &hf_smscb_fragments, -+ &hf_smscb_fragment, -+ &hf_smscb_fragment_overlap, -+ &hf_smscb_fragment_overlap_conflicts, -+ &hf_smscb_fragment_multiple_tails, -+ &hf_smscb_fragment_too_long_fragment, -+ &hf_smscb_fragment_error, -+ /* Reassembled in field */ -+ &hf_smscb_reassembled_in, -+ /* Reassembled length field */ -+ &hf_smscb_reassembled_length, -+ /* Tag */ -+ "fragments" -+}; -+ -+static void smscb_defragment_init(void) -+{ -+ fragment_table_init(&smscb_fragment_table); -+ reassembled_table_init(&smscb_reassembled_table); -+} -+ -+/* [3GPP TS 03.41 section 9.3] */ -+static int dissect_smscb_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ gint offset = 0; -+ gint length, out_len, textlen; -+ guint8 encoding; -+ gchar msgbuf[88 + 1]; -+ gchar *utf8_text, *p; -+ -+ proto_tree_add_item(tree, hf_smscb_serial_gs, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_serial_mcode, tvb, offset, 2, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_serial_updnum, tvb, offset, 1, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_msgid, tvb, offset, 2, ENC_BIG_ENDIAN); -+ col_append_fstr(pinfo->cinfo, COL_INFO, " - Message ID %d", tvb_get_ntohs(tvb, offset)); -+ offset += 2; -+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Data Coding Scheme"); -+ encoding = dissect_cbs_data_coding_scheme( -+ tvb_new_subset(tvb, offset, 1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_dcs)); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_page_num, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_page_cnt, tvb, offset, 1, ENC_NA); -+ offset++; -+ -+ length = tvb_length(tvb) - offset; -+ switch (encoding) { -+ case SMS_ENCODING_7BIT: -+ case SMS_ENCODING_7BIT_LANG: -+ out_len = gsm_sms_char_7bit_unpack(0, length, sizeof(msgbuf) - 1, -+ tvb_get_ptr(tvb, offset, length), msgbuf); -+ msgbuf[out_len] = '\0'; -+ utf8_text = gsm_sms_chars_to_utf8(msgbuf, out_len); -+ textlen = strlen(utf8_text); -+ break; -+ /* TODO: UCS2? */ -+ case SMS_ENCODING_8BIT: -+ default: -+ utf8_text = tvb_get_ephemeral_string(tvb, offset, length); -+ textlen = length; -+ break; -+ } -+ -+ proto_tree_add_string(tree, hf_smscb_content, tvb, offset, length, utf8_text); -+ -+ /* strip padding */ -+ if ((p = strchr( utf8_text, '\r'))) -+ *p = 0; -+ col_append_fstr(pinfo->cinfo, COL_INFO, " \"%s\"", utf8_text); -+ -+ return tvb_length(tvb); -+} -+ -+/* [3GPP TS 04.14 section 3.5.5] */ -+static int dissect_sched_msg_desc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, -+ gint *slot_list, gint slot_count) -+{ -+ gint offset = 0; -+ gint k; -+ proto_item *ti; -+ proto_tree *subtree; -+ guint8 mdt; -+ -+ for (k = 0; k < slot_count; k++) { -+ mdt = tvb_get_guint8(tvb, offset); -+ -+ if (mdt & 0x80) -+ mdt = 0x80; -+ else if (!(mdt & 0x40)) -+ mdt = 0; -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 1, "Slot %d - %s", -+ slot_list[k], -+ val_to_str(mdt, smscb_sched_mdt8_vals, "Unknown (0x%02x)")); -+ subtree = proto_item_add_subtree(ti, ett_smscb_sched_slot); -+ -+ if (mdt & 0x80) { -+ guint16 msgid = tvb_get_ntohs(tvb, offset) & SMSCB_SCHED_MSGID; -+ proto_item_append_text(ti, " (message ID %d)", msgid); -+ proto_item_set_len(ti, 2); -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt1, tvb, offset, 2, ENC_BIG_ENDIAN); -+ proto_tree_add_item(subtree, hf_smscb_sched_msgid, tvb, offset, 2, ENC_BIG_ENDIAN); -+ offset += 2; -+ } else if (!(mdt & 0xc0)) { -+ guint8 slot = tvb_get_guint8(tvb, offset) & SMSCB_SCHED_SLOT; -+ proto_item_append_text(ti, " (slot %d)", slot); -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt2, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(subtree, hf_smscb_sched_repslot, tvb, offset, 1, ENC_NA); -+ offset++; -+ } else { -+ proto_tree_add_item(subtree, hf_smscb_sched_mdt8, tvb, offset, 1, ENC_NA); -+ offset++; -+ } -+ } -+ return offset; -+} -+ -+/* [3GPP TS 04.14 section 3.5] */ -+static int dissect_sched_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ gint offset = 0; -+ gint first, last, nm, len; -+ gint new_count = 0; -+ gint other_count = 0; -+ gint new_list[SMSCB_SCHED_SLOT_MAX]; -+ gint other_list[SMSCB_SCHED_SLOT_MAX]; -+ -+ col_append_str(pinfo->cinfo, COL_INFO, " - Schedule message"); -+ -+ proto_tree_add_item(tree, hf_smscb_sched_type, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_sched_begin_slot, tvb, offset, 1, ENC_NA); -+ offset++; -+ proto_tree_add_item(tree, hf_smscb_sched_spare, tvb, offset, 1, ENC_NA); -+ proto_tree_add_item(tree, hf_smscb_sched_end_slot, tvb, offset, 1, ENC_NA); -+ offset++; -+ -+ first = tvb_get_guint8(tvb, 0) & SMSCB_SCHED_SLOT; -+ last = tvb_get_guint8(tvb, 1) & SMSCB_SCHED_SLOT; -+ last = MIN(last, SMSCB_SCHED_SLOT_MAX); -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 6, "List of new message slots ="); -+ for (nm = first; nm <= last; nm++) { -+ if (tvb_get_bits8(tvb, offset * 8 + nm - first, 1)) { -+ proto_item_append_text(ti, " %d", nm); -+ new_list[new_count++] = nm; -+ } else { -+ other_list[other_count++] = nm; -+ } -+ } -+ offset += 6; -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 0, "New Message Descriptions"); -+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_sched_new), -+ new_list, new_count); -+ offset += len; -+ proto_item_set_len(ti, len); -+ -+ ti = proto_tree_add_text(tree, tvb, offset, 0, "Other Message Descriptions"); -+ len = dissect_sched_msg_desc(tvb_new_subset(tvb, offset, -1, -1), pinfo, -+ proto_item_add_subtree(ti, ett_smscb_sched_other), -+ other_list, other_count); -+ offset += len; -+ proto_item_set_len(ti, len); -+ -+ return offset; -+} -+ -+static inline int seq_any_frags(guint8 seq) -+{ -+ return seq <= SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_more_frags(guint8 seq) -+{ -+ return seq < SMSCB_SEQ_LAST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_first(guint8 seq) -+{ -+ return seq == SMSCB_SEQ_1ST || seq == SMSCB_SEQ_1ST_SCHED; -+} -+ -+static inline int seq_bits(guint8 seq) -+{ -+ return seq & 3; -+} -+ -+/* -+ * Do the reassembly thing. -+ * -+ * SMSCB fragmentation doesn't really fit in with the wireshark -+ * reassembler. There are only two valid fragment sequences: -+ * i) 0,1,2,3 for a SMSCB message -+ * ii) 8,1,2,3 for a schedule message -+ * -+ * We can't use different fragment-IDs for each content type, -+ * since the last 3 blocks have identical sequence numbers. -+ * -+ * We can't just mask the lower 2 bits, because when reassembly -+ * completes (which is on the last block, sequence #3) we won't -+ * know which content type we've reassembled. -+ * -+ * We also can't munge e.g. the schedule sequence to 8,9,10,11, -+ * since the reassembler will think we're missing the first 8 -+ * blocks and not do anything. -+ * -+ * Also, according to TS 03.41 section 8 we must discard -+ * non-consecutive sequences. -+ * -+ * So the approach here is to include the address header byte -+ * in the first fragment. This way after reassembly we can peek -+ * at it and dissect accordingly. -+ * -+ * A clean implementation would likely be to add a FD_* reassembler -+ * flag to special-case this behaviour. -+ */ -+static tvbuff_t *smscb_try_reassembly(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, -+ guint8 *seq_p, guint8 more) -+{ -+ guint8 seq = *seq_p; -+ fragment_data *frag; -+ guint32 frag_id = 0x42; -+ guchar expected_seq = 0; -+ tvbuff_t *reassembled = NULL; -+ gboolean save_fragmented = pinfo->fragmented; -+ -+ if (!reassemble_smscb || !seq_any_frags(seq)) -+ return tvb; -+ -+ frag = fragment_get(pinfo, frag_id, smscb_fragment_table); -+ if (frag) { -+ while (frag->next) -+ frag = frag->next; -+ expected_seq = frag->offset + 1; -+ } -+ -+ if (seq != expected_seq) -+ g_free(fragment_delete(pinfo, frag_id, smscb_fragment_table)); -+ -+ if (!seq_first(seq)) -+ tvb = tvb_new_subset(tvb, 1, -1, -1); -+ -+ pinfo->fragmented = more; -+ frag = fragment_add_seq_check(tvb, 0, pinfo, frag_id, -+ smscb_fragment_table, -+ smscb_reassembled_table, seq_bits(seq), -+ tvb_length(tvb), -+ more); -+ -+ reassembled = process_reassembled_data(tvb, 0, pinfo, -+ "Reassembled SMSCB", frag, &smscb_frag_items, NULL, tree); -+ -+ if (frag && pinfo->fd->num == frag->reassembled_in) { -+ *seq_p = tvb_get_guint8(reassembled, 0) & SMSCB_ADDR_SEQ; -+ reassembled = tvb_new_subset(reassembled, 1, -1, -1); -+ } else { -+ col_append_str(pinfo->cinfo, COL_INFO, " (Fragment)"); -+ proto_tree_add_text(tree, tvb, 0, -1, "Fragment Data"); -+ reassembled = NULL; -+ } -+ -+ pinfo->fragmented = save_fragmented; -+ return reassembled; -+} -+ -+static int dissect_gsm_smscb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -+{ -+ proto_item *ti; -+ proto_tree *gsm_smscb_tree = NULL; -+ proto_tree *subtree = NULL; -+ guint8 addr, seq, more; -+ tvbuff_t *payload; -+ -+ if (tvb_length(tvb) < SMSCB_HDR_MINLEN) -+ return 0; -+ -+ addr = tvb_get_guint8(tvb, 0); -+ seq = addr & SMSCB_ADDR_SEQ; -+ more = !(addr & SMSCB_ADDR_LB) && seq_more_frags(seq); -+ -+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMSCB"); -+ -+ col_clear(pinfo->cinfo, COL_INFO); -+ col_append_str(pinfo->cinfo, COL_INFO, -+ val_to_str(seq, smscb_addr_seq_vals, "Unknown block #%d")); -+ -+ if (tree) { -+ ti = proto_tree_add_item(tree, proto_gsm_smscb, tvb, 0, -1, ENC_NA); -+ gsm_smscb_tree = proto_item_add_subtree(ti, ett_smscb); -+ -+ ti = proto_tree_add_item(gsm_smscb_tree, hf_smscb_addr, tvb, 0, 1, ENC_NA); -+ subtree = proto_item_add_subtree(ti, ett_smscb_addr); -+ proto_tree_add_item(subtree, hf_smscb_addr_lb, tvb, 0, 1, ENC_NA); -+ proto_tree_add_item(subtree, hf_smscb_addr_seq, tvb, 0, 1, ENC_NA); -+ } -+ -+ payload = smscb_try_reassembly(tvb, pinfo, gsm_smscb_tree, &seq, more); -+ if (payload) { -+ switch (seq) { -+ case SMSCB_SEQ_1ST: -+ dissect_smscb_message(payload, pinfo, gsm_smscb_tree); -+ break; -+ case SMSCB_SEQ_1ST_SCHED: -+ dissect_sched_message(payload, pinfo, gsm_smscb_tree); -+ break; -+ } -+ } -+ -+ return tvb_length(tvb); -+} -+ -+static hf_register_info hf[] = { -+ { &hf_smscb_addr, { -+ "Address Field", "smscb.addr", FT_UINT8, BASE_HEX, -+ NULL, 0x0, -+ "Address", HFILL, -+ }}, -+ { &hf_smscb_addr_lb, { -+ "LB", "smscb.addr.lb", FT_UINT8, BASE_DEC, -+ VALS(smscb_addr_lb_vals), SMSCB_ADDR_LB, -+ "Last Block bit", HFILL, -+ }}, -+ { &hf_smscb_addr_seq, { -+ "SEQ", "smscb.addr.seq", FT_UINT8, BASE_DEC, -+ VALS(smscb_addr_seq_vals), SMSCB_ADDR_SEQ, -+ "Sequence Number", HFILL, -+ }}, -+ -+ { &hf_smscb_serial_gs, { -+ "Geographic Scope", "smscb.serial.gs", FT_UINT16, BASE_DEC, -+ VALS(smscb_serial_gs_vals), SMSCB_SERIAL_GS, NULL, HFILL, -+ }}, -+ { &hf_smscb_serial_mcode, { -+ "Message Code", "smscb.serial.mcode", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SERIAL_MCODE, NULL, HFILL, -+ }}, -+ { &hf_smscb_serial_updnum, { -+ "Update Number", "smscb.serial.updnum", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SERIAL_UPDNUM, NULL, HFILL, -+ }}, -+ -+ { &hf_smscb_msgid, { -+ "Message Identifier", "smscb.msgid", FT_UINT16, BASE_DEC, -+ NULL, 0, NULL, HFILL, -+ }}, -+ -+ { &hf_smscb_page_num, { -+ "Page number", "smscb.page.num", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_PAGE_NUM, NULL, HFILL, -+ }}, -+ { &hf_smscb_page_cnt, { -+ "Total pages", "smscb.page.cnt", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_PAGE_CNT, NULL, HFILL, -+ }}, -+ { &hf_smscb_content, { -+ "Content of Message", "smscb.content", FT_STRING, BASE_NONE, -+ NULL, 0x00, NULL, HFILL, -+ }}, -+ -+ /* Schedule message */ -+ { &hf_smscb_sched_type, { -+ "Type", "smscb.sched.type", FT_UINT8, BASE_HEX, -+ NULL, SMSCB_SCHED_TYPE, -+ "Type", HFILL, -+ }}, -+ { &hf_smscb_sched_spare, { -+ "Spare", "smscb.sched.spare", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_TYPE, -+ "Spare", HFILL, -+ }}, -+ { &hf_smscb_sched_begin_slot, { -+ "Begin slot", "smscb.sched.begin_slot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_SLOT, -+ "Begin slot", HFILL, -+ }}, -+ { &hf_smscb_sched_end_slot, { -+ "End slot", "smscb.sched.end_slot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_SLOT, -+ "End slot", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt1, { -+ "MDT", "smscb.sched.mdt1", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SCHED_MDT1, -+ "Message Description Type", HFILL, -+ }}, -+ { &hf_smscb_sched_msgid, { -+ "Message ID", "smscb.sched.msg_id", FT_UINT16, BASE_DEC, -+ NULL, SMSCB_SCHED_MSGID, -+ "Message ID", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt2, { -+ "MDT", "smscb.sched.mdt2", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_MDT2, -+ "Message Description Type", HFILL, -+ }}, -+ { &hf_smscb_sched_repslot, { -+ "Repeated Slot Number", "smscb.sched.repslot", FT_UINT8, BASE_DEC, -+ NULL, SMSCB_SCHED_REPSLOT, -+ "Repeated Slot Number", HFILL, -+ }}, -+ { &hf_smscb_sched_mdt8, { -+ "MDT", "smscb.sched.mdt8", FT_UINT8, BASE_HEX, -+ VALS(smscb_sched_mdt8_vals), 0x00, -+ "Message Description Type", HFILL, -+ }}, -+ -+ /* Fragment reassembly */ -+ { &hf_smscb_fragments, { -+ "Message fragments", "smscb.fragments", -+ FT_NONE, BASE_NONE, NULL, 0x00, -+ "SMSCB Message fragments", HFILL, -+ }}, -+ { &hf_smscb_fragment, { -+ "Message fragment", "smscb.fragment", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message fragment", HFILL, -+ }}, -+ { &hf_smscb_fragment_overlap, { -+ "Message fragment overlap", "smscb.fragment.overlap", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment overlaps with other fragment(s)", HFILL, -+ }}, -+ { &hf_smscb_fragment_overlap_conflicts, { -+ "Message fragment overlapping with conflicting data", "smscb.fragment.overlap.conflicts", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment overlaps with conflicting data", HFILL, -+ }}, -+ { &hf_smscb_fragment_multiple_tails, { -+ "Message has multiple tail fragments", "smscb.fragment.multiple_tails", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment has multiple tail fragments", HFILL, -+ }}, -+ { &hf_smscb_fragment_too_long_fragment, { -+ "Message fragment too long", "smscb.fragment.too_long_fragment", -+ FT_BOOLEAN, BASE_NONE, NULL, 0x0, -+ "SMSCB Message fragment data goes beyond the packet end", HFILL, -+ }}, -+ { &hf_smscb_fragment_error, { -+ "Message defragmentation error", "smscb.fragment.error", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message defragmentation error due to illegal fragments", HFILL, -+ }}, -+ { &hf_smscb_reassembled_in, { -+ "Reassembled in", "smscb.reassembled.in", -+ FT_FRAMENUM, BASE_NONE, NULL, 0x00, -+ "SMSCB Message has been reassembled in this packet.", HFILL, -+ }}, -+ { &hf_smscb_reassembled_length, { -+ "Reassembled SMSCB length", "smscb.reassembled.length", -+ FT_UINT32, BASE_DEC, NULL, 0x00, -+ "The total length of the reassembled payload", HFILL, -+ }}, -+}; -+ -+static gint *ett[] = { -+ &ett_smscb, -+ &ett_smscb_addr, -+ &ett_smscb_dcs, -+ &ett_smscb_fragment, -+ &ett_smscb_fragments, -+ &ett_smscb_sched_new, -+ &ett_smscb_sched_other, -+ &ett_smscb_sched_slot, -+}; -+ -+void proto_reg_handoff_gsm_smscb(void) -+{ -+ data_handle = find_dissector("data"); -+} -+ -+void proto_register_gsm_smscb(void) -+{ -+ proto_gsm_smscb = proto_register_protocol( -+ "Short Message Service Cell Broadcast", -+ "SMSCB", "gsm_smscb"); -+ -+ proto_register_field_array(proto_gsm_smscb, hf, array_length(hf)); -+ proto_register_subtree_array(ett, array_length(ett)); -+ -+ new_register_dissector("gsm_smscb", dissect_gsm_smscb, proto_gsm_smscb); -+ register_init_routine(smscb_defragment_init); -+} -diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c -index dbeac85..add859d 100644 ---- a/epan/dissectors/packet-lapdm.c -+++ b/epan/dissectors/packet-lapdm.c -@@ -110,6 +110,7 @@ static GHashTable *lapdm_reassembled_table = NULL; - static dissector_table_t lapdm_sapi_dissector_table; - - static dissector_handle_t data_handle; -+static dissector_handle_t smscb_handle; - - static gboolean reassemble_lapdm = TRUE; - -@@ -121,6 +122,7 @@ static gboolean reassemble_lapdm = TRUE; - #define LAPDM_CR 0x02 /* Command/Response bit */ - #define LAPDM_EA 0x01 /* First Address Extension bit */ - #define LAPDM_LPD 0x60 /* Link Protocol Discriminator */ -+#define LAPDM_LPD_CB 0x20 /* Cell Broadcast LPD */ - - /* - * Bits in the length field. -@@ -219,6 +221,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - tvbuff_t *payload; - int available_length; - gboolean is_response = FALSE; -+ gboolean is_cbs = FALSE; - - /* Check that there's enough data */ - if (tvb_length(tvb) < LAPDM_HEADER_LEN) -@@ -229,6 +232,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - addr = tvb_get_guint8(tvb, 0); - length = tvb_get_guint8(tvb, 2); - -+ is_cbs = (addr & LAPDM_LPD) == LAPDM_LPD_CB; - cr = addr & LAPDM_CR; - if (pinfo->p2p_dir == P2P_DIR_RECV) { - is_response = cr ? FALSE : TRUE; -@@ -245,15 +249,22 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - addr_tree = proto_item_add_subtree(addr_ti, ett_lapdm_address); - - proto_tree_add_uint(addr_tree, hf_lapdm_lpd, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr); -- proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr); -+ if (!is_cbs) { -+ proto_tree_add_uint(addr_tree, hf_lapdm_sapi, tvb, 0, 1, addr); -+ proto_tree_add_uint(addr_tree, hf_lapdm_cr, tvb, 0, 1, addr); -+ proto_tree_add_uint(addr_tree, hf_lapdm_ea, tvb, 0, 1, addr); -+ } - } - else { - lapdm_ti = NULL; - lapdm_tree = NULL; - } - -+ if (is_cbs) { -+ call_dissector(smscb_handle, tvb, pinfo, tree); -+ return; -+ } -+ - control = dissect_xdlc_control(tvb, 1, pinfo, lapdm_tree, hf_lapdm_control, - ett_lapdm_control, &lapdm_cf_items, NULL /* LAPDm doesnt support extended */, NULL, NULL, - is_response, FALSE, FALSE); -@@ -486,5 +497,6 @@ void - proto_reg_handoff_lapdm(void) - { - data_handle = find_dissector("data"); -+ smscb_handle = find_dissector("gsm_smscb"); - } - -+ -- To view, visit https://gerrit.osmocom.org/9240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I448dc5a3dba3ecc6fc041861239dc23cca72b70b Gerrit-Change-Number: 9240 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 12:09:57 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 May 2018 12:09:57 +0000 Subject: Change in osmocom-bb[master]: Move 'src/target_dsp' to 'target/calypso_dsp' In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/9241 ) Change subject: Move 'src/target_dsp' to 'target/calypso_dsp' ...................................................................... Abandoned Ok, np :) Too aggressive clean up from my side. -- To view, visit https://gerrit.osmocom.org/9241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I1338d88fe1cbd6a27cf0bafe27b42ea5116c5b7e Gerrit-Change-Number: 9241 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 13:54:09 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 22 May 2018 13:54:09 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9243 Change subject: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS ...................................................................... contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS As it's quite complex to build osmocom firmware nowadays (a specific old release of gcc and binutils are required to build it), instead download the already built binaries from OBS. Change-Id: I2571268d91e2430a270e51438608e7dbd121e76d --- M contrib/jenkins-build-osmocom-bb.sh 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/43/9243/1 diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index f54518a..d5eec1e 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -5,6 +5,8 @@ name="osmocom-bb" . "$(dirname "$0")/jenkins-build-common.sh" +FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" + build_repo libosmocore --disable-doxygen have_repo osmocom-bb @@ -20,5 +22,12 @@ set +x; echo; echo; set -x make install +mkdir -p "$prefix" +cd "$prefix" +FW_RPM="$(wget -q -O - "$FW_RPM_URL" | grep -o 'osmocom-bb-firmware.*rpm' | sed 's#\"#\n#g' | head -1)" +echo "Downloading RPM package $FW_RPM" +wget -q "$FW_RPM_URL/$FW_RPM" -O osmocom-bb-firmware.rpm +rpm2cpio osmocom-bb-firmware.rpm | cpio -idmv +rm osmocom-bb-firmware.rpm create_bin_tgz "" "osmocon" -- To view, visit https://gerrit.osmocom.org/9243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2571268d91e2430a270e51438608e7dbd121e76d Gerrit-Change-Number: 9243 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 14:04:54 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Tue, 22 May 2018 14:04:54 +0000 Subject: Change in osmocom-bb[master]: osmocon: Makefile.am: Fix build using different path Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9244 Change subject: osmocon: Makefile.am: Fix build using different path ...................................................................... osmocon: Makefile.am: Fix build using different path Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e --- M src/host/osmocon/Makefile.am 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/44/9244/1 diff --git a/src/host/osmocon/Makefile.am b/src/host/osmocon/Makefile.am index 8b0d4bf..de4e575 100644 --- a/src/host/osmocon/Makefile.am +++ b/src/host/osmocon/Makefile.am @@ -13,9 +13,9 @@ sbin_PROGRAMS = osmocon osmoload # FIXME: sercomm needs to move into libosmocore or another shared lib -INCLUDES += -I../../target/firmware/include/comm -I../../target/firmware/apps -DHOST_BUILD -osmocon_SOURCES = osmocon.c tpu_debug.c ../../target/firmware/comm/sercomm.c +INCLUDES += -I$(srcdir)/../../target/firmware/include/comm -I$(srcdir)/../../target/firmware/apps -DHOST_BUILD +osmocon_SOURCES = osmocon.c tpu_debug.c $(srcdir)/../../target/firmware/comm/sercomm.c osmocon_LDADD = $(LIBOSMOCORE_LIBS) -osmoload_SOURCE = osmoload.c ../../target/firmware/comm/sercomm.c +osmoload_SOURCE = osmoload.c $(srcdir)/../../target/firmware/comm/sercomm.c osmoload_LDADD = $(LIBOSMOCORE_LIBS) -- To view, visit https://gerrit.osmocom.org/9244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e Gerrit-Change-Number: 9244 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 15:23:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Tue, 22 May 2018 15:23:35 +0000 Subject: Change in osmo-bsc[master]: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9242 ) Change subject: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8e591a56ae522b371da01ea968151a7e6fa24bb9 Gerrit-Change-Number: 9242 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Tue, 22 May 2018 15:23:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9245 Change subject: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO ...................................................................... L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO The standard defines this messages, even it's send from the Network -> MS as MO, because the procedure initiated by the MS. Change-Id: I4b5e2d43c9754d34b3749bff43b7df7196b9bb9c --- M library/L3_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/9245/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 5acd2bf..b2bfb07 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1843,7 +1843,7 @@ } } -template PDU_L3_SGSN_MS tr_GMM_DET_ACCEPT_MT := { +template PDU_L3_SGSN_MS tr_GMM_DET_ACCEPT_MO := { discriminator := '1000'B, tiOrSkip := { skipIndicator := '0000'B @@ -1859,7 +1859,7 @@ } } -template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT(template BIT3 dtt := ?, template boolean power_off := ?) := { +template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MO(template BIT3 dtt := ?, template boolean power_off := ?) := { discriminator := '1000'B, tiOrSkip := { skipIndicator := '0000'B diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index e1d35c5..36a4700 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -784,7 +784,7 @@ [not expect_purge] GSUP.receive(tr_GSUP_PURGE_MS_REQ(?)) { setverdict(fail, "Unexpected GSUP PURGE MS for unregistered TLLI"); } - [power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MO)) -> value bd { g_pars.ra := omit; setverdict(fail, "Unexpected ATTACH ACCEPT in no-power-off DETACH"); /* TODO: check if any PDP contexts are deactivated on network side? */ @@ -792,7 +792,7 @@ [power_off] T.timeout { setverdict(pass); } - [not power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MT)) -> value bd { + [not power_off] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_ACCEPT_MO)) -> value bd { g_pars.ra := omit; setverdict(pass); /* TODO: check if any PDP contexts are deactivated on network side? */ @@ -1130,7 +1130,7 @@ apars.apn, apars.pco)); alt { /* We might want toalso actually expect a PDPC CTX ACT REJ? */ - [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(?, ?))) { + [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MO(?, ?))) { setverdict(pass); } [] GTP.receive(tr_GTPC_MsgType(?, createPDPContextRequest, ?)) { -- To view, visit https://gerrit.osmocom.org/9245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b5e2d43c9754d34b3749bff43b7df7196b9bb9c Gerrit-Change-Number: 9245 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add values for c_GMM_DTT_MT_* Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9246 Change subject: L3_Templates: add values for c_GMM_DTT_MT_* ...................................................................... L3_Templates: add values for c_GMM_DTT_MT_* GMM detach type values Change-Id: I4903fa4c915add3062ab6b82a1d39d60426b5681 --- M library/L3_Templates.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/9246/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index b2bfb07..ec3f257 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1790,6 +1790,10 @@ const BIT3 c_GMM_DTT_MO_IMSI := '010'B; const BIT3 c_GMM_DTT_MO_GPRS_IMSI_COMBINED := '011'B; +const BIT3 c_GMM_DTT_MT_REATTACH_REQUIRED := '001'B; +const BIT3 c_GMM_DTT_MT_REATTACH_NOT_REQUIRED := '010'B; +const BIT3 c_GMM_DTT_MT_IMSI_DETACH := '011'B; + template (value) DetachTypeV ts_GMM_DetType(BIT3 dtt, boolean power_off := false) := { detachType := dtt, powerOffFlag := bool2bit(power_off) -- To view, visit https://gerrit.osmocom.org/9246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4903fa4c915add3062ab6b82a1d39d60426b5681 Gerrit-Change-Number: 9246 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9247 Change subject: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT ...................................................................... L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 --- M library/L3_Templates.ttcn 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/9247/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index ec3f257..c2b9926 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1880,6 +1880,43 @@ } } +template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT( + template BIT3 dtt := c_GMM_DTT_MT_REATTACH_REQUIRED, + template BIT3 forceToStandby := ?, + template OCT1 cause := omit) := { + discriminator := '1000'B, + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + detachRequest_SGSN_MS := { + messageType := '00000101'B, + detachType := { dtt, ? }, + forceToStandby := { forceToStandby, '0'B }, + gmmCause := { + elementIdentifier := '25'O, + causeValue := { cause } + } + } + } + } +} + +template PDU_L3_MS_SGSN ts_GMM_DET_ACCEPT_MT := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + detachAccept_MS_SGSN := { + messageType := '00000000'B + } + } + } +} + function ts_ApnTLV(template (omit) octetstring apn) return template (omit) AccessPointNameTLV { if (istemplatekind(apn, "omit")) { return omit; -- To view, visit https://gerrit.osmocom.org/9247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 Gerrit-Change-Number: 9247 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9248 Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... SGSN: add TC_hlr_location_cancel_request MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack MS <- SGSN: Detach Request SGSN-> MS: Detach Complete Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a --- M sgsn/SGSN_Tests.ttcn 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/9248/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 36a4700..a2679cf 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1249,6 +1249,39 @@ } +private function f_TC_hlr_location_cancel_request_withdraw(charstring id) runs on BSSGP_ConnHdlr { + /* MS: perform regular attach */ + f_TC_attach(id); + + /* HLR: cancel the location request */ + var GSUP_PDU gsup; + gsup := valueof(ts_GSUP_CL_REQ(g_pars.imsi, OSMO_GSUP_CANCEL_TYPE_WITHDRAW)); + GSUP.send(gsup); + GSUP.receive(tr_GSUP_CL_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + /* MS: receive a Detach Request */ + BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); + BSSGP.send(ts_GMM_DET_ACCEPT_MT); + + setverdict(pass); +} + +testcase TC_hlr_location_cancel_request_withdraw() runs on test_CT { + /* MS <-> SGSN: GMM Attach + * HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Ack + * MS <- SGSN: Detach Request + * SGSN-> MS: Detach Complete + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb[0], 29); + vc_conn.done; +} + + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1262,6 +1295,7 @@ execute( TC_attach_combined() ); execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); + execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_detach_unknown_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9249 Change subject: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors ...................................................................... GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors Change-Id: I21ee02556f0734dad871a6294b21ca6f2864dea0 --- M library/GSUP_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/9249/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 57c0a39..4c2aac0 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -341,7 +341,7 @@ template GSUP_PDU tr_GSUP_CL_ERR(template hexstring imsi, template integer cause := ?) := tr_GSUP(OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR, { - tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause) }); + tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause), * }); template (value) GSUP_PDU ts_GSUP_PURGE_MS_REQ(hexstring imsi, GSUP_CnDomain dom) := ts_GSUP(OSMO_GSUP_MSGT_PURGE_MS_REQUEST, { -- To view, visit https://gerrit.osmocom.org/9249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I21ee02556f0734dad871a6294b21ca6f2864dea0 Gerrit-Change-Number: 9249 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:34 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw... Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9250 Change subject: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} ...................................................................... SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} Cancel Location using an unknown IMSI. HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Error Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/9250/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index a2679cf..860ca09 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1282,6 +1282,55 @@ } +private function f_hlr_location_cancel_request_unknown_subscriber( + charstring id, + GSUP_CancelType canceltype) runs on BSSGP_ConnHdlr { + + /* HLR: cancel the location request */ + var GSUP_PDU gsup; + gsup := valueof(ts_GSUP_CL_REQ(g_pars.imsi, canceltype)); + GSUP.send(gsup); + + /* cause 2 = IMSI_UNKNOWN */ + GSUP.receive(tr_GSUP_CL_ERR(g_pars.imsi, 2)); + + setverdict(pass); +} + +private function f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw(charstring id) runs on BSSGP_ConnHdlr { + f_hlr_location_cancel_request_unknown_subscriber(id, OSMO_GSUP_CANCEL_TYPE_WITHDRAW); +} + +testcase TC_hlr_location_cancel_request_unknown_subscriber_withdraw() runs on test_CT { + /* HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Error + */ + + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb[0], 30); + vc_conn.done; +} + +private function f_TC_hlr_location_cancel_request_unknown_subscriber_update(charstring id) runs on BSSGP_ConnHdlr { + f_hlr_location_cancel_request_unknown_subscriber(id, OSMO_GSUP_CANCEL_TYPE_WITHDRAW); +} + +testcase TC_hlr_location_cancel_request_unknown_subscriber_update() runs on test_CT { + /* HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Error + */ + + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb[0], 30); + vc_conn.done; +} + + + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1296,6 +1345,8 @@ execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 5.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 5.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_detach_unknown_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/9250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 Gerrit-Change-Number: 9250 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:22:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:22:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9251 Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... SGSN: add TC_hlr_location_cancel_request_update MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/9251/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 860ca09..bce0241 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1249,6 +1249,45 @@ } +private function f_TC_hlr_location_cancel_request_update(charstring id) runs on BSSGP_ConnHdlr { + /* MS: perform regular attach */ + f_TC_attach(id); + + /* HLR: cancel the location request */ + var GSUP_PDU gsup; + gsup := valueof(ts_GSUP_CL_REQ(g_pars.imsi, OSMO_GSUP_CANCEL_TYPE_UPDATE)); + GSUP.send(gsup); + GSUP.receive(tr_GSUP_CL_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + /* ensure no Detach Request got received */ + timer T := 5.0; + T.start; + alt { + [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))) { + T.stop; + setverdict(fail, "Unexpected GMM Detach Request"); + } + [] T.timeout { + setverdict(pass); + self.stop; + } + } +} + +testcase TC_hlr_location_cancel_request_update() runs on test_CT { + /* MS <-> SGSN: GMM Attach + * HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Ack + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb[0], 31); + vc_conn.done; +} + + private function f_TC_hlr_location_cancel_request_withdraw(charstring id) runs on BSSGP_ConnHdlr { /* MS: perform regular attach */ f_TC_attach(id); @@ -1344,6 +1383,7 @@ execute( TC_attach_combined() ); execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); + execute( TC_hlr_location_cancel_request_update(), 10.0 ); execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 5.0 ); execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 5.0 ); -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 16:24:00 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 16:24:00 +0000 Subject: Change in libosmocore[master]: core/timer_compat: define CLOCK_BOOTTIME In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/7906 ) Change subject: core/timer_compat: define CLOCK_BOOTTIME ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/7906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ia3d3a829700272ec8e5cf67379d8d85368230726 Gerrit-Change-Number: 7906 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 17:16:49 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 22 May 2018 17:16:49 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9252 Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... fix double-free/use-after-free of pointers in struct e1inp_line Ensure that pointers in cloned e1inp_lines point to valid memory. Some members of struct e1inp_line can simply be deep-copied. Use talloc reference counting for pointers to objects which may be shared between clones (driver-private state and counters). Prevents double-free bugs, e.g. when multiple links referring to the same line are closed. Also, do not forget to unlink struct e1inp_line's counter group from the counter list. Fixes use-after-free in rate_ctr_timer_cb() during osmo-bts shutdown. Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Related: OS#3011 Related: OS#3137 Related: OS#3282 --- M src/e1_input.c 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/52/9252/1 diff --git a/src/e1_input.c b/src/e1_input.c index 29ba440..f5c167a 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -394,6 +394,25 @@ return NULL; memcpy(clone, line, sizeof(struct e1inp_line)); + + if (line->name) { + clone->name = talloc_strdup(clone, line->name); + OSMO_ASSERT(clone->name); + } + if (line->sock_path) { + clone->sock_path = talloc_strdup(clone, line->sock_path); + OSMO_ASSERT(clone->sock_path); + } + + /* + * Rate counters and driver data are shared between clones. These are pointers + * to dynamic memory so we must use reference counting to avoid a double-free. + */ + OSMO_ASSERT(line->rate_ctr); + clone->rate_ctr = talloc_reference(clone, line->rate_ctr); + if (line->driver_data) + clone->driver_data = talloc_reference(clone, line->driver_data); + clone->refcnt = 1; return clone; } @@ -406,8 +425,15 @@ void e1inp_line_put(struct e1inp_line *line) { line->refcnt--; - if (line->refcnt == 0) + if (line->refcnt == 0) { + /* Remove our counter group from the global counter list + * if we were holding the last remaining reference. */ + if (talloc_reference_count(line->rate_ctr) == 0) + rate_ctr_group_free(line->rate_ctr); + else + talloc_unlink(line, line->rate_ctr); talloc_free(line); + } } void -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 18:03:08 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 22 May 2018 18:03:08 +0000 Subject: Change in osmocom-bb[master]: osmocon: Makefile.am: Fix build using different path In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9244 ) Change subject: osmocon: Makefile.am: Fix build using different path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e Gerrit-Change-Number: 9244 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 May 2018 18:03:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 18:58:10 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 18:58:10 +0000 Subject: Change in osmo-sgsn[master]: gprs_subscriber: gsup_auth_error: reject MS in all cases Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9253 Change subject: gprs_subscriber: gsup_auth_error: reject MS in all cases ...................................................................... gprs_subscriber: gsup_auth_error: reject MS in all cases There is no way to recover from "PROTOCOL_ERRORS". As long the error_cause is not set, the SGSN won't send out a GMM Request Reject. Fixes: TTCN: SGGN_Tests.TC_attach_auth_sai_reject Change-Id: Iefe8f05686ef4acac721f3c0672910704f3b0ff8 --- M src/gprs/gprs_subscriber.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/53/9253/1 diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index bebdb1e..1bebc65 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -502,6 +502,7 @@ "GSUP protocol remote error, GMM cause = '%s' (%d)\n", get_value_string(gsm48_gmm_cause_names, gsup_msg->cause), gsup_msg->cause); + sdata->error_cause = gsup_msg->cause; break; } -- To view, visit https://gerrit.osmocom.org/9253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iefe8f05686ef4acac721f3c0672910704f3b0ff8 Gerrit-Change-Number: 9253 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 18:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 18:59:07 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Cancel Location: use detach type IMSI Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9254 Change subject: gprs_gmm: Cancel Location: use detach type IMSI ...................................................................... gprs_gmm: Cancel Location: use detach type IMSI The detach type network side is defined as - Reattach required - Reattach not required - IMSI detach (after VLR failure) IMSI detach seems to be more close. Howeever the standard isn't clear about this. Change-Id: I27da6dc5165819cccd1ae0a98b132b45a01f38bb --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/54/9254/1 diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 93d64a4..4593dde 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -1150,7 +1150,7 @@ get_value_string(gsm48_gmm_cause_names, gmm_cause), gmm_cause); gsm48_tx_gmm_detach_req( - ctx, GPRS_DET_T_MT_REATT_NOTREQ, gmm_cause); + ctx, GPRS_DET_T_MT_IMSI, gmm_cause); mm_ctx_cleanup_free(ctx, "auth lost"); break; -- To view, visit https://gerrit.osmocom.org/9254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I27da6dc5165819cccd1ae0a98b132b45a01f38bb Gerrit-Change-Number: 9254 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 19:07:32 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 19:07:32 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make functions relating to GMM Attach Request public Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9255 Change subject: gprs_gmm: make functions relating to GMM Attach Request public ...................................................................... gprs_gmm: make functions relating to GMM Attach Request public GMM Attach Request will be handled in it's own file and will use those functions. Change-Id: Ic90d77f7b0bacd2a8e2e409e82d676772d352749 --- M include/osmocom/sgsn/gprs_gmm.h M src/gprs/gprs_gmm.c 2 files changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/55/9255/1 diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 6324c5d..b89eff5 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -11,6 +11,9 @@ uint8_t cause, uint8_t pco_len, uint8_t *pco_v); int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp); int gsm48_tx_gsm_deact_pdp_acc(struct sgsn_pdp_ctx *pdp); +int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, + const struct osmo_auth_vector *vec, + uint8_t key_seq, bool force_standby); int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); @@ -32,4 +35,9 @@ int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); +int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type); +int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, + uint8_t gmm_cause); +int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm); + #endif /* _GPRS_GMM_H */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 93d64a4..df498c1 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -424,7 +424,7 @@ }; /* Chapter 9.4.2: Attach accept */ -static int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm) +int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT ACK"); struct gsm48_hdr *gh; @@ -503,7 +503,7 @@ gmm_copy_id(msg, old_msg); return _tx_gmm_att_rej(msg, gmm_cause, NULL); } -static int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, +int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, uint8_t gmm_cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT REJ"); @@ -547,7 +547,7 @@ } /* Transmit Chapter 9.4.12 Identity Request */ -static int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) +int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ"); struct gsm48_hdr *gh; @@ -577,7 +577,7 @@ } /* 3GPP TS 24.008 Section 9.4.9: Authentication and Ciphering Request */ -static int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, +int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, const struct osmo_auth_vector *vec, uint8_t key_seq, bool force_standby) { @@ -1533,7 +1533,7 @@ } /* Chapter 9.4.17: Routing area update reject */ -static int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause) +int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 RA UPD REJ"); struct gsm48_hdr *gh; -- To view, visit https://gerrit.osmocom.org/9255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic90d77f7b0bacd2a8e2e409e82d676772d352749 Gerrit-Change-Number: 9255 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 19:07:35 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 19:07:35 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9256 Change subject: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public ...................................................................... gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public Change-Id: I54168e1a58dd36b38c53c13bbb5cdb4311f34410 --- M include/osmocom/sgsn/gprs_gmm.h M src/gprs/gprs_gmm.c 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/9256/1 diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index b89eff5..3c93efc 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -40,4 +40,7 @@ uint8_t gmm_cause); int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm); +/* TODO: move extract_subscr_* when gsm48_gmm_authorize() got removed */ +void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx); +void extract_subscr_hlr(struct sgsn_mm_ctx *ctx); #endif /* _GPRS_GMM_H */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index df498c1..57d3883 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -848,7 +848,7 @@ return rc; } -static void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx) +void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx) { struct gsm_mncc_number called; uint8_t msisdn[sizeof(ctx->subscr->sgsn_data->msisdn) + 1]; @@ -879,7 +879,7 @@ } } -static void extract_subscr_hlr(struct sgsn_mm_ctx *ctx) +void extract_subscr_hlr(struct sgsn_mm_ctx *ctx) { struct gsm_mncc_number called; uint8_t hlr_number[sizeof(ctx->subscr->sgsn_data->hlr) + 1]; -- To view, visit https://gerrit.osmocom.org/9256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I54168e1a58dd36b38c53c13bbb5cdb4311f34410 Gerrit-Change-Number: 9256 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 19:07:36 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 19:07:36 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9257 Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... gprs_gmm: introduce a GMM Attach Request FSM The old GMM Attach Request handling used a recursive function which can not handle certain states and is quite complex and hard to extend. The new FSM handles such request in a FSM and can be called multiple times. Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 --- M include/osmocom/sgsn/gprs_sgsn.h M src/gprs/Makefile.am M src/gprs/gprs_gmm.c A src/gprs/gprs_gmm_attach.c A src/gprs/gprs_gmm_attach.h M src/gprs/gprs_sgsn.c M tests/sgsn/Makefile.am 7 files changed, 404 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/9257/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 64e5619..2a01a99 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -168,6 +169,8 @@ struct ranap_ue_conn_ctx *ue_ctx; struct service_info service; } iu; + struct osmo_fsm_inst *gmm_att_req_fsm; + uint32_t gmm_att_identy_type; /* VLR number */ uint32_t new_sgsn_addr; /* Authentication Triplet */ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 4c7f730..aa6b08c 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -58,6 +58,7 @@ $(NULL) osmo_sgsn_SOURCES = \ + gprs_gmm_attach.c \ gprs_gmm.c \ gprs_sgsn.c \ gprs_sndcp.c \ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 57d3883..4236870 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -64,6 +64,8 @@ #include +#include "gprs_gmm_attach.h" + #define PTMSI_ALLOC extern struct sgsn_instance *sgsn; @@ -791,7 +793,7 @@ /* FIXME: enable LLC cipheirng */ /* Check if we can let the mobile station enter */ - return gsm48_gmm_authorize(ctx); + return osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_AUTH_RESP_RECV, NULL); } /* Section 9.4.10: Authentication and Ciphering Failure */ @@ -1107,7 +1109,10 @@ { ctx->sec_ctx = OSMO_AUTH_TYPE_NONE; - gsm48_gmm_authorize(ctx); + if (ctx->gmm_att_req_fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_VLR_ANSWERED, (void *) 0); + else + gsm48_gmm_authorize(ctx); } void gsm0408_gprs_access_granted(struct sgsn_mm_ctx *ctx) @@ -1118,7 +1123,8 @@ "Authorized, continuing procedure, IMSI=%s\n", ctx->imsi); /* Continue with the authorization */ - gsm48_gmm_authorize(ctx); + if (ctx->gmm_att_req_fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_VLR_ANSWERED, (void *) 0); break; default: LOGMMCTXP(LOGL_INFO, ctx, @@ -1139,8 +1145,8 @@ "with cause '%s' (%d)\n", get_value_string(gsm48_gmm_cause_names, gmm_cause), gmm_cause); - gsm48_tx_gmm_att_rej(ctx, gmm_cause); - mm_ctx_cleanup_free(ctx, "GPRS ATTACH REJECT"); + if (ctx->gmm_att_req_fsm->state != ST_INIT) + osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_REJECT, (void *) (long) gmm_cause); break; case GMM_REGISTERED_NORMAL: case GMM_REGISTERED_SUSPENDED: @@ -1183,6 +1189,7 @@ { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK; + long mi_typel = mi_type; char mi_string[GSM48_MI_SIZE]; gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]); @@ -1235,7 +1242,7 @@ } /* Check if we can let the mobile station enter */ - return gsm48_gmm_authorize(ctx); + return osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_IDEN_RESP_RECV, (void *)mi_typel); } /* Allocate a new P-TMSI and change context state */ @@ -1425,8 +1432,8 @@ gprs_llgmm_assign(ctx->gb.llme, ctx->gb.tlli, ctx->gb.tlli_new); } - ctx->pending_req = GSM48_MT_GMM_ATTACH_REQ; - return gsm48_gmm_authorize(ctx); + osmo_fsm_inst_dispatch(ctx->gmm_att_req_fsm, E_ATTACH_REQ_RECV, msg); + return 0; err_inval: LOGPC(DMM, LOGL_INFO, "\n"); @@ -2023,6 +2030,7 @@ mmctx_set_mm_state(mmctx, MM_READY); rc = 0; + osmo_fsm_inst_dispatch(mmctx->gmm_att_req_fsm, E_ATTACH_COMPLETE_RECV, 0); memset(&sig_data, 0, sizeof(sig_data)); sig_data.mm = mmctx; osmo_signal_dispatch(SS_SGSN, S_SGSN_ATTACH, &sig_data); diff --git a/src/gprs/gprs_gmm_attach.c b/src/gprs/gprs_gmm_attach.c new file mode 100644 index 0000000..cac660e --- /dev/null +++ b/src/gprs/gprs_gmm_attach.c @@ -0,0 +1,345 @@ +#include "gprs_gmm_attach.h" + +#include +#include +#include +#include + +#define X(s) (1 << (s)) + +extern const struct value_string gmm_attach_req_fsm_event_names[]; +extern struct osmo_fsm gmm_attach_req_fsm; + +static int require_identity_imei = 1; +static int require_auth = 1; + +static void st_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + ctx->auth_state = SGSN_AUTH_UNKNOWN; + + /* + * TODO: remove pending_req as soon the sgsn_auth code doesn't depend + * on it. + * pending_req must be set, even this fsm doesn't use it, because + * the sgsn_auth code is using this too + */ + ctx->pending_req = GSM48_MT_GMM_ATTACH_REQ; + + if (require_identity_imei) { + ctx->gmm_att_identy_type = GSM_MI_TYPE_IMEI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (!strlen(ctx->imsi)) { + ctx->gmm_att_identy_type = GSM_MI_TYPE_IMSI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (require_auth) + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + else + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); +} + +static void st_identity_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + int ret = 0; + + ctx->num_T_exp = 0; + + switch (ctx->gmm_att_identy_type) { + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMSI: + break; + default: + /* TODO logging */ + osmo_fsm_inst_dispatch(fi, E_REJECT, NULL); + return; + } + + ctx->t3370_id_type = ctx->gmm_att_identy_type; + ret = gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_identy_type); + if (ret < 0) { + LOGPFSM(fi, "Can not send tx_gmm_id %d.\n", ret); + osmo_fsm_inst_dispatch(fi, E_REJECT, NULL); + } +} + +static void st_identity(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + /* check if we received a identity response */ + long type = (long) data; + switch (type) { + case GSM_MI_TYPE_IMEI: + case GSM_MI_TYPE_IMSI: + break; + default: + LOGMMCTXP(LOGL_ERROR, ctx, "Unknown mi type: 0x%lx, rejecting MS.\n", type); + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_NET_FAIL); + return; + } + + if (type != ctx->gmm_att_identy_type) { + /* ignore wrong package */ + /* TODO logging */ + return; + } + + if (type == GSM_MI_TYPE_IMEI && !strlen(ctx->imsi)) { + ctx->gmm_att_identy_type = GSM_MI_TYPE_IMSI; + osmo_fsm_inst_state_chg(fi, ST_IDENTIY, sgsn->cfg.timers.T3370, 3370); + } else if (require_auth) + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + else + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); +} + +static void st_auth_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + enum sgsn_auth_state auth_state; + + ctx->num_T_exp = 0; + + /* TODO: remove this layer violation. Don't parse any auth_policy here + * The correct way would be to ask the SGSN is this mmctx has to be auth + * regardless of the state. + * Otherwise someone else could steal the TLLI and just use it without further + * auth. + */ + if (sgsn->cfg.auth_policy != SGSN_AUTH_POLICY_REMOTE) { + /* we can "trust" sgsn_auth_state as long it's not remote */ + auth_state = sgsn_auth_state(ctx); + } else { + auth_state = ctx->auth_state; + } + + switch(auth_state) { + case SGSN_AUTH_UNKNOWN: /* the SGSN doesn know this MS */ + osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + break; + case SGSN_AUTH_REJECTED: + /* TODO: correct GMM cause */ + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_GPRS_NOTALLOWED); + break; + case SGSN_AUTH_ACCEPTED: + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + break; + case SGSN_AUTH_AUTHENTICATE: + if (ctx->auth_triplet.key_seq == GSM_KEY_SEQ_INVAL) { + /* invalid key material */ + osmo_fsm_inst_state_chg(fi, ST_ASK_VLR, sgsn->cfg.timers.T3350, 3350); + } + + struct gsm_auth_tuple *at = &ctx->auth_triplet; + if (gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, + false) < 0) { + /* network failure */ + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_CAUSE_NET_FAIL); + } + break; + case SGSN_AUTH_UMTS_RESYNC: + /* FIXME!! */ + break; + } +} + +static void st_auth(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + if (event == E_AUTH_RESP_RECV) { + sgsn_auth_request(ctx); + osmo_fsm_inst_state_chg(fi, ST_ACCEPT, sgsn->cfg.timers.T3350, 3350); + } +} + +static void st_accept_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + ctx->num_T_exp = 0; + + /* TODO: remove pending_req as soon the sgsn_auth code doesn't depend on it */ + ctx->pending_req = 0; + gsm48_tx_gmm_att_ack(ctx); +} + +static void st_accept(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + switch(event) { + case E_ATTACH_COMPLETE_RECV: + /* TODO: #ifdef ! PTMSI_ALLOC is not supported */ + extract_subscr_msisdn(ctx); + extract_subscr_hlr(ctx); + osmo_fsm_inst_state_chg(fi, ST_INIT, 0, 0); + break; + } +} + +static void st_reject(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + long reject_cause = (long) data; + + if (reject_cause != GMM_DISCARD_MS_WITHOUT_REJECT) + gsm48_tx_gmm_att_rej(ctx, (uint8_t) reject_cause); + + sgsn_mm_ctx_cleanup_free(ctx); +} + +static void st_ask_vlr_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + + /* ask the auth layer for more data */ + sgsn_auth_request(ctx); +} + +static void st_ask_vlr(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch(event) { + case E_VLR_ANSWERED: + osmo_fsm_inst_state_chg(fi, ST_AUTH, sgsn->cfg.timers.T3360, 3360); + break; + } +} + +static struct osmo_fsm_state gmm_attach_req_fsm_states[] = { + /* default state for non-DTX and DTX when SPEECH is in progress */ + [ST_INIT] = { + .in_event_mask = X(E_ATTACH_REQ_RECV), + .out_state_mask = X(ST_INIT) | X(ST_IDENTIY) | X(ST_AUTH) | X(ST_ACCEPT), + .name = "Init", + .action = st_init, + }, + [ST_ASK_VLR] = { + .in_event_mask = X(E_VLR_ANSWERED), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_REJECT), + .name = "Ask the hlr about the MS", + .onenter = st_ask_vlr_on_enter, + .action = st_ask_vlr, + }, + [ST_IDENTIY] = { + .in_event_mask = X(E_IDEN_RESP_RECV), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_IDENTIY) | X(ST_REJECT), + .onenter = st_identity_on_enter, + .name = "Check Identity of the MS (IMSI/IMEI)", + .action = st_identity, + }, + [ST_AUTH] = { + .in_event_mask = X(E_AUTH_RESP_RECV), + .out_state_mask = X(ST_INIT) | X(ST_AUTH) | X(ST_ACCEPT) | X(ST_ASK_VLR) | X(ST_REJECT), + .name = "Authenticate", + .onenter = st_auth_on_enter, + .action = st_auth, + }, + [ST_ACCEPT] = { + .in_event_mask = X(E_ATTACH_COMPLETE_RECV), + .out_state_mask = X(ST_INIT) | X(ST_REJECT), + .name = "Wait for Authentication Response", + .onenter = st_accept_on_enter, + .action = st_accept, + }, + [ST_REJECT] = { + .in_event_mask = X(E_REJECT), + .out_state_mask = X(ST_INIT), + .name = "Reject the MS", + .action = st_reject, + }, +}; + +const struct value_string gmm_attach_req_fsm_event_names[] = { + { E_ATTACH_REQ_RECV, "Received an attach request" }, + { E_IDEN_RESP_RECV, "Identity Request received" }, + { E_AUTH_RESP_RECV, "Authentication Request received" }, + { E_ATTACH_ACCEPTED, "Attach accepted" }, + { E_ATTACH_ACCEPT_SENT, "Attach accept sent" }, + { E_ATTACH_COMPLETE_RECV, "Attach complete received." }, + { E_REJECT, "Reject the MS"}, + { E_VLR_ANSWERED, "VLR answered"}, + { 0, NULL } +}; + +void gmm_attach_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + switch (event) { + case E_ATTACH_REQ_RECV: + /* always call the st_init handler */ + if (fi->state != ST_INIT) + osmo_fsm_inst_state_chg(fi, ST_INIT, 0, 0); + st_init(fi, event, data); + break; + case E_REJECT: + if (fi->state != ST_REJECT) + osmo_fsm_inst_state_chg(fi, ST_REJECT, 0, 0); + st_reject(fi, event, data); + break; + } +} + +int gmm_attach_timer_cb(struct osmo_fsm_inst *fi) +{ + struct sgsn_mm_ctx *ctx = fi->priv; + struct gsm_auth_tuple *at = &ctx->auth_triplet; + + ctx->num_T_exp++; + + switch(fi->state) { + case ST_ASK_VLR: + /* TODO: replace T3350 by a better timer or it's own + * re-use T3350 - not defined by standard */ + LOGMMCTXP(LOGL_ERROR, ctx, "HLR did not answer in time. Rejecting.\n"); + osmo_fsm_inst_dispatch(fi, E_REJECT, + (void *) GMM_CAUSE_NET_FAIL); + break; + case ST_IDENTIY: + /* T3370 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, + (void *) GMM_CAUSE_MS_ID_NOT_DERIVED); + break; + } + gsm48_tx_gmm_id_req(ctx, ctx->gmm_att_identy_type); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3370, 0); + break; + case ST_AUTH: + /* T3360 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_DISCARD_MS_WITHOUT_REJECT); + break; + } + gsm48_tx_gmm_auth_ciph_req(ctx, &at->vec, at->key_seq, false); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3360, 0); + break; + case ST_ACCEPT: + /* T3350 */ + if (ctx->num_T_exp >= 5) { + osmo_fsm_inst_dispatch(fi, E_REJECT, (void *) GMM_DISCARD_MS_WITHOUT_REJECT); + break; + } + gsm48_tx_gmm_att_ack(ctx); + osmo_timer_schedule(&fi->timer, sgsn->cfg.timers.T3350, 0); + break; + } + + return 0; +} + +struct osmo_fsm gmm_attach_req_fsm = { + .name = "GMM_ATTACH_REQ_FSM", + .states = gmm_attach_req_fsm_states, + .num_states = ARRAY_SIZE(gmm_attach_req_fsm_states), + .event_names = gmm_attach_req_fsm_event_names, + .allstate_event_mask = X(E_REJECT) | X(E_ATTACH_REQ_RECV), + .allstate_action = gmm_attach_allstate_action, + .log_subsys = DMM, + .timer_cb = gmm_attach_timer_cb, +}; + +static __attribute__((constructor)) void l2tp_fsm_init(void) +{ + osmo_fsm_register(&gmm_attach_req_fsm); +} diff --git a/src/gprs/gprs_gmm_attach.h b/src/gprs/gprs_gmm_attach.h new file mode 100644 index 0000000..a1a4f61 --- /dev/null +++ b/src/gprs/gprs_gmm_attach.h @@ -0,0 +1,32 @@ +#ifndef GPRS_GMM_ATTACH_H +#define GPRS_GMM_ATTACH_H + +#include + +enum gmm_attach_req_fsm_states { + ST_INIT, + ST_IDENTIY, + ST_RETRIEVE_AUTH, + ST_AUTH, + ST_ASK_VLR, + ST_ACCEPT, + ST_REJECT +}; + +enum gmm_attach_req_fsm_events { + E_ATTACH_REQ_RECV, + E_IDEN_RESP_RECV, + E_AUTH_RESP_RECV, + E_ATTACH_ACCEPTED, + E_ATTACH_ACCEPT_SENT, + E_ATTACH_COMPLETE_RECV, + E_REJECT, + E_VLR_ANSWERED, +}; + +#define GMM_DISCARD_MS_WITHOUT_REJECT -1 + +extern const struct value_string gmm_attach_req_fsm_event_names[]; +extern struct osmo_fsm gmm_attach_req_fsm; + +#endif // GPRS_GMM_ATTACH_H diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c index 688eaed..c942d19 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/gprs/gprs_sgsn.c @@ -47,6 +47,7 @@ #include #include "../../bscconfig.h" +#include "gprs_gmm_attach.h" #if BUILD_IU #include @@ -241,6 +242,7 @@ talloc_free(ctx); return NULL; } + ctx->gmm_att_req_fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "gb_gmm_req"); INIT_LLIST_HEAD(&ctx->pdp_list); llist_add(&ctx->list, &sgsn_mm_ctxts); @@ -273,6 +275,7 @@ talloc_free(ctx); return NULL; } + ctx->gmm_att_req_fsm = osmo_fsm_inst_alloc(&gmm_attach_req_fsm, ctx, ctx, LOGL_DEBUG, "iu_gmm_req"); /* Need to get RAID from IU conn */ ctx->ra = ctx->iu.ue_ctx->ra_id; @@ -350,6 +353,9 @@ gprs_subscr_put(subscr); } + if (mm->gmm_att_req_fsm) + osmo_fsm_inst_free(mm->gmm_att_req_fsm); + sgsn_mm_ctx_free(mm); mm = NULL; diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 8692fc3..5972594 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -45,6 +45,7 @@ $(top_builddir)/src/gprs/gprs_llc.o \ $(top_builddir)/src/gprs/crc24.o \ $(top_builddir)/src/gprs/gprs_sndcp.o \ + $(top_builddir)/src/gprs/gprs_gmm_attach.o \ $(top_builddir)/src/gprs/gprs_gmm.o \ $(top_builddir)/src/gprs/gprs_sgsn.o \ $(top_builddir)/src/gprs/sgsn_vty.o \ -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 19:51:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 19:51:37 +0000 Subject: Change in osmocom-bb[master]: osmocon: Makefile.am: Fix build using different path In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9244 ) Change subject: osmocon: Makefile.am: Fix build using different path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e Gerrit-Change-Number: 9244 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Tue, 22 May 2018 19:51:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 19:51:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 22 May 2018 19:51:39 +0000 Subject: Change in osmocom-bb[master]: osmocon: Makefile.am: Fix build using different path In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9244 ) Change subject: osmocon: Makefile.am: Fix build using different path ...................................................................... osmocon: Makefile.am: Fix build using different path Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e --- M src/host/osmocon/Makefile.am 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/osmocon/Makefile.am b/src/host/osmocon/Makefile.am index 8b0d4bf..de4e575 100644 --- a/src/host/osmocon/Makefile.am +++ b/src/host/osmocon/Makefile.am @@ -13,9 +13,9 @@ sbin_PROGRAMS = osmocon osmoload # FIXME: sercomm needs to move into libosmocore or another shared lib -INCLUDES += -I../../target/firmware/include/comm -I../../target/firmware/apps -DHOST_BUILD -osmocon_SOURCES = osmocon.c tpu_debug.c ../../target/firmware/comm/sercomm.c +INCLUDES += -I$(srcdir)/../../target/firmware/include/comm -I$(srcdir)/../../target/firmware/apps -DHOST_BUILD +osmocon_SOURCES = osmocon.c tpu_debug.c $(srcdir)/../../target/firmware/comm/sercomm.c osmocon_LDADD = $(LIBOSMOCORE_LIBS) -osmoload_SOURCE = osmoload.c ../../target/firmware/comm/sercomm.c +osmoload_SOURCE = osmoload.c $(srcdir)/../../target/firmware/comm/sercomm.c osmoload_LDADD = $(LIBOSMOCORE_LIBS) -- To view, visit https://gerrit.osmocom.org/9244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a322e364612976f3d797f25e57ccc7c2354bd5e Gerrit-Change-Number: 9244 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 22 20:14:43 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 22 May 2018 20:14:43 +0000 Subject: Change in osmo-sgsn[master]: WIP: tests: remove gmm unit tests Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9258 Change subject: WIP: tests: remove gmm unit tests ...................................................................... WIP: tests: remove gmm unit tests The TTCN3 tests should replace all of the GMM unit tests. The GMM unit tests uses send/recieve LLME while TTCN3 is using BSSGP tx/rx to the same. TTCN3 has better tooling and can handle packets more easier. The unittests expect the package in a specific order and do checks the internal state, which is now changing because of the new FSM. TODO: compare TTCN3 <> unit tests and add missing checks. Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 --- M tests/sgsn/sgsn_test.c 1 file changed, 0 insertions(+), 818 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/9258/1 diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 0e5267b..3e86266 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -925,166 +925,6 @@ cleanup_test(); } -/* - * Test the GMM Attach procedure - */ -static void test_gmm_attach(int retry) -{ - struct gprs_ra_id raid = { 0, }; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t ptmsi1; - uint32_t foreign_tlli; - uint32_t local_tlli = 0; - struct gprs_llc_lle *lle; - - /* DTAP - Attach Request */ - /* The P-TMSI is not known by the SGSN */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, 0x05, 0xf4, - 0xfb, 0xc5, 0x46, 0x79, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, - 0x19, 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, 0x60, - 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, 0x80, 0xba, 0xc8, - 0xc6, 0x62, 0x00, 0x60, 0x80, 0x00 - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Identity Response IMSI */ - static const unsigned char ident_resp_imsi[] = { - 0x08, 0x16, 0x08, 0x19, 0x32, 0x54, 0x76, 0x98, 0x10, 0x32, - 0x54 - }; - - /* DTAP - Authentication and Ciphering Resp */ - static const unsigned char auth_ciph_resp[] = { - 0x08, 0x13, 0x00, 0x22, 0x51, 0xe5, 0x51, 0xe5, 0x23, 0x09, - 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x01 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 0 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x01, 0x18, 0x05, 0xf4, 0xeb, 0x8b, - 0x45, 0x67, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - printf("Testing GMM attach%s\n", retry ? " with retry" : ""); - - foreign_tlli = gprs_tmsi2tlli(0xc0000023, TLLI_FOREIGN); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(foreign_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* we expect an identity request (IMSI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMSI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imsi, ARRAY_SIZE(ident_resp_imsi)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - -retry_attach_req: - - if (retry && sgsn_tx_counter == 0) { - fprintf(stderr, "Retrying attach request\n"); - /* re-inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - } - - if (ctx->auth_state == SGSN_AUTH_AUTHENTICATE && sgsn_tx_counter == 1) { - /* we got an auth & ciph request */ - - /* inject the auth & ciph response */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - auth_ciph_resp, ARRAY_SIZE(auth_ciph_resp)); - - /* check that the MM context has not been removed due to a - * failed authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - if (ctx->subscr && ctx->subscr->sgsn_data->msisdn_len > 0) - OSMO_ASSERT(strcmp(ctx->msisdn, "+49166213323") == 0); - } - - if (retry && sgsn_tx_counter == 0) - goto retry_attach_req; - - /* we expect an attach accept/reject */ - OSMO_ASSERT(sgsn_tx_counter == 1); - ptmsi1 = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(ptmsi1 != GSM_RESERVED_TMSI); - - /* this has been randomly assigned by the SGSN */ - local_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - - /* inject the attach complete */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - attach_compl, ARRAY_SIZE(attach_compl)); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - /* inject the detach */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(local_tlli, &raid); - OSMO_ASSERT(!ictx); - - cleanup_test(); -} - -static void test_gmm_attach_acl(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; - sgsn_acl_add("123456789012345", &sgsn->cfg); - printf("Auth policy 'closed': "); - test_gmm_attach(0); - sgsn_acl_del("123456789012345", &sgsn->cfg); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - int my_subscr_request_update_location(struct sgsn_mm_ctx *mmctx) { int rc; @@ -1103,30 +943,6 @@ return 0; } -static void test_gmm_attach_subscr(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - - printf("Auth policy 'remote': "); - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - int my_subscr_request_auth_info_fake_auth(struct sgsn_mm_ctx *mmctx, const uint8_t *auts, const uint8_t *auts_rand) { @@ -1138,32 +954,6 @@ return 0; } -static void test_gmm_attach_subscr_fake_auth(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info_fake_auth; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - - printf("Auth policy 'remote', auth faked: "); - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - int my_subscr_request_auth_info_real_auth(struct sgsn_mm_ctx *mmctx, const uint8_t *auts, const uint8_t *auts_rand) { struct gsm_auth_tuple at = { @@ -1181,33 +971,6 @@ return 0; } -static void test_gmm_attach_subscr_real_auth(void) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_location; - subscr_request_auth_info_cb = my_subscr_request_auth_info_real_auth; - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - - printf("Auth policy 'remote', triplet based auth: "); - - test_gmm_attach(0); - gprs_subscr_put(subscr); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - - cleanup_test(); -} - #define TEST_GSUP_IMSI_LONG_IE 0x01, 0x08, \ 0x21, 0x43, 0x65, 0x87, 0x09, 0x21, 0x43, 0xf5 @@ -1269,39 +1032,6 @@ return rx_gsup_message(update_location_res, sizeof(update_location_res)); }; - -static void test_gmm_attach_subscr_gsup_auth(int retry) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - subscr_request_update_location_cb = my_subscr_request_update_gsup_auth; - subscr_request_auth_info_cb = my_subscr_request_auth_info_gsup_auth; - if (retry) { - upd_loc_skip = 3; - auth_info_skip = 3; - } - - subscr = gprs_subscr_get_or_create("123456789012345"); - subscr->authorized = 1; - sgsn->cfg.require_authentication = 1; - sgsn->cfg.require_update_location = 1; - gprs_subscr_put(subscr); - - printf("Auth policy 'remote', GSUP based auth: "); - test_gmm_attach(retry); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - subscr_request_update_location_cb = __real_gprs_subscr_request_update_location; - subscr_request_auth_info_cb = __real_gprs_subscr_request_auth_info; - upd_loc_skip = 0; - auth_info_skip = 0; - - cleanup_test(); -} - int my_gsup_client_send(struct gsup_client *gsupc, struct msgb *msg) { struct osmo_gsup_message to_peer = {0}; @@ -1353,38 +1083,6 @@ return 0; }; -static void test_gmm_attach_subscr_real_gsup_auth(int retry) -{ - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - struct gprs_subscr *subscr; - - sgsn_inst.cfg.auth_policy = SGSN_AUTH_POLICY_REMOTE; - gsup_client_send_cb = my_gsup_client_send; - - sgsn->gsup_client = talloc_zero(tall_bsc_ctx, struct gsup_client); - - if (retry) { - upd_loc_skip = 3; - auth_info_skip = 3; - } - - printf("Auth policy 'remote', real GSUP based auth: "); - test_gmm_attach(retry); - - subscr = gprs_subscr_get_by_imsi("123456789012345"); - OSMO_ASSERT(subscr == NULL); - assert_no_subscrs(); - - sgsn->cfg.auth_policy = saved_auth_policy; - gsup_client_send_cb = __real_gsup_client_send; - upd_loc_skip = 0; - auth_info_skip = 0; - talloc_free(sgsn->gsup_client); - sgsn->gsup_client = NULL; - - cleanup_test(); -} - /* * Test the GMM Rejects */ @@ -1639,513 +1337,6 @@ cleanup_test(); } -/* - * Test the dynamic allocation of P-TMSIs - */ -static void test_gmm_ptmsi_allocation(void) -{ - struct gprs_ra_id raid = { .mnc=332, .mcc=112, .lac=16464, .rac=96}; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t foreign_tlli; - uint32_t ptmsi1; - uint32_t ptmsi2; - uint32_t received_ptmsi; - uint32_t old_ptmsi; - uint32_t local_tlli = 0; - struct gprs_llc_lle *lle; - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - /* DTAP - Attach Request (IMSI 12131415161718) */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Routing Area Update Request */ - static const unsigned char ra_upd_req[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x60, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Complete */ - static const unsigned char ra_upd_complete[] = { - 0x08, 0x0a - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 1 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x09, 0x18, 0x05, 0xf4, 0xef, 0xe2, - 0xb7, 0x00, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - sgsn->cfg.auth_policy = SGSN_AUTH_POLICY_OPEN; - - printf("Testing P-TMSI allocation\n"); - - printf(" - sgsn_alloc_ptmsi\n"); - - /* reset the PRNG used by sgsn_alloc_ptmsi */ - srand(1); - - ptmsi1 = sgsn_alloc_ptmsi(); - OSMO_ASSERT(ptmsi1 != GSM_RESERVED_TMSI); - - ptmsi2 = sgsn_alloc_ptmsi(); - OSMO_ASSERT(ptmsi2 != GSM_RESERVED_TMSI); - - OSMO_ASSERT(ptmsi1 != ptmsi2); - - ptmsi1 = ptmsi2 = GSM_RESERVED_TMSI; - - printf(" - Repeated Attach Request\n"); - - foreign_tlli = gprs_tmsi2tlli(0xc0000023, TLLI_FOREIGN); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(foreign_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - ptmsi1 = ctx->p_tmsi; - - old_ptmsi = ctx->p_tmsi_old; - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, foreign_tlli, &raid, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(foreign_tlli, &raid)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi1); - - /* we ignore this and send the attach again */ - send_0408_message(lle->llme, foreign_tlli, &raid, - attach_req, ARRAY_SIZE(attach_req)); - - /* the allocated P-TMSI should be the same */ - ctx = sgsn_mm_ctx_by_tlli(foreign_tlli, &raid); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == old_ptmsi); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi1); - - /* inject the attach complete */ - local_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, local_tlli, &raid, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - Repeated RA Update Request\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_req, ARRAY_SIZE(ra_upd_req)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - ptmsi2 = ctx->p_tmsi; - - /* repeat the RA update request */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_req, ARRAY_SIZE(ra_upd_req)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ptmsi2); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi == ptmsi2); - - /* inject the RA update complete */ - local_tlli = gprs_tmsi2tlli(ptmsi2, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, local_tlli, &raid, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi2); - - /* inject the detach */ - send_0408_message(ctx->gb.llme, local_tlli, &raid, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(local_tlli, &raid); - OSMO_ASSERT(!ictx); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - -/* - * Test changing of routing areas - */ -static void test_gmm_routing_areas(void) -{ - struct gprs_ra_id raid1 = { .mnc=332, .mcc=112, .lac=16464, .rac=96}; - struct gprs_ra_id raid2 = { .mnc=332, .mcc=112, .lac=16464, .rac=97}; - struct sgsn_mm_ctx *ctx = NULL; - struct sgsn_mm_ctx *ictx; - uint32_t ptmsi1; - uint32_t received_ptmsi; - uint32_t ms_tlli = 0; - struct gprs_llc_lle *lle; - const enum sgsn_auth_policy saved_auth_policy = sgsn->cfg.auth_policy; - - /* DTAP - Attach Request (IMSI 12131415161718) */ - static const unsigned char attach_req[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x60, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Attach Request (IMSI 12131415161718) (RA 2) */ - static const unsigned char attach_req2[] = { - 0x08, 0x01, 0x02, 0xf5, 0xe0, 0x21, 0x08, 0x02, - 0x08, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x11, 0x22, 0x33, 0x40, 0x50, 0x61, 0x19, - 0x18, 0xb3, 0x43, 0x2b, 0x25, 0x96, 0x62, 0x00, - 0x60, 0x80, 0x9a, 0xc2, 0xc6, 0x62, 0x00, 0x60, - 0x80, 0xba, 0xc8, 0xc6, 0x62, 0x00, 0x60, 0x80, - 0x00, - }; - - /* DTAP - Identity Response IMEI */ - static const unsigned char ident_resp_imei[] = { - 0x08, 0x16, 0x08, 0x9a, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, - 0x56 - }; - - /* DTAP - Attach Complete */ - static const unsigned char attach_compl[] = { - 0x08, 0x03 - }; - - /* DTAP - Routing Area Update Request (coming from RA 1) */ - static const unsigned char ra_upd_req1[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x60, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Request (coming from RA 2) */ - static const unsigned char ra_upd_req2[] = { - 0x08, 0x08, 0x10, 0x11, 0x22, 0x33, 0x40, 0x50, - 0x61, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Request (coming from RA other) */ - /* raid_other = {443, 223, 16464, 98}; */ - static const unsigned char ra_upd_req_other[] = { - 0x08, 0x08, 0x10, 0x22, 0x33, 0x44, 0x40, 0x50, - 0x62, 0x1d, 0x19, 0x13, 0x42, 0x33, 0x57, 0x2b, - 0xf7, 0xc8, 0x48, 0x02, 0x13, 0x48, 0x50, 0xc8, - 0x48, 0x02, 0x14, 0x48, 0x50, 0xc8, 0x48, 0x02, - 0x17, 0x49, 0x10, 0xc8, 0x48, 0x02, 0x00, 0x19, - 0x8b, 0xb2, 0x92, 0x17, 0x16, 0x27, 0x07, 0x04, - 0x31, 0x02, 0xe5, 0xe0, 0x32, 0x02, 0x20, 0x00 - }; - - /* DTAP - Routing Area Update Complete */ - static const unsigned char ra_upd_complete[] = { - 0x08, 0x0a - }; - - /* DTAP - Detach Request (MO) */ - /* normal detach, power_off = 1 */ - static const unsigned char detach_req[] = { - 0x08, 0x05, 0x09, 0x18, 0x05, 0xf4, 0xef, 0xe2, - 0xb7, 0x00, 0x19, 0x03, 0xb9, 0x97, 0xcb - }; - - sgsn->cfg.auth_policy = SGSN_AUTH_POLICY_OPEN; - - printf("Testing routing area changes\n"); - - /* reset the PRNG used by sgsn_alloc_ptmsi */ - srand(1); - - ptmsi1 = GSM_RESERVED_TMSI; - - printf(" - Attach Request (RA 1)\n"); - - ms_tlli = gprs_tmsi2tlli(0x00000023, TLLI_RANDOM); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - lle = gprs_lle_get_or_create(ms_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, ms_tlli, &raid1, - attach_req, ARRAY_SIZE(attach_req)); - - ctx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid1); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - - /* we expect an identity request (IMEI) */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ID_REQ); - OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - /* inject the identity response (IMEI) */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ident_resp_imei, ARRAY_SIZE(ident_resp_imei)); - - /* check that the MM context has not been removed due to a failed - * authorization */ - OSMO_ASSERT(ctx == sgsn_mm_ctx_by_tlli(ms_tlli, &raid1)); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ATTACH_ACK); - OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the attach complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - RA Update Request (RA 1 -> RA 1)\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ra_upd_req1, ARRAY_SIZE(ra_upd_req1)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - // OSMO_ASSERT(last_dl_parse_ctx.tlli == ms_tlli); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the RA update complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid1, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - OSMO_ASSERT(ctx->gb.tlli == ms_tlli); - - printf(" - RA Update Request (RA 1 -> RA 2)\n"); - - /* inject the RA update request */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_FOREIGN); - - /* It is coming from RA 1 => ra_upd_req1 */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req1, ARRAY_SIZE(ra_upd_req1)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - - printf(" - RA Update Request (RA other -> RA 2)\n"); - - /* inject the RA update request */ - ms_tlli = gprs_tmsi2tlli(0x12345678, TLLI_FOREIGN); - - /* It is coming from RA 1 => ra_upd_req1 */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req_other, ARRAY_SIZE(ra_upd_req_other)); - - /* we expect an RA update reject (and a LLC XID RESET) */ - OSMO_ASSERT(sgsn_tx_counter == 2); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_REJ); - /* this has killed the LLE/LLME */ - - printf(" - Attach Request (RA 2)\n"); - - /* Create a LLE/LLME */ - OSMO_ASSERT(count(gprs_llme_list()) == 1); - lle = gprs_lle_get_or_create(ms_tlli, 3); - OSMO_ASSERT(count(gprs_llme_list()) == 1); - - /* inject the attach request */ - send_0408_message(lle->llme, ms_tlli, &raid2, - attach_req2, ARRAY_SIZE(attach_req2)); - - ctx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(ctx != NULL); - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - - /* we expect an attach accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_ATTACH_ACK); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the attach complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - ictx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(ictx != NULL); - OSMO_ASSERT(ictx == ctx); - - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - attach_compl, ARRAY_SIZE(attach_compl)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - - printf(" - RA Update Request (RA 2 -> RA 2)\n"); - - /* inject the RA update request */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_req2, ARRAY_SIZE(ra_upd_req2)); - - /* we expect an RA update accept */ - OSMO_ASSERT(sgsn_tx_counter == 1); - OSMO_ASSERT(last_dl_parse_ctx.g48_hdr->msg_type == GSM48_MT_GMM_RA_UPD_ACK); - - OSMO_ASSERT(ctx->gmm_state == GMM_COMMON_PROC_INIT); - OSMO_ASSERT(ctx->p_tmsi_old == ptmsi1); - OSMO_ASSERT(ctx->p_tmsi != GSM_RESERVED_TMSI); - OSMO_ASSERT(ctx->p_tmsi != ptmsi1); - - received_ptmsi = get_new_ptmsi(&last_dl_parse_ctx); - OSMO_ASSERT(received_ptmsi == ctx->p_tmsi); - ptmsi1 = received_ptmsi; - - /* inject the RA update complete */ - ms_tlli = gprs_tmsi2tlli(ptmsi1, TLLI_LOCAL); - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - ra_upd_complete, ARRAY_SIZE(ra_upd_complete)); - - /* we don't expect a response */ - OSMO_ASSERT(sgsn_tx_counter == 0); - - OSMO_ASSERT(ctx->gmm_state == GMM_REGISTERED_NORMAL); - OSMO_ASSERT(ctx->p_tmsi_old == 0); - OSMO_ASSERT(ctx->p_tmsi == ptmsi1); - OSMO_ASSERT(ctx->gb.tlli == ms_tlli); - - - /* inject the detach */ - send_0408_message(ctx->gb.llme, ms_tlli, &raid2, - detach_req, ARRAY_SIZE(detach_req)); - - /* verify that things are gone */ - OSMO_ASSERT(count(gprs_llme_list()) == 0); - ictx = sgsn_mm_ctx_by_tlli(ms_tlli, &raid2); - OSMO_ASSERT(!ictx); - - sgsn->cfg.auth_policy = saved_auth_policy; - - cleanup_test(); -} - static void test_apn_matching(void) { struct apn_ctx *actx, *actxs[9]; @@ -2462,17 +1653,8 @@ test_gmm_detach_no_mmctx(); test_gmm_detach_accept_unexpected(); test_gmm_status_no_mmctx(); - test_gmm_attach_acl(); - test_gmm_attach_subscr(); - test_gmm_attach_subscr_fake_auth(); - test_gmm_attach_subscr_real_auth(); - test_gmm_attach_subscr_gsup_auth(0); - test_gmm_attach_subscr_gsup_auth(1); - test_gmm_attach_subscr_real_gsup_auth(0); test_gmm_reject(); test_gmm_cancel(); - test_gmm_ptmsi_allocation(); - test_gmm_routing_areas(); test_apn_matching(); test_ggsn_selection(); printf("Done\n"); -- To view, visit https://gerrit.osmocom.org/9258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue May 22 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 22 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#42?= In-Reply-To: <1414275552.121.1526942481151.JavaMail.jenkins@jenkins.osmocom.org> References: <1414275552.121.1526942481151.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <251806008.132.1527028881238.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.29 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20372/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-20372/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-20372/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-20372/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-20372/ libtool: install: (cd /tmp/am-dc-20372/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-20372/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-20372/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-20372/ libtool: install: chmod 644 /tmp/am-dc-20372/ libtool: install: ranlib /tmp/am-dc-20372/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-20372/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-20372/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-20372/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20372/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-20372/ /bin/mkdir -p '/tmp/am-dc-20372/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-20372/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-20372/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-20372/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-20372/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-20372/ libtool: uninstall: rm -f /tmp/am-dc-20372/ /tmp/am-dc-20372/ /tmp/am-dc-20372/ /tmp/am-dc-20372/ /tmp/am-dc-20372/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-20372/ && rm -f html.tar ) ( cd '/tmp/am-dc-20372/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-20372/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Wed May 23 00:44:13 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 May 2018 00:44:13 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 00:44:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 00:44:46 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 23 May 2018 00:44:46 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Patch Set 1: the failing tests are related to the changes. I would recommend removing the unit tests, because ttcn3 is testing the same and is much more maintainable and debug'able. -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 23 May 2018 00:44:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:07:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:07:29 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9243 ) Change subject: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2571268d91e2430a270e51438608e7dbd121e76d Gerrit-Change-Number: 9243 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:07:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:09:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:09:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9245 ) Change subject: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO ...................................................................... Patch Set 1: Code-Review-1 All our template names reflect the direction of the individual message, not the procedure -- To view, visit https://gerrit.osmocom.org/9245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b5e2d43c9754d34b3749bff43b7df7196b9bb9c Gerrit-Change-Number: 9245 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:09:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:09:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:09:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add values for c_GMM_DTT_MT_* In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9246 ) Change subject: L3_Templates: add values for c_GMM_DTT_MT_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4903fa4c915add3062ab6b82a1d39d60426b5681 Gerrit-Change-Number: 9246 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:09:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:13:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:13:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9248 ) Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9248/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/9248/1/sgsn/SGSN_Tests.ttcn at 1257 PS1, Line 1257: : gsup := You can do without the gsup variable here, directly sending the template -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:13:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:17:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:17:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9247 ) Change subject: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9247/1/library/L3_Templates.ttcn File library/L3_Templates.ttcn: https://gerrit.osmocom.org/#/c/9247/1/library/L3_Templates.ttcn at 1886 PS1, Line 1886: template OCT1 cause := omit) := { I would set cause := * for a receive template. This way a noin-specific invocation matches any detach request. Of also set dtt to ?, for the same reason. Using the template without any arguments shoiukd be the widest possible match, not one specific case. -- To view, visit https://gerrit.osmocom.org/9247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 Gerrit-Change-Number: 9247 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:17:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:18:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:18:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9249 ) Change subject: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I21ee02556f0734dad871a6294b21ca6f2864dea0 Gerrit-Change-Number: 9249 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:18:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:19:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:19:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9250 ) Change subject: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9250/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/9250/1/sgsn/SGSN_Tests.ttcn at 1292 PS1, Line 1292: GSUP.send(gsup); No Ned for the gsup local variable, send(ts_...) Works finr -- To view, visit https://gerrit.osmocom.org/9250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 Gerrit-Change-Number: 9250 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:19:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:22:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9251 ) Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9251/1/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/9251/1/sgsn/SGSN_Tests.ttcn at 1270 PS1, Line 1270: } You are missing a clause for other BSSGP messages that could be received. Do you want to fail on them, or ignore them with "repeat"? Right niow they would just queue up and you'you'd not catch as detach request behind/after another message -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 07:22:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:25:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:25:57 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 07:25:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:27:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:27:36 +0000 Subject: Change in osmo-bsc[master]: bsc_api.c: actually log with context In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7996 ) Change subject: bsc_api.c: actually log with context ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-Change-Number: 7996 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Wed, 23 May 2018 07:27:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:27:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:27:40 +0000 Subject: Change in osmo-bsc[master]: bsc_api.c: actually log with context In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7996 ) Change subject: bsc_api.c: actually log with context ...................................................................... bsc_api.c: actually log with context bsc_api.c notoriously lacks log context. Provide gsm_lchan_name() and/or bsc_subscr_name() in roughly a million instances, using new LOGPLCHAN macro. Add LOGPLCHAN() to gsm_data.h, to encourage use of it in other .c files. Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bsc_api.c 2 files changed, 58 insertions(+), 43 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6f854d8..da5e87f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -366,6 +366,14 @@ uint8_t key[MAX_A5_KEY_LEN]; }; +#define LOGPLCHAN(lchan, ss, level, fmt, args...) \ + LOGP(ss, level, "%s (ss=%d,%s) (%s) " fmt, \ + lchan ? gsm_ts_and_pchan_name(lchan->ts) : "-", \ + lchan ? lchan->nr : 0, \ + lchan ? gsm_lchant_name(lchan->type) : "-", \ + bsc_subscr_name(lchan && lchan->conn ? lchan->conn->bsub : NULL), \ + ## args) + struct gsm_lchan { /* The TS that we're part of */ struct gsm_bts_trx_ts *ts; diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 13fe099..71cc0f0 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -117,17 +117,17 @@ new_lchan = lchan_alloc(conn_get_bts(conn), chan_type, 0); if (!new_lchan) { - LOGP(DMSC, LOGL_NOTICE, "No free channel.\n"); + LOGP(DMSC, LOGL_NOTICE, "%s No free channel for %s\n", + bsc_subscr_name(conn->bsub), gsm_lchant_name(chan_type)); return -1; } /* check if we are on TCH/F and requested TCH/H, but got TCH/F */ if (conn->lchan->type == new_lchan->type && chan_type != new_lchan->type) { - LOGP(DHO, LOGL_NOTICE, "%s -> %s Will not re-assign to identical channel type," - " %s was requested\n", - gsm_lchan_name(conn->lchan), gsm_lchan_name(new_lchan), - gsm_lchant_name(chan_type)); + LOGPLCHAN(conn->lchan, DHO, LOGL_NOTICE, + "-> %s Will not re-assign to identical channel type, %s was requested\n", + gsm_lchan_name(new_lchan), gsm_lchant_name(chan_type)); lchan_free(new_lchan); return -1; } @@ -148,7 +148,7 @@ handle_mr_config(conn, new_lchan, full_rate); if (rsl_chan_activate_lchan(new_lchan, 0x1, 0) < 0) { - LOGP(DHO, LOGL_ERROR, "could not activate channel\n"); + LOGPLCHAN(new_lchan, DHO, LOGL_ERROR, "could not activate channel\n"); lchan_free(new_lchan); return -1; } @@ -217,7 +217,8 @@ if (!conn->lchan) { LOGP(DMSC, LOGL_ERROR, - "Called submit dtap without an lchan.\n"); + "%s Called submit dtap without an lchan.\n", + bsc_subscr_name(conn->bsub)); msgb_free(msg); return -1; } @@ -320,11 +321,9 @@ if (chan_mode == GSM48_CMODE_SPEECH_AMR) handle_mr_config(conn, conn->lchan, full_rate); - LOGP(DMSC, LOGL_NOTICE, - "Sending %s ChanModify for speech: %s on channel %s\n", - gsm_lchan_name(conn->lchan), - get_value_string(gsm48_chan_mode_names, chan_mode), - get_value_string(gsm_chan_t_names, conn->lchan->type)); + LOGPLCHAN(conn->lchan, DMSC, LOGL_NOTICE, + "Sending ChanModify for speech: %s\n", + get_value_string(gsm48_chan_mode_names, chan_mode)); gsm48_lchan_modify(conn->lchan, chan_mode); } @@ -352,8 +351,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "ASSIGNMENT COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", + rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -367,14 +366,15 @@ } if (conn->secondary_lchan != msg->lchan) { - LOGP(DMSC, LOGL_ERROR, "Assignment Compl should occur on second lchan.\n"); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, + "Assignment Compl should occur on second lchan.\n"); return; } gh = msgb_l3(msg); if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGP(DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", + msgb_l3len(msg) - sizeof(*gh)); return; } @@ -405,8 +405,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "ASSIGNMENT FAILED cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT FAILED cause = %s\n", + rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -420,7 +420,8 @@ } if (conn->lchan != msg->lchan) { - LOGP(DMSC, LOGL_ERROR, "Assignment failure should occur on primary lchan.\n"); + LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, + "Assignment failure should occur on primary lchan.\n"); return; } @@ -436,8 +437,8 @@ gh = msgb_l3(msg); if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGP(DMSC, LOGL_ERROR, "assignment failure unhandled: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(conn->lchan, DMSC, LOGL_ERROR, "assignment failure unhandled: %zu\n", + msgb_l3len(msg) - sizeof(*gh)); rr_failure = NULL; } else { rr_failure = &gh->data[0]; @@ -457,7 +458,7 @@ uint8_t cm2_len, cm3_len = 0; uint8_t *cm2, *cm3 = NULL; - DEBUGP(DRR, "CLASSMARK CHANGE "); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "CLASSMARK CHANGE "); /* classmark 2 */ cm2_len = gh->data[0]; @@ -492,8 +493,8 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "HANDOVER COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "HANDOVER COMPLETE cause = %s\n", rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -510,8 +511,12 @@ struct lchan_signal_data sig; struct gsm48_hdr *gh = msgb_l3(msg); - DEBUGP(DRR, "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); - DEBUGP(DHO, "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); + /* Log on both RR and HO categories: it is an RR message, but is still quite important when + * filtering on HO. */ + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DHO, LOGL_DEBUG, + "HANDOVER FAILED cause = %s\n", rr_cause_name(gh->data[0])); sig.lchan = msg->lchan; sig.mr = NULL; @@ -533,7 +538,8 @@ int rc; if (msgb_l3len(msg) < sizeof(*gh)) { - LOGP(DMSC, LOGL_ERROR, "Message too short for a GSM48 header.\n"); + LOGP(DMSC, LOGL_ERROR, "(%s) Message too short for a GSM48 header.\n", + bsc_subscr_name(conn->bsub)); return; } @@ -551,19 +557,20 @@ case GSM48_PDISC_RR: switch (msg_type) { case GSM48_MT_RR_GPRS_SUSP_REQ: - DEBUGP(DRR, "%s\n", - gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ)); + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, + "%s\n", gsm48_rr_msg_name(GSM48_MT_RR_GPRS_SUSP_REQ)); break; case GSM48_MT_RR_STATUS: - LOGP(DRR, LOGL_NOTICE, "%s (cause: %s)\n", - gsm48_rr_msg_name(GSM48_MT_RR_STATUS), - rr_cause_name(gh->data[0])); + LOGPLCHAN(msg->lchan, DRR, LOGL_NOTICE, + "%s (cause: %s)\n", gsm48_rr_msg_name(GSM48_MT_RR_STATUS), + rr_cause_name(gh->data[0])); break; case GSM48_MT_RR_MEAS_REP: /* This shouldn't actually end up here, as RSL treats * L3 Info of 08.58 MEASUREMENT REPORT different by calling * directly into gsm48_parse_meas_rep */ - LOGP(DMEAS, LOGL_ERROR, "DIRECT GSM48 MEASUREMENT REPORT ?!? "); + LOGPLCHAN(msg->lchan, DMEAS, LOGL_ERROR, + "DIRECT GSM48 MEASUREMENT REPORT ?!?\n"); gsm48_tx_rr_status(conn, GSM48_RR_CAUSE_MSG_TYPE_N_COMPAT); break; case GSM48_MT_RR_HANDO_COMPL: @@ -605,9 +612,8 @@ break; default: /* Drop unknown RR message */ - LOGP(DRR, LOGL_NOTICE, - "%s Dropping %s 04.08 RR message\n", - gsm_lchan_name(conn->lchan), gsm48_rr_msg_name(msg_type)); + LOGPLCHAN(msg->lchan, DRR, LOGL_NOTICE, + "Dropping %s 04.08 RR message\n", gsm48_rr_msg_name(msg_type)); gsm48_tx_rr_status(conn, GSM48_RR_CAUSE_MSG_TYPE_N); break; } @@ -628,8 +634,7 @@ lchan = msg->lchan; if (lchan->state != LCHAN_S_ACTIVE) { - LOGP(DRSL, LOGL_INFO, "Got data in non active state(%s), " - "discarding.\n", gsm_lchans_name(lchan->state)); + LOGPLCHAN(msg->lchan, DRSL, LOGL_INFO, "Got data in non active state, discarding.\n"); return -1; } @@ -664,12 +669,14 @@ const uint8_t *key, int len, int include_imeisv) { if (cipher > 0 && key == NULL) { - LOGP(DRSL, LOGL_ERROR, "Need to have an encryption key.\n"); + LOGP(DRSL, LOGL_ERROR, "%s: Need to have an encryption key.\n", + bsc_subscr_name(conn->bsub)); return -1; } if (len > MAX_A5_KEY_LEN) { - LOGP(DRSL, LOGL_ERROR, "The key is too long: %d\n", len); + LOGP(DRSL, LOGL_ERROR, "%s: The key is too long: %d\n", + bsc_subscr_name(conn->bsub), len); return -1; } @@ -811,7 +818,7 @@ if (conn->secondary_lchan != lchan) return; - LOGP(DMSC, LOGL_NOTICE, "Sending assignment on chan: %p\n", lchan); + LOGPLCHAN(lchan, DMSC, LOGL_NOTICE, "Sending RR Assignment\n"); gsm48_send_rr_ass_cmd(conn->lchan, lchan, lchan->ms_power); } @@ -821,7 +828,7 @@ if (conn->secondary_lchan != lchan) return; - LOGP(DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n"); + LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n"); conn->secondary_lchan->conn = NULL; conn->secondary_lchan = NULL; } -- To view, visit https://gerrit.osmocom.org/7996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If469defcc6fe8950dac5df61db3f39d297893318 Gerrit-Change-Number: 7996 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:30:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:30:31 +0000 Subject: Change in osmo-bsc[master]: abis-rsl: Send imm.ass messages via PCH In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/6203 ) Change subject: abis-rsl: Send imm.ass messages via PCH ...................................................................... Patch Set 3: I think we should have a test case in ttcn3 and then we can sa felt merge it. Otherwise its better to keep this (kind of) change in a branch until we actively work on (and use) bsc colocated pcu again. -- To view, visit https://gerrit.osmocom.org/6203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0a899d9c866ed09dc301694dbbcad304b1ed49e5 Gerrit-Change-Number: 6203 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 23 May 2018 07:30:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 07:35:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 07:35:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8020 ) Change subject: make PCU tests send PS paging requests on BVCI zero ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Almost done, thanks https://gerrit.osmocom.org/#/c/8020/2/library/BSSGP_Emulation.ttcn File library/BSSGP_Emulation.ttcn: https://gerrit.osmocom.org/#/c/8020/2/library/BSSGP_Emulation.ttcn at 539 PS2, Line 539: [] BSSGP_SP_SIG.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { Just use BSSGP_PDU:? Here like in the case below. The port (BSSGP_SP. vs BSSGP_SP_SIG.) I used to distinguish. This way a test case can also send messages on invalid BVCI, to test erroneous behavior -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-Change-Number: 8020 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 07:35:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 09:38:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 09:38:40 +0000 Subject: Change in osmo-gsm-tester[master]: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9243 ) Change subject: contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS ...................................................................... contrib: build-osmocom-bb: Download and install osmocom-bb fw from OBS As it's quite complex to build osmocom firmware nowadays (a specific old release of gcc and binutils are required to build it), instead download the already built binaries from OBS. Change-Id: I2571268d91e2430a270e51438608e7dbd121e76d --- M contrib/jenkins-build-osmocom-bb.sh 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/contrib/jenkins-build-osmocom-bb.sh b/contrib/jenkins-build-osmocom-bb.sh index f54518a..d5eec1e 100755 --- a/contrib/jenkins-build-osmocom-bb.sh +++ b/contrib/jenkins-build-osmocom-bb.sh @@ -5,6 +5,8 @@ name="osmocom-bb" . "$(dirname "$0")/jenkins-build-common.sh" +FW_RPM_URL="http://download.opensuse.org/repositories/home:/mnhauke:/osmocom:/nightly/SLE_15/x86_64/" + build_repo libosmocore --disable-doxygen have_repo osmocom-bb @@ -20,5 +22,12 @@ set +x; echo; echo; set -x make install +mkdir -p "$prefix" +cd "$prefix" +FW_RPM="$(wget -q -O - "$FW_RPM_URL" | grep -o 'osmocom-bb-firmware.*rpm' | sed 's#\"#\n#g' | head -1)" +echo "Downloading RPM package $FW_RPM" +wget -q "$FW_RPM_URL/$FW_RPM" -O osmocom-bb-firmware.rpm +rpm2cpio osmocom-bb-firmware.rpm | cpio -idmv +rm osmocom-bb-firmware.rpm create_bin_tgz "" "osmocon" -- To view, visit https://gerrit.osmocom.org/9243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2571268d91e2430a270e51438608e7dbd121e76d Gerrit-Change-Number: 9243 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 11:28:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 11:28:27 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9252/1/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/#/c/9252/1/src/e1_input.c at 429 PS1, Line 429: /* Remove our counter group from the global counter list I have the feeling this code is wrong. 1- What about the first e1inp_line object? The first object is not created through e1inp_line_clone right? so those unlink() I'm not sure if they apply correctly in that case. Probably it's fine since then we will go through the "only 1 parent" case and don't call talloc_unlink. 2- line->driver_data is missing talloc_unlink() if it exists. 3- "if (talloc_reference_count(line->rate_ctr) == 0)" is wrong, we should compare against "1", because we didn't decrease the ref yet. -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 23 May 2018 11:28:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 May 2018 12:10:05 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_dyn_ts.c: make local functions static In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9228 ) Change subject: cosmetic: bsc_dyn_ts.c: make local functions static ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 Gerrit-Change-Number: 9228 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 12:10:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:10:29 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 May 2018 12:10:29 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.h: drop unused rsl_chan_activate() declaration In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9227 ) Change subject: abis_rsl.h: drop unused rsl_chan_activate() declaration ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c Gerrit-Change-Number: 9227 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 12:10:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:11:55 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 23 May 2018 12:11:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9229 ) Change subject: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 Gerrit-Change-Number: 9229 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 12:11:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:55:19 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 May 2018 12:55:19 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 6: (4 comments) let me apply the cosmetics and merge... https://gerrit.osmocom.org/#/c/9211/6/include/osmocom/msc/vlr.h File include/osmocom/msc/vlr.h: https://gerrit.osmocom.org/#/c/9211/6/include/osmocom/msc/vlr.h at 23 PS6, Line 23: #define VLR_SUBSCRIBER_NO_EXPIRATION 0x0 (hex doesn't really apply) https://gerrit.osmocom.org/#/c/9211/6/src/libvlr/vlr.c File src/libvlr/vlr.c: https://gerrit.osmocom.org/#/c/9211/6/src/libvlr/vlr.c at 478 PS6, Line 478: vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; I still don't like to introduce a backdoor that allows subscribers to never expire by fudging about with the server's clock. But yeah, if no-one else shares that view... I don't expect it to apply in reality, but if it ever does, I'll say "I told you so" ;) https://gerrit.osmocom.org/#/c/9211/6/src/libvlr/vlr_lu_fsm.c File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/#/c/9211/6/src/libvlr/vlr_lu_fsm.c at 359 PS6, Line 359: /* Balanced by vlr_subscr_rx_imsi_detach() or Location Update expiry */ still prefer "by vlr_subscr_expire()", which is accurate for both cases and pinpoints the actual place in the code. https://gerrit.osmocom.org/#/c/9211/6/tests/msc_vlr/msc_vlr_test_no_authen.c File tests/msc_vlr/msc_vlr_test_no_authen.c: https://gerrit.osmocom.org/#/c/9211/6/tests/msc_vlr/msc_vlr_test_no_authen.c at 952 PS6, Line 952: btw("having received subscriber data does not mean acceptance"); (these few lines are actually not related to the timeout and could be dropped, knowing that they are already checked in the other test) -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 6 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 12:55:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:55:39 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 May 2018 12:55:39 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Neels Hofmeyr has uploaded a new patch set (#7) to the change originally created by Stefan Sperling. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. This functionality existed in OpenBSC but was lost during the nitb split. This code took some inspiration from the OpenBSC implementation. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 264 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/11/9211/7 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 12:55:59 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 23 May 2018 12:55:59 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 12:55:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:17:32 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 23 May 2018 13:17:32 +0000 Subject: Change in osmo-msc[master]: implement periodic Location Update expiry in the VLR In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9211 ) Change subject: implement periodic Location Update expiry in the VLR ...................................................................... implement periodic Location Update expiry in the VLR Remove subscribers which fail to send periodic Location Updates from the list of subscribers known to the VLR. This complements the IMSI detach procedure: periodic LU expiry triggers an implicit IMSI detach. Expired subscribers are purged from a periodic timer which iterates over all subscribers once per minute. Subscribers with an active connection do not expire. This is controlled by the subscriber conn FSM which sets a subscriber's the LU expiry timeout value to GSM_SUBSCRIBER_NO_EXPIRATION while a connection is active. Add support for fake time with osmo_clock_gettime() to msc_vlr tests. This functionality existed in OpenBSC but was lost during the nitb split. This code took some inspiration from the OpenBSC implementation. Related: OS#1976 Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 --- M include/osmocom/msc/gsm_subscriber.h M include/osmocom/msc/vlr.h M src/libmsc/subscr_conn.c M src/libvlr/vlr.c M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_no_authen.c M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 9 files changed, 264 insertions(+), 3 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/gsm_subscriber.h b/include/osmocom/msc/gsm_subscriber.h index 16e1037..01d9c58 100644 --- a/include/osmocom/msc/gsm_subscriber.h +++ b/include/osmocom/msc/gsm_subscriber.h @@ -17,8 +17,6 @@ #define GSM_SUBSCRIBER_FIRST_CONTACT 0x00000001 /* gprs_sgsn.h defines additional flags including and above bit 16 (0x10000) */ -#define GSM_SUBSCRIBER_NO_EXPIRATION 0x0 - enum gsm_subscriber_field { GSM_SUBSCRIBER_IMSI, GSM_SUBSCRIBER_TMSI, diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 0a9ef6f..f12d758 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -20,6 +20,9 @@ struct log_target; +#define VLR_SUBSCRIBER_NO_EXPIRATION 0 +#define VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL 60 /* in seconds */ + /* from 3s to 10s */ #define GSM_29002_TIMER_S 10 /* from 15s to 30s */ @@ -148,6 +151,7 @@ struct osmo_fsm_inst *proc_arq_fsm; bool lu_complete; + time_t expire_lu; void *msc_conn_ref; @@ -237,6 +241,7 @@ struct llist_head operations; struct gsup_client *gsup_client; struct vlr_ops ops; + struct osmo_timer_list lu_expire_timer; struct { bool retrieve_imeisv_early; bool retrieve_imeisv_ciphered; @@ -379,6 +384,7 @@ enum osmo_fsm_term_cause fsm_cause, uint8_t gsm48_cause); +void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub); /* Process Acccess Request FSM */ diff --git a/src/libmsc/subscr_conn.c b/src/libmsc/subscr_conn.c index 1b3b240..c1d0e11 100644 --- a/src/libmsc/subscr_conn.c +++ b/src/libmsc/subscr_conn.c @@ -202,6 +202,15 @@ static void subscr_conn_fsm_accepted_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { + struct gsm_subscriber_connection *conn = fi->priv; + + /* Stop Location Update expiry for this subscriber. While the subscriber + * has an open connection the LU expiry timer must remain disabled. + * Otherwise we would kick the subscriber off the network when the timer + * expires e.g. during a long phone call. + * The LU expiry timer will restart once the connection is closed. */ + conn->vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; + if (!subscr_conn_fsm_has_active_transactions(fi)) osmo_fsm_inst_dispatch(fi, SUBSCR_CONN_E_UNUSED, NULL); } @@ -278,6 +287,12 @@ /* Cancel all VLR FSMs, if any */ vlr_subscr_cancel_attach_fsm(conn->vsub, OSMO_FSM_TERM_ERROR, GSM48_REJECT_CONGESTION); + if (conn->vsub) { + /* The subscriber has no active connection anymore. + * Restart the periodic Location Update expiry timer for this subscriber. */ + vlr_subscr_enable_expire_lu(conn->vsub); + } + /* If we're closing in a middle of a trans, we need to clean up */ trans_conn_closed(conn); diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index 2d232be..29098b1 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -460,6 +461,50 @@ return 0; } +void vlr_subscr_enable_expire_lu(struct vlr_subscr *vsub) +{ + struct gsm_network *net = vsub->vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */ + struct timespec now; + + /* The T3212 timeout value field is coded as the binary representation of the timeout + * value for periodic updating in decihours. Mark the subscriber as inactive if it missed + * two consecutive location updates. Timeout is twice the t3212 value plus one minute. */ + if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) == 0) { + vsub->expire_lu = now.tv_sec + (net->t3212 * 60 * 6 * 2) + 60; + } else { + LOGP(DVLR, LOGL_ERROR, + "%s: Could not enable Location Update expiry: unable to read current time\n", vlr_subscr_name(vsub)); + /* Disable LU expiry for this subscriber. This subscriber will only be freed after an explicit IMSI detach. */ + vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; + } +} + +void vlr_subscr_expire_lu(void *data) +{ + struct vlr_instance *vlr = data; + struct vlr_subscr *vsub, *vsub_tmp; + struct timespec now; + + if (llist_empty(&vlr->subscribers)) + goto done; + + if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) != 0) { + LOGP(DVLR, LOGL_ERROR, "Skipping Location Update expiry: Could not read current time\n"); + goto done; + } + + llist_for_each_entry_safe(vsub, vsub_tmp, &vlr->subscribers, list) { + if (vsub->expire_lu == VLR_SUBSCRIBER_NO_EXPIRATION || vsub->expire_lu > now.tv_sec) + continue; + + LOGP(DVLR, LOGL_DEBUG, "%s: Location Update expired\n", vlr_subscr_name(vsub)); + vlr_subscr_rx_imsi_detach(vsub); + } + +done: + osmo_timer_schedule(&vlr->lu_expire_timer, VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); +} + /*********************************************************************** * PDP context data ***********************************************************************/ @@ -1093,12 +1138,14 @@ return false; } +/* See TS 23.012 version 9.10.0 4.3.2.1 "Process Detach_IMSI_VLR" */ int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub) { /* paranoia: should any LU or PARQ FSMs still be running, stop them. */ vlr_subscr_cancel_attach_fsm(vsub, OSMO_FSM_TERM_ERROR, GSM48_REJECT_CONGESTION); vsub->imsi_detached_flag = true; + vsub->expire_lu = VLR_SUBSCRIBER_NO_EXPIRATION; /* balancing the get from vlr_lu_compl_fsm_success() */ vlr_subscr_expire(vsub); @@ -1165,6 +1212,8 @@ return -ENOMEM; vlr->gsup_client->data = vlr; + osmo_timer_setup(&vlr->lu_expire_timer, vlr_subscr_expire_lu, vlr); + osmo_timer_schedule(&vlr->lu_expire_timer, VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); return 0; } diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 3073bd6..bf23551 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -356,7 +356,7 @@ struct vlr_subscr *vsub = lcvp->vsub; if (!vsub->lu_complete) { vsub->lu_complete = true; - /* Balanced by vlr_subscr_rx_imsi_detach() */ + /* Balanced by vlr_subscr_expire() */ vlr_subscr_get(vsub); } _vlr_lu_compl_fsm_done(fi, VLR_FSM_RESULT_SUCCESS, 0); diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c index cd61fa1..85c01d9 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.c +++ b/tests/msc_vlr/msc_vlr_test_no_authen.c @@ -917,6 +917,64 @@ comment_end(); } +static void test_no_authen_subscr_expire() +{ + struct vlr_subscr *vsub; + const char *imsi = "901700000004620"; + + /* No auth only works on GERAN */ + rx_from_ran = RAN_GERAN_A; + + comment_start(); + + fake_time_start(); + + /* The test framework has already started the VLR before fake time was active. + * Manually schedule this timeout in fake time. */ + osmo_timer_del(&net->vlr->lu_expire_timer); + osmo_timer_schedule(&net->vlr->lu_expire_timer, VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL, 0); + + /* Let the LU expiration timer tick once */ + fake_time_passes(VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL + 1, 0); + + btw("Location Update request causes a GSUP LU request to HLR"); + lu_result_sent = RES_NONE; + gsup_expect_tx("04010809710000004026f0"); + ms_sends_msg("050802008168000130089910070000006402"); + OSMO_ASSERT(gsup_tx_confirmed); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT"); + gsup_rx("10010809710000004026f00804036470f1", + "12010809710000004026f0"); + VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); + + btw("HLR also sends GSUP _UPDATE_LOCATION_RESULT"); + expect_bssap_clear(); + gsup_rx("06010809710000004026f0", NULL); + + btw("LU was successful, and the conn has already been closed"); + VERBOSE_ASSERT(lu_result_sent, == RES_ACCEPT, "%d"); + VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); + + bss_sends_clear_complete(); + EXPECT_CONN_COUNT(0); + + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub); + vlr_subscr_put(vsub); + + /* Let T3212 (periodic Location update timer) expire */ + fake_time_passes((net->t3212 * 60 * 6 * 2) + 60*4, 0); + + /* The subscriber should now be gone. */ + vsub = vlr_subscr_find_by_imsi(net->vlr, imsi); + OSMO_ASSERT(vsub == NULL); + + EXPECT_CONN_COUNT(0); + clear_vlr(); + comment_end(); +} msc_vlr_test_func_t msc_vlr_tests[] = { test_no_authen, @@ -927,5 +985,6 @@ test_no_authen_imeisv_imei, test_no_authen_imeisv_tmsi, test_no_authen_imeisv_tmsi_imei, + test_no_authen_subscr_expire, NULL }; diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index 2890e96..8d9d497 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -2270,6 +2270,132 @@ full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 +===== test_no_authen_subscr_expire +- Total time passed: 0.000000 s +- Total time passed: 61.000000 s +- Location Update request causes a GSUP LU request to HLR + MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST + new conn +DMM Subscr_Conn{SUBSCR_CONN_S_NEW}: Allocated +DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3) +DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Updated ID +DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH +DMM LU/new-LAC: 1/23 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA +DREF VLR subscr unknown usage increases to: 1 +DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 +DVLR New subscr, IMSI: 901700000004620 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DREF VLR subscr IMSI:901700000004620 usage decreases to: 1 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_auth() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_ciph() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node_4() +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_HLR_UPD +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START +DVLR GSUP tx: 04010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0 +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_COMPLETE_LAYER_3 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_AUTH_CIPH +DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event SUBSCR_CONN_E_UNUSED + lu_result_sent == 0 +- HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804036470f1 +DVLR GSUP rx 17: 10010809710000004026f00804036470f1 +DREF VLR subscr IMSI:901700000004620 usage increases to: 2 +DVLR IMSI:901700000004620 has MSISDN:46071 +DVLR SUBSCR(MSISDN:46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2) +DVLR GSUP tx: 12010809710000004026f0 +GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +<-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0 + lu_result_sent == 0 +- HLR also sends GSUP _UPDATE_LOCATION_RESULT +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: 06010809710000004026f0 +DVLR GSUP rx 11: 06010809710000004026f0 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_HLR_LU_RES +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Received Event UPD_HLR_VLR_E_UPD_LOC_ACK +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: state_chg to UPD_HLR_VLR_S_DONE +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Freeing instance +DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_UPD_HLR_COMPL +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_WAIT_LU_COMPL +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Allocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: Received Event LU_COMPL_VLR_E_START +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Allocated +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: is child of lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: Received Event SUB_PRES_VLR_E_START +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_INIT}: state_chg to SUB_PRES_VLR_S_DONE +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Removing from parent lu_compl_vlr_fsm(LU:901700000004620) +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Freeing instance +DVLR sub_pres_vlr_fsm(LU:901700000004620){SUB_PRES_VLR_S_DONE}: Deallocated +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL +- sending LU Accept for MSISDN:46071 +DREF VLR subscr MSISDN:46071 usage increases to: 3 +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Removing from parent vlr_lu_fsm(LU:901700000004620) +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Freeing instance +DVLR lu_compl_vlr_fsm(LU:901700000004620){LU_COMPL_VLR_S_DONE}: Deallocated +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_LU_COMPL}: state_chg to VLR_ULA_S_DONE +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: Received Event SUBSCR_CONN_E_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_AUTH_CIPH}: state_chg to SUBSCR_CONN_S_ACCEPTED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_ACCEPTED}: state_chg to SUBSCR_CONN_S_RELEASING +DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release) +DREF VLR subscr MSISDN:46071 usage increases to: 4 +DREF VLR subscr MSISDN:46071 usage decreases to: 3 +- BSSAP Clear --RAN_GERAN_A--> MS +DREF VLR subscr MSISDN:46071 usage decreases to: 2 +<-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 +- LU was successful, and the conn has already been closed + lu_result_sent == 1 + bssap_clear_sent == 1 +- BSS sends BSSMAP Clear Complete +DREF MSISDN:46071: MSC conn use - release == 0 (0x0: ) +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: Received Event SUBSCR_CONN_E_UNUSED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASING}: state_chg to SUBSCR_CONN_S_RELEASED +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent Subscr_Conn(LU:901700000004620) +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance +DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated +DRLL MSISDN:46071: Freeing subscriber connection +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Freeing instance +DMM Subscr_Conn(LU:901700000004620){SUBSCR_CONN_S_RELEASED}: Deallocated + llist_count(&net->subscr_conns) == 0 +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +- Total time passed: 3901.000000 s +DVLR MSISDN:46071: Location Update expired +DREF VLR subscr MSISDN:46071 usage increases to: 2 +DREF VLR subscr MSISDN:46071 usage decreases to: 1 +DREF VLR subscr MSISDN:46071 usage decreases to: 0 +DREF freeing VLR subscr MSISDN:46071 + llist_count(&net->subscr_conns) == 0 +===== test_no_authen_subscr_expire: SUCCESS + +full talloc report on 'msgb' (total 0 bytes in 1 blocks) +talloc_total_blocks(tall_bsc_ctx) == 12 + full talloc report on 'msgb' (total 0 bytes in 1 blocks) talloc_total_blocks(tall_bsc_ctx) == 12 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 5c01896..8910e32 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -813,8 +813,15 @@ void fake_time_start() { + struct timespec *clock_override; + osmo_gettimeofday_override_time = fake_time_start_time; osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); fake_time_passes(0, 0); } diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index a29e870..a62cffa 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -218,6 +218,7 @@ { \ struct timeval diff; \ osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ btw("Total time passed: %d.%06d s", \ (int)diff.tv_sec, (int)diff.tv_usec); \ -- To view, visit https://gerrit.osmocom.org/9211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iebdee8b12d22acfcfb265ee41e71cfc8d9eb3ba9 Gerrit-Change-Number: 9211 Gerrit-PatchSet: 7 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:37:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 May 2018 13:37:01 +0000 Subject: Change in osmo-mgw[master]: protocol: Try whole port range on port allocation Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9259 Change subject: protocol: Try whole port range on port allocation ...................................................................... protocol: Try whole port range on port allocation The function allocate_port tryes at least 200 different ports when a new port is allocated. Since after every allocation the port number is incremented the allocation should be able to allocate a port with the first attempt. However, the number 200 is an arbitrary number and it will not cover the whole port range in most cases. - Make sure that in the worst case at each port in the range is tryed once, not only the next 200 Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/9259/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ea86672..77196b9 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -356,13 +356,15 @@ /* Try to find a free port by attempting to bind on it. Also handle the * counter that points on the next free port. Since we have a pointer - * to the next free port, binding should work on the first attempt, - * nevertheless, try at least the next 200 ports before giving up */ + * to the next free port, binding should in work on the first attempt in + * general. In case of failure the next port is tryed until the whole port + * range is tryed once. */ static int allocate_port(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn) { int i; struct mgcp_rtp_end *end; struct mgcp_port_range *range; + unsigned int trys; OSMO_ASSERT(conn); end = &conn->end; @@ -371,7 +373,8 @@ range = &endp->cfg->net_ports; /* attempt to find a port */ - for (i = 0; i < 200; ++i) { + trys = range->range_end - range->range_start; + for (i = 0; i < trys; ++i) { int rc; if (range->last_port >= range->range_end) @@ -387,8 +390,8 @@ } LOGP(DLMGCP, LOGL_ERROR, - "Allocating a RTP/RTCP port failed 200 times 0x%x.\n", - ENDPOINT_NUMBER(endp)); + "Allocating a RTP/RTCP port failed %u times 0x%x.\n", + trys, ENDPOINT_NUMBER(endp)); return -1; } -- To view, visit https://gerrit.osmocom.org/9259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Gerrit-Change-Number: 9259 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:37:29 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 May 2018 13:37:29 +0000 Subject: Change in osmo-mgw[master]: vty: clean up rtp port-range command Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9260 Change subject: vty: clean up rtp port-range command ...................................................................... vty: clean up rtp port-range command The VTY command that sets the RTP port range does not check if the data entered by the user actually makes sens. Also it allwos to configur a range that starts at 0. - Make sure 0 can not be used as start or end of the range - make sure the end port number is always greater then the begin port number - Autocorrect uneaven port range beginnings to one port number before to ensure the range starts at an even port number - Autocorrect even port range ends to the next odd port number to ensure the range ends at an odd port number. Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 29 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/60/9260/1 diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 392a176..ee2d1bc 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -282,13 +282,6 @@ return CMD_WARNING; } -static void parse_range(struct mgcp_port_range *range, const char **argv) -{ - range->range_start = atoi(argv[0]); - range->range_end = atoi(argv[1]); - range->last_port = g_cfg->net_ports.range_start; -} - #define RTP_STR "RTP configuration\n" #define UDP_PORT_STR "UDP Port number\n" #define NET_START_STR "First UDP port allocated\n" @@ -297,11 +290,38 @@ DEFUN(cfg_mgcp_rtp_port_range, cfg_mgcp_rtp_port_range_cmd, - "rtp port-range <0-65534> <0-65534>", + "rtp port-range <1-65534> <1-65534>", RTP_STR "Range of ports to use for the NET side\n" RANGE_START_STR RANGE_END_STR) { - parse_range(&g_cfg->net_ports, argv); + int start; + int end; + + start = atoi(argv[0]); + end = atoi(argv[1]); + + if (end < start) { + vty_out(vty, "range end port (%i) must be greater than the range start port (%i)!%s", + end, start, VTY_NEWLINE); + return CMD_WARNING; + } + + if (start & 1) { + vty_out(vty, "range must begin at an even port number, autocorrecting port (%i) to: %i%s", + start, start & 0xFFFE, VTY_NEWLINE); + start &= 0xFFFE; + } + + if ((end & 1) == 0) { + vty_out(vty, "range must end at an odd port number, autocorrecting port (%i) to: %i%s", + end, end | 1, VTY_NEWLINE); + end |= 1; + } + + g_cfg->net_ports.range_start = start; + g_cfg->net_ports.range_end = end; + g_cfg->net_ports.last_port = g_cfg->net_ports.range_start; + return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_port_range, -- To view, visit https://gerrit.osmocom.org/9260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Gerrit-Change-Number: 9260 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:42:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 May 2018 13:42:26 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign corret port numbers Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9261 Change subject: rtp: make port range configurable, assign corret port numbers ...................................................................... rtp: make port range configurable, assign corret port numbers The current implementation does not allow the user to specify a port range in which the BTS is allowed to allocate a local RTP port. Also the ports the BTS picks do not match the policy described in RFC3550. An RTP Port must be at an even port number and the matching RTCP port must be at the following (odd) port number. The BTS currently picks random port numbers for both. - Add a VTY command to specify a port range in which the BTS may assign local ports. - Pick ports as described in RFC3550. Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Related: OS#2825 OS#2635 --- M include/osmo-bts/gsm_data_shared.h M src/common/bts.c M src/common/rsl.c M src/common/vty.c 4 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/9261/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 81cac3e..058d8e9 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -688,6 +688,11 @@ struct llist_head oml_queue; unsigned int rtp_jitter_buf_ms; bool rtp_jitter_adaptive; + + uint32_t rtp_port_range_start; + uint32_t rtp_port_range_end; + uint32_t rtp_port_range_next; + struct { uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ } support; diff --git a/src/common/bts.c b/src/common/bts.c index 74630cc..0c0ada5 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -135,6 +135,9 @@ bts->paging_state = paging_init(bts, 200, 0); bts->ul_power_target = -75; /* dBm default */ bts->rtp_jitter_adaptive = false; + bts->rtp_port_range_start = 16384; + bts->rtp_port_range_end = 32767; + bts->rtp_port_range_next = bts->rtp_port_range_start; /* configurable via OML */ bts->load.ccch.load_ind_period = 112; diff --git a/src/common/rsl.c b/src/common/rsl.c index 5dd2c59..f2f6bbf 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1787,6 +1787,29 @@ return hostbuf; } +static int bind_rtp(struct gsm_bts *bts, struct osmo_rtp_socket *rs, const char *ip) +{ + int rc; + unsigned int i; + unsigned int trys; + + trys = bts->rtp_port_range_end - bts->rtp_port_range_start; + for (i = 0; i < trys; i++) { + + if (bts->rtp_port_range_next >= bts->rtp_port_range_end) + bts->rtp_port_range_next = bts->rtp_port_range_start; + + rc = osmo_rtp_socket_bind(rs, ip, bts->rtp_port_range_next); + + bts->rtp_port_range_next += 2; + + if (rc == 0) + return 0; + } + + return -1; +} + static int rsl_rx_ipac_XXcx(struct msgb *msg) { struct abis_rsl_dchan_hdr *dch = msgb_l2(msg); @@ -1907,8 +1930,7 @@ * back to the BSC in the CRCX_ACK */ ipstr = get_rsl_local_ip(lchan->ts->trx); } - rc = osmo_rtp_socket_bind(lchan->abis_ip.rtp_socket, - ipstr, -1); + rc = bind_rtp(bts, lchan->abis_ip.rtp_socket, ipstr); if (rc < 0) { LOGP(DRTP, LOGL_ERROR, "%s IPAC Failed to bind RTP/RTCP sockets\n", diff --git a/src/common/vty.c b/src/common/vty.c index 2716a7a..6061335 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -262,6 +262,8 @@ if (bts->rtp_jitter_adaptive) vty_out(vty, " adaptive"); vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " rtp port-range %u %u%s", bts->rtp_port_range_start, + bts->rtp_port_range_end, VTY_NEWLINE); vty_out(vty, " paging queue-size %u%s", paging_get_queue_max(bts->paging_state), VTY_NEWLINE); vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state), @@ -486,6 +488,43 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_rtp_port_range, + cfg_bts_rtp_port_range_cmd, + "rtp port-range <1-65534> <1-65534>", + RTP_STR "Range of local ports to use for RTP/RTCP traffic\n") +{ + struct gsm_bts *bts = vty->index; + unsigned int start; + unsigned int end; + + start = atoi(argv[0]); + end = atoi(argv[1]); + + if (end < start) { + vty_out(vty, "range end port (%u) must be greater than the range start port (%u)!%s", + end, start, VTY_NEWLINE); + return CMD_WARNING; + } + + if (start & 1) { + vty_out(vty, "range must begin at an even port number! (%u not even)%s", + start, VTY_NEWLINE); + return CMD_WARNING; + } + + if ((end & 1) == 0) { + vty_out(vty, "range must end at an odd port number! (%u not odd)%s", + end, VTY_NEWLINE); + return CMD_WARNING; + } + + bts->rtp_port_range_start = start; + bts->rtp_port_range_end = end; + bts->rtp_port_range_next = bts->rtp_port_range_start; + + return CMD_SUCCESS; +} + #define PAG_STR "Paging related parameters\n" DEFUN(cfg_bts_paging_queue_size, @@ -1554,6 +1593,7 @@ install_element(BTS_NODE, &cfg_bts_oml_ip_cmd); install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd); install_element(BTS_NODE, &cfg_bts_rtp_jitbuf_cmd); + install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd); install_element(BTS_NODE, &cfg_bts_band_cmd); install_element(BTS_NODE, &cfg_description_cmd); install_element(BTS_NODE, &cfg_no_description_cmd); -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:42:47 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 23 May 2018 13:42:47 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/9261 ) Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... rtp: make port range configurable, assign correct port numbers The current implementation does not allow the user to specify a port range in which the BTS is allowed to allocate a local RTP port. Also the ports the BTS picks do not match the policy described in RFC3550. An RTP Port must be at an even port number and the matching RTCP port must be at the following (odd) port number. The BTS currently picks random port numbers for both. - Add a VTY command to specify a port range in which the BTS may assign local ports. - Pick ports as described in RFC3550. Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Related: OS#2825 OS#2635 --- M include/osmo-bts/gsm_data_shared.h M src/common/bts.c M src/common/rsl.c M src/common/vty.c 4 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/9261/2 -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 13:44:55 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 23 May 2018 13:44:55 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9252/1/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/#/c/9252/1/src/e1_input.c at 429 PS1, Line 429: /* Remove our counter group from the global counter list > I have the feeling this code is wrong. [?] These parts of the talloc API are not very intuitive. As far as I undestand it, references obtained with talloc_reference() are counted in addition to the original allocation. Which means their count drops to zero, not to 1, before the last talloc_free(). We use talloc_unlink for the rate counters because we want to dereference the last remaining parent context (line) pointer to free the counters. So we remove our reference and check if we were last, then deref the parent context pointer (line) to free line->rate_ctr, then free the parent context. There might be other ways of doing this, but this one works, and the other ways aren't any more intuitive than this one. Additional references to line->driver_data are implicitly handled by talloc_free(). We don't care which parent context's reference is removed in that case. The last talloc_free() occurs with a reference count of 0 and will free driver_data. Maybe we should add a comment to clarify this, but on the other hand it is not unreasonable to expect readers of the code to understand the nuances of the talloc API. -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 13:44:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:00:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 15:00:12 +0000 Subject: Change in libosmo-abis[master]: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9262 Change subject: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy ...................................................................... ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy Those values are not used anymore, since the old bfd is unregistered and the values for the new one will be overwritten by osmo_fd_register. Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/62/9262/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9a80d8e..bbdc5af 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -194,7 +194,7 @@ newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ - memcpy(&newbfd->list, &bfd->list, sizeof(newbfd->list)); + INIT_LLIST_HEAD(&newbfd->list); newbfd->fd = bfd->fd; newbfd->when |= bfd->when; /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ newbfd->cb = bfd->cb; -- To view, visit https://gerrit.osmocom.org/9262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a Gerrit-Change-Number: 9262 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:00:13 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 15:00:13 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9263 Change subject: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb ...................................................................... ipaccess: Avoid using released line and bfd in ipaccess_fd_cb Related: OS#3282 Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e --- M src/input/ipaccess.c 1 file changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/63/9263/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index bbdc5af..e46b0ab 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -84,6 +84,8 @@ return ret; } +/* Returns -1 on error, and 0 or 1 on success. If -1 or 1 is returned, line has + * been release and should not be used anymore by the caller. */ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg, struct osmo_fd *bfd) { @@ -123,13 +125,11 @@ if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); - ret = -EINVAL; goto err; } if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "without unit ID\n"); - ret = -EINVAL; goto err; } @@ -137,7 +137,6 @@ if (len < 1) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with too small unit ID\n"); - ret = -EINVAL; goto err; } unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT); @@ -147,7 +146,6 @@ if (!line->ops->sign_link_up) { LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, closing socket.\n"); - ret = -EINVAL; goto err; } /* the BSC creates the new sign links at this stage. */ @@ -159,7 +157,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } else if (bfd->priv_nr == E1INP_SIGN_RSL) { @@ -174,7 +171,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } /* this is a bugtrap, the BSC should be using the @@ -184,7 +180,7 @@ "Fix your BSC, you should use the " "E1 line used by the OML link for " "your RSL link.\n"); - return 0; + goto err; } /* Finally, we know which OML link is associated with * this RSL link, attach it to this socket. */ @@ -210,11 +206,11 @@ } /* now we can release the dummy RSL line. */ e1inp_line_put(line); + return 1; } break; default: LOGP(DLINP, LOGL_ERROR, "Unknown IPA message type\n"); - ret = -EINVAL; goto err; } return 0; @@ -223,9 +219,10 @@ close(bfd->fd); bfd->fd = -1; e1inp_line_put(line); - return ret; + return -1; } +/* Returns -EBADF if bfd cannot be used by the caller anymore after return. */ static int handle_ts1_read(struct osmo_fd *bfd) { struct e1inp_line *line = bfd->data; @@ -251,23 +248,21 @@ hh = (struct ipaccess_head *) msg->data; if (hh->proto == IPAC_PROTO_IPACCESS) { - ipaccess_rcvmsg(line, msg, bfd); + ret = ipaccess_rcvmsg(line, msg, bfd); + /* BIG FAT WARNING: bfd might no longer exist here (ret != 0), + * since ipaccess_rcvmsg() might have free'd it !!! */ msgb_free(msg); - return 0; + return ret != 0 ? -EBADF : 0; } else if (e1i_ts->type == E1INP_TS_TYPE_NONE) { /* this sign link is not know yet.. complain. */ LOGP(DLINP, LOGL_ERROR, "Timeslot is not configured.\n"); - ret = -EINVAL; goto err_msg; } - /* BIG FAT WARNING: bfd might no longer exist here, since ipaccess_rcvmsg() - * might have free'd it !!! */ link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (!link) { LOGP(DLINP, LOGL_ERROR, "no matching signalling link for " "hh->proto=0x%02x\n", hh->proto); - ret = -EINVAL; goto err_msg; } msg->dst = link; @@ -276,7 +271,6 @@ if (!e1i_ts->line->ops->sign_link) { LOGP(DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); - ret = -EINVAL; goto err_msg; } rc = e1i_ts->line->ops->sign_link(msg); @@ -294,7 +288,7 @@ msgb_free(msg); err: ipaccess_drop(bfd, line); - return ret; + return -EBADF; } static int ts_want_write(struct e1inp_ts *e1i_ts) @@ -395,7 +389,7 @@ if (what & BSC_FD_READ) rc = handle_ts1_read(bfd); - if (what & BSC_FD_WRITE) + if (rc!=-EBADF && (what & BSC_FD_WRITE)) rc = handle_ts1_write(bfd); return rc; -- To view, visit https://gerrit.osmocom.org/9263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e Gerrit-Change-Number: 9263 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:26:16 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Wed, 23 May 2018 15:26:16 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9252 to look at the new patch set (#2). Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... fix double-free/use-after-free of pointers in struct e1inp_line Ensure that pointers in cloned e1inp_lines point to valid memory. Some members of struct e1inp_line can simply be deep-copied. Use talloc reference counting for pointers to objects which may be shared between clones (driver-private state and counters). Prevents double-free bugs, e.g. when multiple links referring to the same line are closed. Also, do not forget to unlink struct e1inp_line's counter group from the counter list. Fixes use-after-free in rate_ctr_timer_cb() during osmo-bts shutdown. Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Related: OS#3011 Related: OS#3137 Related: OS#3282 --- M src/e1_input.c 1 file changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/52/9252/2 -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:31:12 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 15:31:12 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9252/2/src/e1_input.c File src/e1_input.c: https://gerrit.osmocom.org/#/c/9252/2/src/e1_input.c at 439 PS2, Line 439: line->rate_ctr = NULL; It doesn't make a lot of sense to set this to NULL here and don't do it on the other branch. Furthermore, as we are freeing the entire parent after it, I think it's not needed so we can drop this line altogether. -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 15:31:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:35:30 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 15:35:30 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 15:35:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:39:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:39:24 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 15:39:24 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:40:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:40:48 +0000 Subject: Change in libosmo-abis[master]: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9262 ) Change subject: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9262/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/#/c/9262/1/src/input/ipaccess.c at 197 PS1, Line 197: INIT_LLIST_HEAD(&newbfd->list); if the memcpy is not needed, then the INIT_LLIST_HEAD is also not needed. That is only needed for the actual "head" of the list, and not for a simple element we're adding to the list (like the bsc_fd). -- To view, visit https://gerrit.osmocom.org/9262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a Gerrit-Change-Number: 9262 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 15:40:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:44:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:44:41 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9263 ) Change subject: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/9263/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/#/c/9263/1/src/input/ipaccess.c at 183 PS1, Line 183: goto err; I don't really understand the semantics of the old code, and why we have it like that. Hoewever, the original behavior appears to have been to simply print an error message but continue normal processing (return 0) while you're propagating this up to the caller. This change also doesn't really seem to relate to the commit message? https://gerrit.osmocom.org/#/c/9263/1/src/input/ipaccess.c at 392 PS1, Line 392: if (rc!=-EBADF && (what & BSC_FD_WRITE)) coding style (spaces). -- To view, visit https://gerrit.osmocom.org/9263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e Gerrit-Change-Number: 9263 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 15:44:41 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:53:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:53:26 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9261 ) Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... Patch Set 2: (4 comments) the patchset is definitely an improvement over the current code. just for the record: Another approach would be to simply pre-bind the RTP+RTCP ports for all lchan's at the time a TS/pchan is activated. This way we avoid possibly time-consuming iterations at every lchan activation time (in case many ports are already used and hence we need to do many attempts). https://gerrit.osmocom.org/#/c/9261/2/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/#/c/9261/2/include/osmo-bts/gsm_data_shared.h at 692 PS2, Line 692: uint32_t rtp_port_range_start; unimportant: uint16_t would have been sufficient / more natural for port numbers. but nevermind... https://gerrit.osmocom.org/#/c/9261/2/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/#/c/9261/2/src/common/rsl.c at 1794 PS2, Line 1794: unsigned int trys; tries https://gerrit.osmocom.org/#/c/9261/2/src/common/rsl.c at 1796 PS2, Line 1796: trys = bts->rtp_port_range_end - bts->rtp_port_range_start; total number of attempts/tries is 16k ports (using your default values)... https://gerrit.osmocom.org/#/c/9261/2/src/common/rsl.c at 1804 PS2, Line 1804: bts->rtp_port_range_next += 2; however, the port numbers are incremented by two. This means we're trying each port twice, or am I missing something? -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 15:53:26 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:54:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:54:46 +0000 Subject: Change in osmo-mgw[master]: protocol: Try whole port range on port allocation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9259 ) Change subject: protocol: Try whole port range on port allocation ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/9259/1/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/#/c/9259/1/src/libosmo-mgcp/mgcp_protocol.c at 367 PS1, Line 367: unsigned int trys; tries https://gerrit.osmocom.org/#/c/9259/1/src/libosmo-mgcp/mgcp_protocol.c at 376 PS1, Line 376: trys = range->range_end - range->range_start; same comment as on the BTS side: The number of tries/attempts is every port, but we increment last_port by two, i.e. in the worst case trying each port twice. Is this intended? -- To view, visit https://gerrit.osmocom.org/9259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Gerrit-Change-Number: 9259 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 15:54:46 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:58:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:58:13 +0000 Subject: Change in osmo-mgw[master]: vty: clean up rtp port-range command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9260 ) Change subject: vty: clean up rtp port-range command ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9260/1/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/#/c/9260/1/src/libosmo-mgcp/mgcp_vty.c at 293 PS1, Line 293: "rtp port-range <1-65534> <1-65534>", '1' is not an even number, so it will be auto-corrected below. It might make sense to start from "2" upwards. As ports < 1024 are privileged ports for root only, and mostly used for well-defined services, I suggest we ask for <1024-65534> -- To view, visit https://gerrit.osmocom.org/9260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Gerrit-Change-Number: 9260 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 15:58:13 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 15:59:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 15:59:55 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9261 ) Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9261/2/src/common/bts.c File src/common/bts.c: https://gerrit.osmocom.org/#/c/9261/2/src/common/bts.c at 139 PS2, Line 139: bts->rtp_port_range_end = 32767; the end is not an even number. This means if you start the program once and then save the config file, you will write an odd number to the config file, which will fail to parse on subsequent starts :( -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 15:59:55 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:06 +0000 Subject: Change in osmo-bsc[master]: cosmetic: logging and ordering in handle_ass_compl() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9230 ) Change subject: cosmetic: logging and ordering in handle_ass_compl() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 Gerrit-Change-Number: 9230 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 16:02:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:21 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_dyn_ts.c: make local functions static In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9228 ) Change subject: cosmetic: bsc_dyn_ts.c: make local functions static ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 Gerrit-Change-Number: 9228 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 16:02:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:31 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.h: drop unused rsl_chan_activate() declaration In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9227 ) Change subject: abis_rsl.h: drop unused rsl_chan_activate() declaration ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c Gerrit-Change-Number: 9227 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 16:02:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:47 +0000 Subject: Change in osmo-bsc[master]: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9229 ) Change subject: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 Gerrit-Change-Number: 9229 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 23 May 2018 16:02:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:54 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.h: drop unused rsl_chan_activate() declaration In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9227 ) Change subject: abis_rsl.h: drop unused rsl_chan_activate() declaration ...................................................................... abis_rsl.h: drop unused rsl_chan_activate() declaration Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c --- M include/osmocom/bsc/abis_rsl.h 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index b30702f..fc21238 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -41,12 +41,6 @@ int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len); int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len); -int rsl_chan_activate(struct gsm_bts_trx *trx, uint8_t chan_nr, - uint8_t act_type, - struct rsl_ie_chan_mode *chan_mode, - struct rsl_ie_chan_ident *chan_ident, - uint8_t bs_power, uint8_t ms_power, - uint8_t ta); int rsl_chan_activate_lchan(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref); int rsl_chan_mode_modify_req(struct gsm_lchan *ts); -- To view, visit https://gerrit.osmocom.org/9227 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I28a48dc9a1719793d369468aa9a4bdcf460d201c Gerrit-Change-Number: 9227 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_dyn_ts.c: make local functions static In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9228 ) Change subject: cosmetic: bsc_dyn_ts.c: make local functions static ...................................................................... cosmetic: bsc_dyn_ts.c: make local functions static Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 --- M src/libbsc/bsc_dyn_ts.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/libbsc/bsc_dyn_ts.c b/src/libbsc/bsc_dyn_ts.c index 6a1cff7..ed7caed 100644 --- a/src/libbsc/bsc_dyn_ts.c +++ b/src/libbsc/bsc_dyn_ts.c @@ -23,7 +23,7 @@ #include #include -void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts) +static void tchf_pdch_ts_init(struct gsm_bts_trx_ts *ts) { int rc; @@ -33,7 +33,7 @@ gsm_ts_name(ts), gsm_pchan_name(ts->pchan)); } -void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) +static void tchf_tchh_pdch_ts_init(struct gsm_bts_trx_ts *ts) { dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); } -- To view, visit https://gerrit.osmocom.org/9228 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee47b4ffefedf9532e11f17d5f9b603fc8872cb9 Gerrit-Change-Number: 9228 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9229 ) Change subject: cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or ...................................................................... cosmetic: define TCH_F_PDCH_PENDING_MASK as actual bitwise or Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 --- M include/osmocom/bsc/gsm_data.h 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index da5e87f..5ba4362 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -460,8 +460,7 @@ TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, TS_F_PDCH_DEACT_PENDING = 0x4000, - TS_F_PDCH_PENDING_MASK = 0x6000 /*< - TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */ + TS_F_PDCH_PENDING_MASK = (TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING), } gsm_bts_trx_ts_flags; /* One Timeslot in a TRX */ -- To view, visit https://gerrit.osmocom.org/9229 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5266d6e1ea0ea89c66fa481136c31e2f84bcb313 Gerrit-Change-Number: 9229 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:02:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:02:55 +0000 Subject: Change in osmo-bsc[master]: cosmetic: logging and ordering in handle_ass_compl() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9230 ) Change subject: cosmetic: logging and ordering in handle_ass_compl() ...................................................................... cosmetic: logging and ordering in handle_ass_compl() * Check the message length once at the start, before any other actions. * Use only one local gsm48_hdr pointer. * Read the cause value once near the top, re-use it. * Log "ASSIGNMENT COMPLETE" always, not only during handover. * Fully initialize local struct lchan_signal_data. Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 --- M src/libbsc/bsc_api.c 1 file changed, 21 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 71cc0f0..8ae781e 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -344,18 +344,27 @@ static void handle_ass_compl(struct gsm_subscriber_connection *conn, struct msgb *msg) { - struct gsm48_hdr *gh; + struct gsm48_hdr *gh = msgb_l3(msg); struct bsc_api *api = conn->network->bsc_api; + enum gsm48_rr_cause cause; + + /* Expecting gsm48_hdr + cause value */ + if (msgb_l3len(msg) != sizeof(*gh) + 1) { + LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR, + "RR Assignment Complete: length invalid: %u, expected %zu\n", + msgb_l3len(msg), sizeof(*gh) + 1); + return; + } + + cause = gh->data[0]; + + LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", + rr_cause_name(cause)); if (conn->ho) { - struct lchan_signal_data sig; - struct gsm48_hdr *gh = msgb_l3(msg); - - LOGPLCHAN(msg->lchan, DRR, LOGL_DEBUG, "ASSIGNMENT COMPLETE cause = %s\n", - rr_cause_name(gh->data[0])); - - sig.lchan = msg->lchan; - sig.mr = NULL; + struct lchan_signal_data sig = { + .lchan = msg->lchan, + }; osmo_signal_dispatch(SS_LCHAN, S_LCHAN_ASSIGNMENT_COMPL, &sig); /* FIXME: release old channel */ @@ -366,15 +375,8 @@ } if (conn->secondary_lchan != msg->lchan) { - LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, - "Assignment Compl should occur on second lchan.\n"); - return; - } - - gh = msgb_l3(msg); - if (msgb_l3len(msg) - sizeof(*gh) != 1) { - LOGPLCHAN(msg->lchan, DMSC, LOGL_ERROR, "Assignment Compl invalid: %zu\n", - msgb_l3len(msg) - sizeof(*gh)); + LOGPLCHAN(msg->lchan, DRR, LOGL_ERROR, + "RR Assignment Complete does not match conn's secondary lchan.\n"); return; } @@ -391,7 +393,7 @@ if (is_ipaccess_bts(conn_get_bts(conn)) && conn->lchan->tch_mode != GSM48_CMODE_SIGN) rsl_ipacc_crcx(conn->lchan); - api->assign_compl(conn, gh->data[0]); + api->assign_compl(conn, cause); } static void handle_ass_fail(struct gsm_subscriber_connection *conn, -- To view, visit https://gerrit.osmocom.org/9230 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idcfd932d3dfb0b621ed6d8c4f92c0231abcdcec8 Gerrit-Change-Number: 9230 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:04:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:04:16 +0000 Subject: Change in osmo-bsc[master]: gscon: remove dead code In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7839 ) Change subject: gscon: remove dead code ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e Gerrit-Change-Number: 7839 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 23 May 2018 16:04:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:04:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:04:18 +0000 Subject: Change in osmo-bsc[master]: gscon: remove dead code In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7839 ) Change subject: gscon: remove dead code ...................................................................... gscon: remove dead code The state ST_WAIT_MODE_MODIFY_ACK can never be reached by the current FSM model. - Remove ST_WAIT_MODE_MODIFY_ACK and all related code Change-Id: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e Related: OS#2762 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M src/libbsc/bsc_subscr_conn_fsm.c 2 files changed, 1 insertion(+), 45 deletions(-) Approvals: Harald Welte: Looks good to me, approved Neels Hofmeyr: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 9421528..9498d9f 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -21,8 +21,6 @@ GSCON_EV_RR_ASS_COMPL, /* RR ASSIGNMENT FAIL received */ GSCON_EV_RR_ASS_FAIL, - /* RR MODE MODIFY ACK received */ - GSCON_EV_RR_MODE_MODIFY_ACK, /* RSL RLL Release Indication */ GSCON_EV_RLL_REL_IND, diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 3e0ccc0..176bfbf 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -56,8 +56,6 @@ ST_ACTIVE, /* during assignment; waiting for ASS_CMPL */ ST_WAIT_ASS_CMPL, - /* during assignment; waiting for MODE_MODIFY_ACK */ - ST_WAIT_MODE_MODIFY_ACK, /* BSSMAP CLEAR has been received */ ST_CLEARING, @@ -99,7 +97,6 @@ {GSCON_EV_RR_ASS_COMPL, "RR_ASSIGN_COMPL"}, {GSCON_EV_RR_ASS_FAIL, "RR_ASSIGN_FAIL"}, - {GSCON_EV_RR_MODE_MODIFY_ACK, "RR_MODE_MODIFY_ACK"}, {GSCON_EV_RLL_REL_IND, "RLL_RELEASE.ind"}, {GSCON_EV_RSL_CONN_FAIL, "RSL_CONN_FAIL.ind"}, {GSCON_EV_RSL_CLEAR_COMPL, "RSL_CLEAR_COMPLETE"}, @@ -722,39 +719,6 @@ } } -/* We're waiting for a MODE MODIFY ACK from MS + BTS */ -static void gscon_fsm_wait_mode_modify_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data) -{ - struct gsm_subscriber_connection *conn = fi->priv; - struct gsm_lchan *lchan = conn->lchan; - - switch (event) { - case GSCON_EV_RR_MODE_MODIFY_ACK: - /* we assume that not only have we received the RR MODE_MODIFY_ACK, but - * actually that also the BTS side of the channel mode has been changed accordingly */ - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); - - /* FIXME: Check if this requires special handling. For now I assume that the send_ass_compl() - * can be used. But I am not sure. */ - send_ass_compl(lchan, fi, false); - - break; - /* FIXME: Do we need to handle DTAP traffic in this state? Maybe yes? Needs to be checked. */ - case GSCON_EV_MO_DTAP: - forward_dtap(conn, (struct msgb *)data, fi); - break; - case GSCON_EV_MT_DTAP: - submit_dtap(conn, (struct msgb *)data, fi); - break; - case GSCON_EV_TX_SCCP: - sigtran_send(conn, (struct msgb *)data, fi); - break; - default: - OSMO_ASSERT(false); - break; - } -} - static void gscon_fsm_clearing(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_subscriber_connection *conn = fi->priv; @@ -869,7 +833,7 @@ .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) | S(GSCON_EV_A_HO_REQ) | S(GSCON_EV_HO_START), .out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) | - S(ST_WAIT_MODE_MODIFY_ACK) | S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL), + S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL), .action = gscon_fsm_active, }, [ST_WAIT_CRCX_BTS] = { @@ -896,12 +860,6 @@ .out_state_mask = S(ST_ACTIVE), .action = gscon_fsm_wait_crcx_msc, }, - [ST_WAIT_MODE_MODIFY_ACK] = { - .name = OSMO_STRINGIFY(WAIT_MODE_MODIFY_ACK), - .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_MODE_MODIFY_ACK), - .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING), - .action = gscon_fsm_wait_mode_modify_ack, - }, [ST_CLEARING] = { .name = OSMO_STRINGIFY(CLEARING), .in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL), -- To view, visit https://gerrit.osmocom.org/7839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e Gerrit-Change-Number: 7839 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:04:59 +0000 Subject: Change in osmo-sgsn[master]: gprs_subscriber: gsup_auth_error: reject MS in all cases In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9253 ) Change subject: gprs_subscriber: gsup_auth_error: reject MS in all cases ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iefe8f05686ef4acac721f3c0672910704f3b0ff8 Gerrit-Change-Number: 9253 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 16:04:59 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:05:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:05:01 +0000 Subject: Change in osmo-sgsn[master]: gprs_subscriber: gsup_auth_error: reject MS in all cases In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9253 ) Change subject: gprs_subscriber: gsup_auth_error: reject MS in all cases ...................................................................... gprs_subscriber: gsup_auth_error: reject MS in all cases There is no way to recover from "PROTOCOL_ERRORS". As long the error_cause is not set, the SGSN won't send out a GMM Request Reject. Fixes: TTCN: SGGN_Tests.TC_attach_auth_sai_reject Change-Id: Iefe8f05686ef4acac721f3c0672910704f3b0ff8 --- M src/gprs/gprs_subscriber.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c index bebdb1e..1bebc65 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/gprs/gprs_subscriber.c @@ -502,6 +502,7 @@ "GSUP protocol remote error, GMM cause = '%s' (%d)\n", get_value_string(gsm48_gmm_cause_names, gsup_msg->cause), gsup_msg->cause); + sdata->error_cause = gsup_msg->cause; break; } -- To view, visit https://gerrit.osmocom.org/9253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iefe8f05686ef4acac721f3c0672910704f3b0ff8 Gerrit-Change-Number: 9253 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:06:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:06:15 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make functions relating to GMM Attach Request public In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9255 ) Change subject: gprs_gmm: make functions relating to GMM Attach Request public ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/9255/1/include/osmocom/sgsn/gprs_gmm.h File include/osmocom/sgsn/gprs_gmm.h: https://gerrit.osmocom.org/#/c/9255/1/include/osmocom/sgsn/gprs_gmm.h at 40 PS1, Line 40: uint8_t gmm_cause); no need for line break -- To view, visit https://gerrit.osmocom.org/9255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic90d77f7b0bacd2a8e2e409e82d676772d352749 Gerrit-Change-Number: 9255 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 16:06:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:06:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:06:55 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9256 ) Change subject: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I54168e1a58dd36b38c53c13bbb5cdb4311f34410 Gerrit-Change-Number: 9256 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 23 May 2018 16:06:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:19:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:19:48 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: introduce a GMM Attach Request FSM In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9257 ) Change subject: gprs_gmm: introduce a GMM Attach Request FSM ...................................................................... Patch Set 1: Code-Review-1 (9 comments) https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.h File src/gprs/gprs_gmm_attach.h: https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.h at 7 PS1, Line 7: ST_INIT, the states might warrant some more documentation/explanation in comments here https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.h at 17 PS1, Line 17: E_ATTACH_REQ_RECV, same goes for the events here. The *_RECV and *_SENT are pretty lcear, but the others might not be? https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c File src/gprs/gprs_gmm_attach.c: https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 10 PS1, Line 10: extern const struct value_string gmm_attach_req_fsm_event_names[]; why declare the fsm and the event_names here? Are they used anywhere in the filbe before they are defined further down? https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 71 PS1, Line 71: /* check if we received a identity response */ you don't have a switch statement or an OSMO_ASSERT on the "event" which mgiht be dangerous as the FSM definition might be edited in the future and this code implicitly assumes only a single event may arrive here? https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 89 PS1, Line 89: if (type == GSM_MI_TYPE_IMEI && !strlen(ctx->imsi)) { no tab here https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 143 PS1, Line 143: /* FIXME!! */ this appears that UMTS AKA is not working with this new FSM? Was it also broken before this FSM? In that case: We cannot afford to introduce known regression. https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 155 PS1, Line 155: } do we want to silently ignore any other events? In other FSMs we explicitly OSMO_ASSERT() on any unexpecte events here. Same applies to all other state handling functiosn. https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 175 PS1, Line 175: /* TODO: #ifdef ! PTMSI_ALLOC is not supported */ does this mean you're not supporting disabling or enabling of P-TMSI allocation? I believe it should be enabled at all times these days, the #define was just a hack to disable it for debugging? https://gerrit.osmocom.org/#/c/9257/1/src/gprs/gprs_gmm_attach.c at 222 PS1, Line 222: .name = "Ask the hlr about the MS", please use shorter more symbolic names, possibly even "ST_ASK_VLR" here. This is used heavily in logging and also in the CTRL interface, not sure spaces are even permitted... -- To view, visit https://gerrit.osmocom.org/9257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58b9c17be9776a03bb2a5b21e99135cfefc8c912 Gerrit-Change-Number: 9257 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 23 May 2018 16:19:48 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:19:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:19:53 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make functions relating to GMM Attach Request public In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9255 ) Change subject: gprs_gmm: make functions relating to GMM Attach Request public ...................................................................... gprs_gmm: make functions relating to GMM Attach Request public GMM Attach Request will be handled in it's own file and will use those functions. Change-Id: Ic90d77f7b0bacd2a8e2e409e82d676772d352749 --- M include/osmocom/sgsn/gprs_gmm.h M src/gprs/gprs_gmm.c 2 files changed, 13 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 6324c5d..b89eff5 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -11,6 +11,9 @@ uint8_t cause, uint8_t pco_len, uint8_t *pco_v); int gsm48_tx_gsm_act_pdp_acc(struct sgsn_pdp_ctx *pdp); int gsm48_tx_gsm_deact_pdp_acc(struct sgsn_pdp_ctx *pdp); +int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, + const struct osmo_auth_vector *vec, + uint8_t key_seq, bool force_standby); int gsm0408_gprs_rcvmsg_gb(struct msgb *msg, struct gprs_llc_llme *llme, bool drop_cipherable); @@ -32,4 +35,9 @@ int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); +int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type); +int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, + uint8_t gmm_cause); +int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm); + #endif /* _GPRS_GMM_H */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index 93d64a4..df498c1 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -424,7 +424,7 @@ }; /* Chapter 9.4.2: Attach accept */ -static int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm) +int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT ACK"); struct gsm48_hdr *gh; @@ -503,7 +503,7 @@ gmm_copy_id(msg, old_msg); return _tx_gmm_att_rej(msg, gmm_cause, NULL); } -static int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, +int gsm48_tx_gmm_att_rej(struct sgsn_mm_ctx *mm, uint8_t gmm_cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ATT REJ"); @@ -547,7 +547,7 @@ } /* Transmit Chapter 9.4.12 Identity Request */ -static int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) +int gsm48_tx_gmm_id_req(struct sgsn_mm_ctx *mm, uint8_t id_type) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 ID REQ"); struct gsm48_hdr *gh; @@ -577,7 +577,7 @@ } /* 3GPP TS 24.008 Section 9.4.9: Authentication and Ciphering Request */ -static int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, +int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, const struct osmo_auth_vector *vec, uint8_t key_seq, bool force_standby) { @@ -1533,7 +1533,7 @@ } /* Chapter 9.4.17: Routing area update reject */ -static int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause) +int gsm48_tx_gmm_ra_upd_rej(struct msgb *old_msg, uint8_t cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 RA UPD REJ"); struct gsm48_hdr *gh; -- To view, visit https://gerrit.osmocom.org/9255 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic90d77f7b0bacd2a8e2e409e82d676772d352749 Gerrit-Change-Number: 9255 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:19:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:19:53 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9256 ) Change subject: gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public ...................................................................... gprs_gmm: make extract_subscr_msisdn extract_subscr_hlr public Change-Id: I54168e1a58dd36b38c53c13bbb5cdb4311f34410 --- M include/osmocom/sgsn/gprs_gmm.h M src/gprs/gprs_gmm.c 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index b89eff5..3c93efc 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -40,4 +40,7 @@ uint8_t gmm_cause); int gsm48_tx_gmm_att_ack(struct sgsn_mm_ctx *mm); +/* TODO: move extract_subscr_* when gsm48_gmm_authorize() got removed */ +void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx); +void extract_subscr_hlr(struct sgsn_mm_ctx *ctx); #endif /* _GPRS_GMM_H */ diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index df498c1..57d3883 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -848,7 +848,7 @@ return rc; } -static void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx) +void extract_subscr_msisdn(struct sgsn_mm_ctx *ctx) { struct gsm_mncc_number called; uint8_t msisdn[sizeof(ctx->subscr->sgsn_data->msisdn) + 1]; @@ -879,7 +879,7 @@ } } -static void extract_subscr_hlr(struct sgsn_mm_ctx *ctx) +void extract_subscr_hlr(struct sgsn_mm_ctx *ctx) { struct gsm_mncc_number called; uint8_t hlr_number[sizeof(ctx->subscr->sgsn_data->hlr) + 1]; -- To view, visit https://gerrit.osmocom.org/9256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I54168e1a58dd36b38c53c13bbb5cdb4311f34410 Gerrit-Change-Number: 9256 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 16:22:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 16:22:36 +0000 Subject: Change in osmo-sgsn[master]: WIP: tests: remove gmm unit tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9258 ) Change subject: WIP: tests: remove gmm unit tests ...................................................................... Patch Set 1: I think Neels might have a different opinion, but I agree that the tests in TTCN-3 are much more maintainable than unit tests that use hard-coded byte arrays that are impossible to be parsed/edited by a human being. Yes, the unit tests execute much quicker. Which is maybe a reason/motivation to make the TTCN-3 test execute quicker, and to think about moving the tests from the osmo-ttcn3-hacks.git into the individual osmo-* repositories? In any case, we cannot loose test coverage. So removing the unit tests can only be done once it is ensured that all tests we used to have here are present in SGSN_Tests.ttcn. -- To view, visit https://gerrit.osmocom.org/9258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iac1c8854b5ea4aa03279990390ebc110c979aac2 Gerrit-Change-Number: 9258 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 16:22:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:00:29 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:00:29 +0000 Subject: Change in docker-playground[master]: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9264 Change subject: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master ...................................................................... osmo-hnbgw-master: use debian jessie, like all other osmo-*-master Change-Id: I6328e3a9a56308cc395b463dcc40288aae421225 --- M osmo-hnbgw-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/64/9264/1 diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 2f0c12d..7892bda 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,4 +1,4 @@ -FROM laforge/debian-stretch-build +FROM laforge/debian-jessie-build MAINTAINER Harald Welte -- To view, visit https://gerrit.osmocom.org/9264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6328e3a9a56308cc395b463dcc40288aae421225 Gerrit-Change-Number: 9264 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:00:30 +0000 Subject: Change in docker-playground[master]: osmo-bts-master: add Dockerfile ARG for git repo branch to be built Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9265 Change subject: osmo-bts-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-bts-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1 --- M osmo-bts-master/Dockerfile 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/65/9265/1 diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 9239fe2..3c2dbec 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -26,11 +26,13 @@ WORKDIR /tmp +ARG OSMO_BTS_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-bts.git -ADD http://git.osmocom.org/osmo-bts/patch /tmp/commit-osmo-bts +ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts RUN cd osmo-bts && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BTS_BRANCH origin/$OSMO_BTS_BRANCH && \ autoreconf -fi && \ ./configure --enable-trx && \ make -j8 install -- To view, visit https://gerrit.osmocom.org/9265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1 Gerrit-Change-Number: 9265 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:00:30 +0000 Subject: Change in docker-playground[master]: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9266 Change subject: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-mgw-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: I42054d585a5774452a13750ee1c3e6bb8013b26f --- M osmo-mgw-master/Dockerfile 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/9266/1 diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 07f3822..9dc2813 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -22,11 +22,14 @@ WORKDIR /tmp +ARG OSMO_MGW_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-mgw.git -ADD http://git.osmocom.org/osmo-mgw/patch /tmp/commit-osmo-mgw +ADD http://git.osmocom.org/osmo-mgw/patch?h=$OSMO_MGW_BRANCH /tmp/commit-osmo-mgw + RUN cd osmo-mgw && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_MGW_BRANCH origin/$OSMO_MGW_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ -- To view, visit https://gerrit.osmocom.org/9266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42054d585a5774452a13750ee1c3e6bb8013b26f Gerrit-Change-Number: 9266 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:00:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:00:30 +0000 Subject: Change in docker-playground[master]: osmo-*-master: add Dockerfile ARG for git repo branch to be built Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9267 Change subject: osmo-*-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-*-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 --- M osmo-bsc-master/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmo-virtphy-master/Dockerfile 9 files changed, 36 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/9267/1 diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 2228c39..470abcb 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -26,11 +26,13 @@ WORKDIR /tmp +ARG OSMO_BSC_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-bsc.git -ADD http://git.osmocom.org/osmo-bsc/patch /tmp/commit-osmo-bsc +ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc RUN cd osmo-bsc && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \ autoreconf -fi && \ ./configure --enable-trx && \ make -j8 install diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index eecaced..dd9f07a 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -19,11 +19,12 @@ WORKDIR /tmp +ARG OSMO_GGSN_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-ggsn.git -ARG branch=master -ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$branch /tmp/commit +ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit RUN cd osmo-ggsn && \ - git fetch && git checkout -f -B master origin/$branch && \ + git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index af35094..68c3b43 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -23,11 +23,13 @@ WORKDIR /tmp +ARG OSMO_HLR_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-hlr.git -ADD http://git.osmocom.org/osmo-hlr/patch /tmp/commit-osmo-hlr +ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr RUN cd osmo-hlr && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 7892bda..4c60917 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -23,11 +23,13 @@ WORKDIR /tmp +ARG OSMO_IUH_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-iuh.git -ADD http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-mgw +ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw RUN cd osmo-iuh && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index a1b604b..6fe9b3d 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -30,11 +30,13 @@ WORKDIR /tmp +ARG OSMO_MSC_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-msc.git -ADD http://git.osmocom.org/osmo-msc/patch /tmp/commit-osmo-msc +ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc RUN cd osmo-msc && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ make -j8 install diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index eea7ed6..738987a 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -24,11 +24,13 @@ WORKDIR /tmp +ARG OSMO_SGSN_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-sgsn.git -ADD http://git.osmocom.org/osmo-sgsn/patch /tmp/commit +ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit RUN cd osmo-sgsn && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index abdccf9..fad4293 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -30,11 +30,13 @@ WORKDIR /tmp +ARG OSMO_SIP_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-sip-connector.git -ADD http://git.osmocom.org/osmo-sip-connector/patch /tmp/commit-osmo-sip-connector +ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector RUN cd osmo-sip-connector && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ make -j8 install diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 39e9b20..7c11d91 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -20,10 +20,12 @@ WORKDIR /tmp +ARG OSMO_STP_BRANCH="master" + RUN git clone git://git.osmocom.org/libosmo-sccp.git -ADD http://git.osmocom.org/libosmo-sccp/patch /tmp/commit +ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit RUN cd libosmo-sccp && \ - git pull && \ + git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile index 9bac7ce..d433318 100644 --- a/osmo-virtphy-master/Dockerfile +++ b/osmo-virtphy-master/Dockerfile @@ -24,11 +24,13 @@ WORKDIR /tmp +ARG OSMO_BB_BRANCH="master" + RUN git clone git://git.osmocom.org/osmocom-bb.git -ADD http://git.osmocom.org/osmocom-bb/patch /tmp/commit +ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit RUN cd osmocom-bb/src/host/virt_phy && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install -- To view, visit https://gerrit.osmocom.org/9267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 Gerrit-Change-Number: 9267 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:05 +0000 Subject: Change in docker-playground[master]: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9264 ) Change subject: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6328e3a9a56308cc395b463dcc40288aae421225 Gerrit-Change-Number: 9264 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 18:02:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:12 +0000 Subject: Change in docker-playground[master]: osmo-bts-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9265 ) Change subject: osmo-bts-master: add Dockerfile ARG for git repo branch to be built ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1 Gerrit-Change-Number: 9265 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 23 May 2018 18:02:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:18 +0000 Subject: Change in docker-playground[master]: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9266 ) Change subject: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42054d585a5774452a13750ee1c3e6bb8013b26f Gerrit-Change-Number: 9266 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 23 May 2018 18:02:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:22 +0000 Subject: Change in docker-playground[master]: osmo-*-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9267 ) Change subject: osmo-*-master: add Dockerfile ARG for git repo branch to be built ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 Gerrit-Change-Number: 9267 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 23 May 2018 18:02:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:24 +0000 Subject: Change in docker-playground[master]: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9264 ) Change subject: osmo-hnbgw-master: use debian jessie, like all other osmo-*-master ...................................................................... osmo-hnbgw-master: use debian jessie, like all other osmo-*-master Change-Id: I6328e3a9a56308cc395b463dcc40288aae421225 --- M osmo-hnbgw-master/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 2f0c12d..7892bda 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -1,4 +1,4 @@ -FROM laforge/debian-stretch-build +FROM laforge/debian-jessie-build MAINTAINER Harald Welte -- To view, visit https://gerrit.osmocom.org/9264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6328e3a9a56308cc395b463dcc40288aae421225 Gerrit-Change-Number: 9264 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:24 +0000 Subject: Change in docker-playground[master]: osmo-bts-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9265 ) Change subject: osmo-bts-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-bts-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1 --- M osmo-bts-master/Dockerfile 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 9239fe2..3c2dbec 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -26,11 +26,13 @@ WORKDIR /tmp +ARG OSMO_BTS_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-bts.git -ADD http://git.osmocom.org/osmo-bts/patch /tmp/commit-osmo-bts +ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts RUN cd osmo-bts && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BTS_BRANCH origin/$OSMO_BTS_BRANCH && \ autoreconf -fi && \ ./configure --enable-trx && \ make -j8 install -- To view, visit https://gerrit.osmocom.org/9265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1 Gerrit-Change-Number: 9265 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:24 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:24 +0000 Subject: Change in docker-playground[master]: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9266 ) Change subject: osmo-mgw-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-mgw-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: I42054d585a5774452a13750ee1c3e6bb8013b26f --- M osmo-mgw-master/Dockerfile 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index 07f3822..9dc2813 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -22,11 +22,14 @@ WORKDIR /tmp +ARG OSMO_MGW_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-mgw.git -ADD http://git.osmocom.org/osmo-mgw/patch /tmp/commit-osmo-mgw +ADD http://git.osmocom.org/osmo-mgw/patch?h=$OSMO_MGW_BRANCH /tmp/commit-osmo-mgw + RUN cd osmo-mgw && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_MGW_BRANCH origin/$OSMO_MGW_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ -- To view, visit https://gerrit.osmocom.org/9266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42054d585a5774452a13750ee1c3e6bb8013b26f Gerrit-Change-Number: 9266 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:02:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:02:25 +0000 Subject: Change in docker-playground[master]: osmo-*-master: add Dockerfile ARG for git repo branch to be built In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9267 ) Change subject: osmo-*-master: add Dockerfile ARG for git repo branch to be built ...................................................................... osmo-*-master: add Dockerfile ARG for git repo branch to be built This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 --- M osmo-bsc-master/Dockerfile M osmo-ggsn-master/Dockerfile M osmo-hlr-master/Dockerfile M osmo-hnbgw-master/Dockerfile M osmo-msc-master/Dockerfile M osmo-sgsn-master/Dockerfile M osmo-sip-master/Dockerfile M osmo-stp-master/Dockerfile M osmo-virtphy-master/Dockerfile 9 files changed, 36 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 2228c39..470abcb 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -26,11 +26,13 @@ WORKDIR /tmp +ARG OSMO_BSC_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-bsc.git -ADD http://git.osmocom.org/osmo-bsc/patch /tmp/commit-osmo-bsc +ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc RUN cd osmo-bsc && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BSC_BRANCH origin/$OSMO_BSC_BRANCH && \ autoreconf -fi && \ ./configure --enable-trx && \ make -j8 install diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index eecaced..dd9f07a 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -19,11 +19,12 @@ WORKDIR /tmp +ARG OSMO_GGSN_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-ggsn.git -ARG branch=master -ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$branch /tmp/commit +ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit RUN cd osmo-ggsn && \ - git fetch && git checkout -f -B master origin/$branch && \ + git fetch && git checkout -f -B $OSMO_GGSN_BRANCH origin/$OSMO_GGSN_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index af35094..68c3b43 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -23,11 +23,13 @@ WORKDIR /tmp +ARG OSMO_HLR_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-hlr.git -ADD http://git.osmocom.org/osmo-hlr/patch /tmp/commit-osmo-hlr +ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr RUN cd osmo-hlr && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_HLR_BRANCH origin/$OSMO_HLR_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index 7892bda..4c60917 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -23,11 +23,13 @@ WORKDIR /tmp +ARG OSMO_IUH_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-iuh.git -ADD http://git.osmocom.org/osmo-iuh/patch /tmp/commit-osmo-mgw +ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw RUN cd osmo-iuh && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_IUH_BRANCH origin/$OSMO_IUH_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index a1b604b..6fe9b3d 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -30,11 +30,13 @@ WORKDIR /tmp +ARG OSMO_MSC_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-msc.git -ADD http://git.osmocom.org/osmo-msc/patch /tmp/commit-osmo-msc +ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc RUN cd osmo-msc && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_MSC_BRANCH origin/$OSMO_MSC_BRANCH && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ make -j8 install diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index eea7ed6..738987a 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -24,11 +24,13 @@ WORKDIR /tmp +ARG OSMO_SGSN_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-sgsn.git -ADD http://git.osmocom.org/osmo-sgsn/patch /tmp/commit +ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit RUN cd osmo-sgsn && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_SGSN_BRANCH origin/$OSMO_SGSN_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index abdccf9..fad4293 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -30,11 +30,13 @@ WORKDIR /tmp +ARG OSMO_SIP_BRANCH="master" + RUN git clone git://git.osmocom.org/osmo-sip-connector.git -ADD http://git.osmocom.org/osmo-sip-connector/patch /tmp/commit-osmo-sip-connector +ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector RUN cd osmo-sip-connector && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ make -j8 install diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 39e9b20..7c11d91 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -20,10 +20,12 @@ WORKDIR /tmp +ARG OSMO_STP_BRANCH="master" + RUN git clone git://git.osmocom.org/libosmo-sccp.git -ADD http://git.osmocom.org/libosmo-sccp/patch /tmp/commit +ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit RUN cd libosmo-sccp && \ - git pull && \ + git fetch && git checkout -f -B $OSMO_STP_BRANCH origin/$OSMO_STP_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install && \ diff --git a/osmo-virtphy-master/Dockerfile b/osmo-virtphy-master/Dockerfile index 9bac7ce..d433318 100644 --- a/osmo-virtphy-master/Dockerfile +++ b/osmo-virtphy-master/Dockerfile @@ -24,11 +24,13 @@ WORKDIR /tmp +ARG OSMO_BB_BRANCH="master" + RUN git clone git://git.osmocom.org/osmocom-bb.git -ADD http://git.osmocom.org/osmocom-bb/patch /tmp/commit +ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit RUN cd osmocom-bb/src/host/virt_phy && \ - git fetch && git checkout -f -B master origin/master && \ + git fetch && git checkout -f -B $OSMO_BB_BRANCH origin/$OSMO_BB_BRANCH && \ autoreconf -fi && \ ./configure && \ make -j8 install -- To view, visit https://gerrit.osmocom.org/9267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c3349e9a60015472c96bd24fbf29aad57501a00 Gerrit-Change-Number: 9267 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:28:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:28:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Print more self-explanatory error message on bind/connect failures Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9268 Change subject: Print more self-explanatory error message on bind/connect failures ...................................................................... Print more self-explanatory error message on bind/connect failures When sockets cannot be bound or connected, the existing TTCN-3 code prints the following rather cryptic error messages: "IPA-CTRL-IPA(47)@f70ff1fd5cfd: Dynamic test case error: Using the value of an optional field containing omit. (Transport endpoint is not connected)" The "Transport endpoint is not connected" sort-of gives it away, but let's make it more explicit by introducing explicit checks for the res.connId and manual setverdict(fail) statements with proper error message. Change-Id: Id22a1b5189d81c4fca03d5e7aff60ffdd1ad56bf --- M bsc-nat/MGCP_Adapter.ttcn M bts/BTS_Tests.ttcn M library/IPA_Emulation.ttcnpp M library/MGCP_Emulation.ttcn M library/NS_Emulation.ttcn M library/RTP_Emulation.ttcn M library/SMPP_Emulation.ttcn M mgw/MGCP_Test.ttcn M mgw/RTP_Endpoint.ttcn M selftest/Selftest.ttcn 10 files changed, 68 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/9268/1 diff --git a/bsc-nat/MGCP_Adapter.ttcn b/bsc-nat/MGCP_Adapter.ttcn index 1351997..6491c68 100644 --- a/bsc-nat/MGCP_Adapter.ttcn +++ b/bsc-nat/MGCP_Adapter.ttcn @@ -47,6 +47,10 @@ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP_UDP, mp_mgw_ip, mp_mgw_udp_port, mp_callagent_ip, mp_callagent_udp_port, 0, { udp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; while (true) { diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 49bf45e..bc3f186 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -396,6 +396,10 @@ var Result res; res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); + self.stop; + } g_bb_trxc_conn_id := res.connId; } @@ -1043,6 +1047,10 @@ var Result res; res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); + self.stop; + } g_bb_trxc_conn_id := res.connId; } diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index be64dd1..41a3968 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -201,6 +201,10 @@ var IPL4asp_Types.Result res; res := IPA_CodecPort_CtrlFunct.f_IPL4_connect(IPA_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect IPA socket, check your configuration"); + self.stop; + } g_ipa_conn_id := res.connId; g_ccm_pars := ccm_pars; g_is_bsc_mgw := true; @@ -212,6 +216,10 @@ var IPL4asp_Types.Result res; res := IPA_CodecPort_CtrlFunct.f_IPL4_listen(IPA_PORT, local_host, local_port, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen IPA socket, check your configuration"); + self.stop; + } g_ipa_conn_id := res.connId; g_ccm_pars := ccm_pars; g_is_bsc_mgw := false; diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index aaef39e..e2f79b3 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -237,7 +237,10 @@ } else { res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, -1, { udp:={} }); } - + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP socket, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; while (true) { @@ -268,6 +271,10 @@ /* we aren't yet connected to the remote side port, let's fix this */ p.callagent_udp_port := mrf.remPort; res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, g_mgcp_conn_id, { udp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP socket, check your configuration"); + self.stop; + } } if (ischosen(mrf.msg.command)) { cmd := mrf.msg.command; diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 27acae2..d43d15c 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -81,6 +81,10 @@ var Result res; /* Connect the UDP socket */ res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration"); + self.stop; + } g_conn_id := res.connId; f_change_state(NSE_S_DEAD_BLOCKED); /* Send the first NS-ALIVE to test the connection */ diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index a3a0509..20e4299 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -264,10 +264,18 @@ } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTP, g_local_host, g_local_port, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen on RTP socket, check your configuration"); + self.stop; + } g_rtp_conn_id := res.connId; tr_rtp.connId := g_rtp_conn_id; res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTCP, g_local_host, g_local_port+1, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen on RTCP socket, check your configuration"); + self.stop; + } g_rtcp_conn_id := res.connId; tr_rtcp.connId := g_rtcp_conn_id; CTRL.reply(RTPEM_bind:{g_local_host, g_local_port}); @@ -282,10 +290,18 @@ g_remote_port, g_local_host, g_local_port, g_rtp_conn_id, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to RTP socket, check your configuration"); + self.stop; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_connect(RTCP, g_remote_host, g_remote_port+1, g_local_host, g_local_port+1, g_rtcp_conn_id, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to RTCP socket, check your configuration"); + self.stop; + } CTRL.reply(RTPEM_connect:{g_remote_host, g_remote_port}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_NONE}) { diff --git a/library/SMPP_Emulation.ttcn b/library/SMPP_Emulation.ttcn index 83e7801..c14340c 100644 --- a/library/SMPP_Emulation.ttcn +++ b/library/SMPP_Emulation.ttcn @@ -134,6 +134,10 @@ var IPL4asp_Types.Result res; res := SMPP_CodecPort_CtrlFunct.f_IPL4_connect(SMPP_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp :={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to SMPP port, check your configuration"); + self.stop; + } g_smpp_conn_id := res.connId; } diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c1ff3fc..1892a42 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -68,6 +68,10 @@ * source/destionation ip/port and store the connection id in g_mgcp_conn_id * */ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; for (var integer i := 0; i < sizeof(vc_RTPEM); i := i+1) { diff --git a/mgw/RTP_Endpoint.ttcn b/mgw/RTP_Endpoint.ttcn index d33423a..3c939a2 100644 --- a/mgw/RTP_Endpoint.ttcn +++ b/mgw/RTP_Endpoint.ttcn @@ -109,8 +109,10 @@ res := f_IPL4_connect(RTP, sub.remote_name, sub.remote_port, sub.local_name, sub.local_port, sub.connection_id, { udp := {} }); - /* FIXME: Check for success (no res.errorCode) */ - + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect RTP, check your configuration"); + self.stop; + } /* connect without previous bind: save conenction id allocated by IPL4asp */ if (sub.connection_id == -1) { sub.connection_id := res.connId; @@ -132,7 +134,10 @@ var Result res; rtp_endpoint_sub_close(RTP, sub); res := f_IPL4_listen(RTP, sub.local_name, sub.local_port, { udp := {} }); - /* FIXME: Check for success (no res.errorCode) */ + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen to RTP, check your configuration"); + self.stop; + } sub.connection_id := res.connId; } diff --git a/selftest/Selftest.ttcn b/selftest/Selftest.ttcn index 1ff17fe..826d244 100644 --- a/selftest/Selftest.ttcn +++ b/selftest/Selftest.ttcn @@ -55,6 +55,10 @@ var Result res; map(self:IP, system:IP); res := IPL4asp_PortType.f_IPL4_connect(IP, "127.0.0.1", 55555, "", -1,-1, {tcp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to TCP port, check your configuration"); + self.stop; + } g_ip_conn_id := res.connId; } -- To view, visit https://gerrit.osmocom.org/9268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id22a1b5189d81c4fca03d5e7aff60ffdd1ad56bf Gerrit-Change-Number: 9268 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:39:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 18:39:57 +0000 Subject: Change in libosmo-abis[master]: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy In-Reply-To: References: Message-ID: Hello Stefan Sperling, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9262 to look at the new patch set (#2). Change subject: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy ...................................................................... ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy Those values are not used anymore, since the old bfd is unregistered and the values for the new one will be overwritten by osmo_fd_register. Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a --- M src/input/ipaccess.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/62/9262/2 -- To view, visit https://gerrit.osmocom.org/9262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a Gerrit-Change-Number: 9262 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:39:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 23 May 2018 18:39:57 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb In-Reply-To: References: Message-ID: Hello Stefan Sperling, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9263 to look at the new patch set (#2). Change subject: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb ...................................................................... ipaccess: Avoid using released line and bfd in ipaccess_fd_cb Related: OS#3282 Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e --- M src/input/ipaccess.c 1 file changed, 11 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/63/9263/2 -- To view, visit https://gerrit.osmocom.org/9263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e Gerrit-Change-Number: 9263 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:52:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:52:53 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9263 ) Change subject: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e Gerrit-Change-Number: 9263 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 18:52:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:53:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:53:15 +0000 Subject: Change in libosmo-abis[master]: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9262 ) Change subject: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a Gerrit-Change-Number: 9262 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Wed, 23 May 2018 18:53:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:53:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:53:17 +0000 Subject: Change in libosmo-abis[master]: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9262 ) Change subject: ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy ...................................................................... ipaccess: ipaccess_rcvmsg: Drop unneeded memcpy Those values are not used anymore, since the old bfd is unregistered and the values for the new one will be overwritten by osmo_fd_register. Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a --- M src/input/ipaccess.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9a80d8e..5fd9ec3 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -194,7 +194,6 @@ newbfd = &ts->driver.ipaccess.fd; /* get rid of our old temporary bfd */ - memcpy(&newbfd->list, &bfd->list, sizeof(newbfd->list)); newbfd->fd = bfd->fd; newbfd->when |= bfd->when; /* preserve 'newbfd->when' flags potentially set by sign_link_up() */ newbfd->cb = bfd->cb; -- To view, visit https://gerrit.osmocom.org/9262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7ac74843cbed920a2fdc6ade7aef4d4de905939a Gerrit-Change-Number: 9262 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 18:53:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 23 May 2018 18:53:18 +0000 Subject: Change in libosmo-abis[master]: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9263 ) Change subject: ipaccess: Avoid using released line and bfd in ipaccess_fd_cb ...................................................................... ipaccess: Avoid using released line and bfd in ipaccess_fd_cb Related: OS#3282 Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e --- M src/input/ipaccess.c 1 file changed, 11 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5fd9ec3..23eeda6 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -84,6 +84,8 @@ return ret; } +/* Returns -1 on error, and 0 or 1 on success. If -1 or 1 is returned, line has + * been released and should not be used anymore by the caller. */ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg, struct osmo_fd *bfd) { @@ -123,13 +125,11 @@ if (ret < 0) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with malformed TLVs\n"); - ret = -EINVAL; goto err; } if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT)) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "without unit ID\n"); - ret = -EINVAL; goto err; } @@ -137,7 +137,6 @@ if (len < 1) { LOGP(DLINP, LOGL_ERROR, "IPA response message " "with too small unit ID\n"); - ret = -EINVAL; goto err; } unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT); @@ -147,7 +146,6 @@ if (!line->ops->sign_link_up) { LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, closing socket.\n"); - ret = -EINVAL; goto err; } /* the BSC creates the new sign links at this stage. */ @@ -159,7 +157,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } } else if (bfd->priv_nr == E1INP_SIGN_RSL) { @@ -174,7 +171,6 @@ LOGP(DLINP, LOGL_ERROR, "Unable to set signal link, " "closing socket.\n"); - ret = -EINVAL; goto err; } /* this is a bugtrap, the BSC should be using the @@ -209,11 +205,11 @@ } /* now we can release the dummy RSL line. */ e1inp_line_put(line); + return 1; } break; default: LOGP(DLINP, LOGL_ERROR, "Unknown IPA message type\n"); - ret = -EINVAL; goto err; } return 0; @@ -222,9 +218,10 @@ close(bfd->fd); bfd->fd = -1; e1inp_line_put(line); - return ret; + return -1; } +/* Returns -EBADF if bfd cannot be used by the caller anymore after return. */ static int handle_ts1_read(struct osmo_fd *bfd) { struct e1inp_line *line = bfd->data; @@ -250,23 +247,21 @@ hh = (struct ipaccess_head *) msg->data; if (hh->proto == IPAC_PROTO_IPACCESS) { - ipaccess_rcvmsg(line, msg, bfd); + ret = ipaccess_rcvmsg(line, msg, bfd); + /* BIG FAT WARNING: bfd might no longer exist here (ret != 0), + * since ipaccess_rcvmsg() might have free'd it !!! */ msgb_free(msg); - return 0; + return ret != 0 ? -EBADF : 0; } else if (e1i_ts->type == E1INP_TS_TYPE_NONE) { /* this sign link is not know yet.. complain. */ LOGP(DLINP, LOGL_ERROR, "Timeslot is not configured.\n"); - ret = -EINVAL; goto err_msg; } - /* BIG FAT WARNING: bfd might no longer exist here, since ipaccess_rcvmsg() - * might have free'd it !!! */ link = e1inp_lookup_sign_link(e1i_ts, hh->proto, 0); if (!link) { LOGP(DLINP, LOGL_ERROR, "no matching signalling link for " "hh->proto=0x%02x\n", hh->proto); - ret = -EINVAL; goto err_msg; } msg->dst = link; @@ -275,7 +270,6 @@ if (!e1i_ts->line->ops->sign_link) { LOGP(DLINP, LOGL_ERROR, "Fix your application, " "no action set for signalling messages.\n"); - ret = -EINVAL; goto err_msg; } rc = e1i_ts->line->ops->sign_link(msg); @@ -293,7 +287,7 @@ msgb_free(msg); err: ipaccess_drop(bfd, line); - return ret; + return -EBADF; } static int ts_want_write(struct e1inp_ts *e1i_ts) @@ -394,7 +388,7 @@ if (what & BSC_FD_READ) rc = handle_ts1_read(bfd); - if (what & BSC_FD_WRITE) + if (rc != -EBADF && (what & BSC_FD_WRITE)) rc = handle_ts1_write(bfd); return rc; -- To view, visit https://gerrit.osmocom.org/9263 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I52faa9e6717137a7dab9c4e006eaa50b7367fc3e Gerrit-Change-Number: 9263 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed May 23 21:26:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 May 2018 21:26:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#43?= In-Reply-To: <251806008.132.1527028881238.JavaMail.jenkins@jenkins.osmocom.org> References: <251806008.132.1527028881238.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <906013850.140.1527110789637.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [steve] rtl_adsb: fix hanging upon a signal in Fedora 27 ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-25241/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-25241/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-25241/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-25241/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-25241/ libtool: install: (cd /tmp/am-dc-25241/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-25241/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-25241/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-25241/ libtool: install: chmod 644 /tmp/am-dc-25241/ libtool: install: ranlib /tmp/am-dc-25241/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-25241/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-25241/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-25241/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-25241/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-25241/ /bin/mkdir -p '/tmp/am-dc-25241/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-25241/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-25241/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-25241/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-25241/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-25241/ libtool: uninstall: rm -f /tmp/am-dc-25241/ /tmp/am-dc-25241/ /tmp/am-dc-25241/ /tmp/am-dc-25241/ /tmp/am-dc-25241/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-25241/ && rm -f html.tar ) ( cd '/tmp/am-dc-25241/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-25241/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Wed May 23 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 23 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#44?= In-Reply-To: <906013850.140.1527110789637.JavaMail.jenkins@jenkins.osmocom.org> References: <906013850.140.1527110789637.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <876597982.141.1527115281069.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-602/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-602/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-602/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-602/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-602/ libtool: install: (cd /tmp/am-dc-602/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-602/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-602/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-602/ libtool: install: chmod 644 /tmp/am-dc-602/ libtool: install: ranlib /tmp/am-dc-602/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-602/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-602/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-602/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-602/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-602/ /bin/mkdir -p '/tmp/am-dc-602/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-602/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-602/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-602/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-602/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-602/ libtool: uninstall: rm -f /tmp/am-dc-602/ /tmp/am-dc-602/ /tmp/am-dc-602/ /tmp/am-dc-602/ /tmp/am-dc-602/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-602/ && rm -f html.tar ) ( cd '/tmp/am-dc-602/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-602/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Wed May 23 22:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Wed, 23 May 2018 22:45:15 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add value_strings for mncc_names. Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/9269 Change subject: Logging: Add value_strings for mncc_names. ...................................................................... Logging: Add value_strings for mncc_names. Adds function get_mncc_name() and uses it to output to debug log which MNCC_* message was received. Note: get_mncc_name() was already defined in mncc_protocol.h Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac --- M src/mncc.c M src/mncc_protocol.h 2 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/69/9269/1 diff --git a/src/mncc.c b/src/mncc.c index c0c082b..0feb12e 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -820,6 +820,9 @@ } memcpy(&msg_type, buf, 4); + + LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n", get_mncc_name(msg_type)); + switch (msg_type) { case MNCC_SOCKET_HELLO: check_hello(conn, buf, rc); @@ -900,3 +903,64 @@ { MNCC_READY, "READY" }, { 0, NULL }, }; + +static const struct value_string mncc_names[] = { + { MNCC_SETUP_REQ, "MNCC_SETUP_REQ" }, + { MNCC_SETUP_IND, "MNCC_SETUP_IND" }, + { MNCC_SETUP_RSP, "MNCC_SETUP_RSP" }, + { MNCC_SETUP_CNF, "MNCC_SETUP_CNF" }, + { MNCC_SETUP_COMPL_REQ, "MNCC_SETUP_COMPL_REQ" }, + { MNCC_SETUP_COMPL_IND, "MNCC_SETUP_COMPL_IND" }, + { MNCC_CALL_CONF_IND, "MNCC_CALL_CONF_IND" }, + { MNCC_CALL_PROC_REQ, "MNCC_CALL_PROC_REQ" }, + { MNCC_PROGRESS_REQ, "MNCC_PROGRESS_REQ" }, + { MNCC_ALERT_REQ, "MNCC_ALERT_REQ" }, + { MNCC_ALERT_IND, "MNCC_ALERT_IND" }, + { MNCC_NOTIFY_REQ, "MNCC_NOTIFY_REQ" }, + { MNCC_NOTIFY_IND, "MNCC_NOTIFY_IND" }, + { MNCC_DISC_REQ, "MNCC_DISC_REQ" }, + { MNCC_DISC_IND, "MNCC_DISC_IND" }, + { MNCC_REL_REQ, "MNCC_REL_REQ" }, + { MNCC_REL_IND, "MNCC_REL_IND" }, + { MNCC_REL_CNF, "MNCC_REL_CNF" }, + { MNCC_FACILITY_REQ, "MNCC_FACILITY_REQ" }, + { MNCC_FACILITY_IND, "MNCC_FACILITY_IND" }, + { MNCC_START_DTMF_IND, "MNCC_START_DTMF_IND" }, + { MNCC_START_DTMF_RSP, "MNCC_START_DTMF_RSP" }, + { MNCC_START_DTMF_REJ, "MNCC_START_DTMF_REJ" }, + { MNCC_STOP_DTMF_IND, "MNCC_STOP_DTMF_IND" }, + { MNCC_STOP_DTMF_RSP, "MNCC_STOP_DTMF_RSP" }, + { MNCC_MODIFY_REQ, "MNCC_MODIFY_REQ" }, + { MNCC_MODIFY_IND, "MNCC_MODIFY_IND" }, + { MNCC_MODIFY_RSP, "MNCC_MODIFY_RSP" }, + { MNCC_MODIFY_CNF, "MNCC_MODIFY_CNF" }, + { MNCC_MODIFY_REJ, "MNCC_MODIFY_REJ" }, + { MNCC_HOLD_IND, "MNCC_HOLD_IND" }, + { MNCC_HOLD_CNF, "MNCC_HOLD_CNF" }, + { MNCC_HOLD_REJ, "MNCC_HOLD_REJ" }, + { MNCC_RETRIEVE_IND, "MNCC_RETRIEVE_IND" }, + { MNCC_RETRIEVE_CNF, "MNCC_RETRIEVE_CNF" }, + { MNCC_RETRIEVE_REJ, "MNCC_RETRIEVE_REJ" }, + { MNCC_USERINFO_REQ, "MNCC_USERINFO_REQ" }, + { MNCC_USERINFO_IND, "MNCC_USERINFO_IND" }, + { MNCC_REJ_REQ, "MNCC_REJ_REQ" }, + { MNCC_REJ_IND, "MNCC_REJ_IND" }, + { MNCC_BRIDGE, "MNCC_BRIDGE" }, + { MNCC_FRAME_RECV, "MNCC_FRAME_RECV" }, + { MNCC_FRAME_DROP, "MNCC_FRAME_DROP" }, + { MNCC_LCHAN_MODIFY, "MNCC_LCHAN_MODIFY" }, + { MNCC_RTP_CREATE, "MNCC_RTP_CREATE" }, + { MNCC_RTP_CONNECT, "MNCC_RTP_CONNECT" }, + { MNCC_RTP_FREE, "MNCC_RTP_FREE" }, + { GSM_TCHF_FRAME, "GSM_TCHF_FRAME" }, + { GSM_TCHF_FRAME_EFR, "GSM_TCHF_FRAME_EFR" }, + { GSM_TCHH_FRAME, "GSM_TCHH_FRAME" }, + { GSM_TCH_FRAME_AMR, "GSM_TCH_FRAME_AMR" }, + { GSM_BAD_FRAME, "GSM_BAD_FRAME" }, + { 0, NULL }, +}; + +const char *get_mncc_name(const uint32_t value) +{ + return get_value_string(mncc_names, value); +} diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 49f0c8b..705b3c5 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -196,7 +196,7 @@ uint32_t callref[2]; }; -const char *get_mncc_name(int value); +const char *get_mncc_name(const uint32_t value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 23 22:45:15 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Wed, 23 May 2018 22:45:15 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/9270 Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Add Cause to DISCONNECT and RELEASE Requests GSM 04.08 10.5.4.11 (Table 10.85) states: Coding standards other than the standard defined for the GSM PLMNS shall not be used if the cause can be represented with the GSM standardized coding. This patch adds cause coding GSM PLMS (3) and sets cause location to "public network serving the local user" (2) This prevents UE that pay attention to this from treating all call termination as an error and paves the way to adding correct cause mapping from Table 10.86 Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 --- M src/mncc.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/70/9270/1 diff --git a/src/mncc.c b/src/mncc.c index 0feb12e..f307dcf 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -107,6 +107,11 @@ { mncc->msg_type = msg_type; mncc->callref = callref; + if (MNCC_DISC_REQ == msg_type || MNCC_REL_REQ == msg_type) { + mncc->fields |= MNCC_F_CAUSE; + mncc->cause.coding = 3; + mncc->cause.location = 2; + } } static void mncc_write(struct mncc_connection *conn, struct gsm_mncc *mncc, uint32_t callref) -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu May 24 00:53:09 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 May 2018 00:53:09 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1211?= Message-ID: <1868002759.142.1527123189248.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 674.53 KB...] from ../../include/osmocom/hnbap/CriticalityDiagnostics.h:52, from CriticalityDiagnostics.c:8: ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC CSG-Capability.o In file included from :8:0, from ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:15, from CriticalityDiagnostics-IE-List.c:8: ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h:31:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC CSGMembershipStatus.o CC CGI.o CC CI.o CC CN-DomainIndicator.o CC ESN.o CC GeographicalLocation.o CC GeographicalCoordinates.o CC GTP-TEI.o CC HNBCapacity.o CC HNB-Cell-Access-Mode.o CC HNB-Cell-Identifier.o CC HNB-GWResponse.o CC HNB-RNL-Identity.o CC HNBConfigInfo.o CC ConfigurationInformation.o CC HNBConfigurationInformationProvided.o CC HNBConfigurationInformationMissing.o CC HNB-Location-Information.o CC HNB-Identity.o CC HNB-Identity-Info.o CC IMEI.o CC IMSI.o CC IMSIDS41.o CC IMSIESN.o CC IP-Address.o CC Ipv4Address.o CC Ipv6Address.o CC Iurh-Signalling-TNL-AddressList.o CC LAC.o CC LAI.o CC MacroCoverageInformation.o CC MacroCellID.o CC MuxPortNumber.o CC NeighbourCellIdentityList.o CC NeighbourIdentity.o CC AdditionalNeighbourInfoList.o CC NeighbourInfoList.o CC NeighbourInfoRequestList.o CC NeighbourInfoRequestItem.o CC PSC.o CC PLMNidentity.o CC PTMSI.o CC PTMSIRAI.o CC RAB-ID.o CC RABList.o CC RABListItem.o CC RAC.o CC RAI.o CC Registration-Cause.o CC RNC-ID.o CC SAC.o CC S-RNTIPrefix.o CC TMSILAI.o CC TMSIDS41.o CC TransportInfo.o CC TransportLayerAddress.o CC Tunnel-Information.o CC TypeOfError.o CC UDP-Port-Number.o CC UE-Capabilities.o CC UTRANCellID.o CC UE-Identity.o CC Update-cause.o CC URAIdentityList.o CC URAIdentity.o CC U-RNTI.o CC UnknownU-RNTIIndication.o CC HNBAP-PDU.o CC InitiatingMessage.o CC SuccessfulOutcome.o CC UnsuccessfulOutcome.o CC HNBRegisterRequest.o CC HNBRegisterAccept.o CC HNBRegisterReject.o CC UERegisterRequest.o CC UERegisterAccept.o CC UERegisterReject.o CC UEDe-Register.o CC HNBDe-Register.o CC ErrorIndication.o CC CSGMembershipUpdate.o CC TNLUpdateRequest.o CC TNLUpdateResponse.o CC TNLUpdateFailure.o CC HNBConfigTransferRequest.o CC HNBConfigTransferResponse.o CC RelocationComplete.o CC U-RNTIQueryRequest.o CC U-RNTIQueryResponse.o CC PrivateMessage.o CC IE.o AR libosmo-asn1-hnbap.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in rua make[4]: Entering directory ' CC RUA_Presence.o CC RUA_Criticality.o CC RUA_ProcedureCode.o CC RUA_PrivateIE-ID.o CC RUA_ProtocolIE-ID.o CC RUA_IE-Extensions.o CC RUA_TriggeringMessage.o CC RUA_CN-DomainIndicator.o CC RUA_CSGMembershipStatus.o CC RUA_Establishment-Cause.o CC RUA_IntraDomainNasNodeSelector.o CC RUA_Context-ID.o CC RUA_Gsm-map-IDNNS.o CC RUA_Ansi-41-IDNNS.o CC RUA_RANAP-Message.o CC RUA_RoutingParameter.o CC RUA_Cause.o CC RUA_CauseRadioNetwork.o CC RUA_CauseTransport.o CC RUA_CauseProtocol.o CC RUA_CauseMisc.o CC RUA_CriticalityDiagnostics.o CC RUA_CriticalityDiagnostics-IE-List.o CC RUA_TypeOfError.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics.h:17, from RUA_CriticalityDiagnostics.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_RUA-PDU.o In file included from :8:0, from ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:14, from RUA_CriticalityDiagnostics-IE-List.c:7: ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ CC RUA_InitiatingMessage.o CC RUA_SuccessfulOutcome.o CC RUA_UnsuccessfulOutcome.o CC RUA_Connect.o CC RUA_DirectTransfer.o CC RUA_Disconnect.o CC RUA_ConnectionlessTransfer.o CC RUA_ErrorIndication.o CC RUA_PrivateMessage.o CC RUA_IE.o AR libosmo-asn1-rua.a ar: `u' modifier ignored since `D' is the default (see `U') make[4]: Leaving directory ' Making all in ranap make[4]: Entering directory ' CC RANAP_Presence.lo CC RANAP_Criticality.lo CC RANAP_PrivateIE-ID.lo CC RANAP_ProcedureCode.lo CC RANAP_TriggeringMessage.lo CC RANAP_IE-Extensions.lo CC RANAP_ProtocolIE-ID.lo CC RANAP_ProtocolExtensionID.lo CC RANAP_AccuracyFulfilmentIndicator.lo CC RANAP_AllocationOrRetentionPriority.lo CC RANAP_Alt-RAB-Parameters.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.lo CC RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateType.lo CC RANAP_Alt-RAB-Parameter-MaxBitrates.lo CC RANAP_Alt-RAB-Parameter-MaxBitrateList.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.lo CC RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.lo CC RANAP_AlternativeRABConfigurationRequest.lo CC RANAP_APN.lo CC RANAP_AreaIdentity.lo /bin/bash: line 1: 27716 Segmentation fault /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0\" -DPACKAGE_BUGREPORT=\"openbsc at 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-iuh\" -DVERSION=\"0.3.0\" -DSTDC_HEADERS=1 -I. -fsanitize=address -fsanitize=undefined -Wall -I../../include -I -I -I -g -O2 -fsanitize=address -fsanitize=undefined -Wall -MT RANAP_Alt-RAB-Parameter-MaxBitrateList.lo -MD -MP -MF .deps/RANAP_Alt-RAB-Parameter-MaxBitrateList.Tpo -c -o RANAP_Alt-RAB-Parameter-MaxBitrateList.lo RANAP_Alt-RAB-Parameter-MaxBitrateList.c Makefile:2505: recipe for target 'RANAP_Alt-RAB-Parameter-MaxBitrateList.lo' failed make[4]: *** [RANAP_Alt-RAB-Parameter-MaxBitrateList.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... In file included from :8:0, from ../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../include/osmocom/ranap/RANAP_SAI.h:17, from ../../include/osmocom/ranap/RANAP_AreaIdentity.h:14, from RANAP_AreaIdentity.c:7: ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ make[4]: Leaving directory ' Makefile:641: recipe for target 'all-recursive' failed make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory ' Makefile:453: recipe for target 'all' failed make[2]: *** [all] Error 2 make[2]: Leaving directory ' Makefile:454: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:378: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Thu May 24 06:07:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:07:44 +0000 Subject: Change in osmo-bts[master]: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9167 ) Change subject: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaef1648f35ceae9d7f4cd1d9d5409e05115d199a Gerrit-Change-Number: 9167 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 06:07:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 06:08:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:08:38 +0000 Subject: Change in osmo-bts[master]: scheduler_trx: Add reminders to use libosmocore functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8103 ) Change subject: scheduler_trx: Add reminders to use libosmocore functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 Gerrit-Change-Number: 8103 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 06:08:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 06:08:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:08:44 +0000 Subject: Change in osmo-bts[master]: scheduler_trx: Add reminders to use libosmocore functions In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8103 ) Change subject: scheduler_trx: Add reminders to use libosmocore functions ...................................................................... scheduler_trx: Add reminders to use libosmocore functions Let' wait until the just-merged osmo_timerfd_* functions of Change-Id Ibeffba7c997252c003723bcd5d14122c4ded2fe7 have made it into the next tagged release, and then replace the implementation here. Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 4c4ae6c..11c5c4e 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -1427,6 +1427,7 @@ } /*! disable the osmocom-wrapped timerfd */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ static int timer_ofd_disable(struct osmo_fd *ofd) { const struct itimerspec its_null = { @@ -1441,6 +1442,7 @@ * \param[in] first Relative time at which the timer should first execute (NULL = \a interval) * \param[in] interval Time interval at which subsequent timer shall fire * \returns 0 on success; negative on error */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ static int timer_ofd_schedule(struct osmo_fd *ofd, const struct timespec *first, const struct timespec *interval) { @@ -1469,6 +1471,7 @@ * We simply initialize the data structures here, but do not yet * schedule the timer. */ +/* FIXME: Use libosmocore after release with Ibeffba7c997252c003723bcd5d14122c4ded2fe7 was made */ static int timer_ofd_setup(struct osmo_fd *ofd, int (*cb)(struct osmo_fd *, unsigned int), void *data) { ofd->cb = cb; -- To view, visit https://gerrit.osmocom.org/8103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0f0a7437b6acb535177e5ad6ac7a6d336654c66 Gerrit-Change-Number: 8103 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 06:08:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:08:45 +0000 Subject: Change in osmo-bts[master]: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9167 ) Change subject: cosmetic: it's n_r in check_for_first_ciphrd(), not n_s ...................................................................... cosmetic: it's n_r in check_for_first_ciphrd(), not n_s When we introduced the n_s verification in 2cc37035d73191b71b9ba9c0d559a0da6a5f35e5, the variable name n_s was used for what is actually n_r N(R) read from the LAPDm frame Change-Id: Iaef1648f35ceae9d7f4cd1d9d5409e05115d199a --- M src/common/l1sap.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e7cef4e..3a40949 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -956,7 +956,7 @@ static inline int check_for_first_ciphrd(struct gsm_lchan *lchan, uint8_t *data, int len) { - uint8_t n_s; + uint8_t n_r; /* if this is the first valid message after enabling Rx * decryption, we have to enable Tx encryption */ @@ -972,8 +972,8 @@ if ((data[1] & 0x01) != 0) return 0; - n_s = data[1] >> 5; - if (lchan->ciph_ns != n_s) + n_r = data[1] >> 5; + if (lchan->ciph_ns != n_r) return 0; return 1; -- To view, visit https://gerrit.osmocom.org/9167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iaef1648f35ceae9d7f4cd1d9d5409e05115d199a Gerrit-Change-Number: 9167 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 06:09:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:09:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Print more self-explanatory error message on bind/connect failures In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9268 ) Change subject: Print more self-explanatory error message on bind/connect failures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id22a1b5189d81c4fca03d5e7aff60ffdd1ad56bf Gerrit-Change-Number: 9268 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 06:09:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 06:09:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 06:09:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Print more self-explanatory error message on bind/connect failures In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9268 ) Change subject: Print more self-explanatory error message on bind/connect failures ...................................................................... Print more self-explanatory error message on bind/connect failures When sockets cannot be bound or connected, the existing TTCN-3 code prints the following rather cryptic error messages: "IPA-CTRL-IPA(47)@f70ff1fd5cfd: Dynamic test case error: Using the value of an optional field containing omit. (Transport endpoint is not connected)" The "Transport endpoint is not connected" sort-of gives it away, but let's make it more explicit by introducing explicit checks for the res.connId and manual setverdict(fail) statements with proper error message. Change-Id: Id22a1b5189d81c4fca03d5e7aff60ffdd1ad56bf --- M bsc-nat/MGCP_Adapter.ttcn M bts/BTS_Tests.ttcn M library/IPA_Emulation.ttcnpp M library/MGCP_Emulation.ttcn M library/NS_Emulation.ttcn M library/RTP_Emulation.ttcn M library/SMPP_Emulation.ttcn M mgw/MGCP_Test.ttcn M mgw/RTP_Endpoint.ttcn M selftest/Selftest.ttcn 10 files changed, 68 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc-nat/MGCP_Adapter.ttcn b/bsc-nat/MGCP_Adapter.ttcn index 1351997..6491c68 100644 --- a/bsc-nat/MGCP_Adapter.ttcn +++ b/bsc-nat/MGCP_Adapter.ttcn @@ -47,6 +47,10 @@ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP_UDP, mp_mgw_ip, mp_mgw_udp_port, mp_callagent_ip, mp_callagent_udp_port, 0, { udp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; while (true) { diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 49bf45e..bc3f186 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -396,6 +396,10 @@ var Result res; res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); + self.stop; + } g_bb_trxc_conn_id := res.connId; } @@ -1043,6 +1047,10 @@ var Result res; res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BB_TRXC, mp_bb_trxc_ip, mp_bb_trxc_port, "", -1, -1, {udp:={}}, {}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to trx-control interface of trxcon, check your configuration"); + self.stop; + } g_bb_trxc_conn_id := res.connId; } diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index be64dd1..41a3968 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -201,6 +201,10 @@ var IPL4asp_Types.Result res; res := IPA_CodecPort_CtrlFunct.f_IPL4_connect(IPA_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect IPA socket, check your configuration"); + self.stop; + } g_ipa_conn_id := res.connId; g_ccm_pars := ccm_pars; g_is_bsc_mgw := true; @@ -212,6 +216,10 @@ var IPL4asp_Types.Result res; res := IPA_CodecPort_CtrlFunct.f_IPL4_listen(IPA_PORT, local_host, local_port, { tcp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen IPA socket, check your configuration"); + self.stop; + } g_ipa_conn_id := res.connId; g_ccm_pars := ccm_pars; g_is_bsc_mgw := false; diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn index aaef39e..e2f79b3 100644 --- a/library/MGCP_Emulation.ttcn +++ b/library/MGCP_Emulation.ttcn @@ -237,7 +237,10 @@ } else { res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, -1, { udp:={} }); } - + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP socket, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; while (true) { @@ -268,6 +271,10 @@ /* we aren't yet connected to the remote side port, let's fix this */ p.callagent_udp_port := mrf.remPort; res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, p.callagent_ip, p.callagent_udp_port, p.mgw_ip, p.mgw_udp_port, g_mgcp_conn_id, { udp:={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP socket, check your configuration"); + self.stop; + } } if (ischosen(mrf.msg.command)) { cmd := mrf.msg.command; diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 27acae2..d43d15c 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -81,6 +81,10 @@ var Result res; /* Connect the UDP socket */ res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect NS UDP socket, check your configuration"); + self.stop; + } g_conn_id := res.connId; f_change_state(NSE_S_DEAD_BLOCKED); /* Send the first NS-ALIVE to test the connection */ diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index a3a0509..20e4299 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -264,10 +264,18 @@ } res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTP, g_local_host, g_local_port, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen on RTP socket, check your configuration"); + self.stop; + } g_rtp_conn_id := res.connId; tr_rtp.connId := g_rtp_conn_id; res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTCP, g_local_host, g_local_port+1, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen on RTCP socket, check your configuration"); + self.stop; + } g_rtcp_conn_id := res.connId; tr_rtcp.connId := g_rtcp_conn_id; CTRL.reply(RTPEM_bind:{g_local_host, g_local_port}); @@ -282,10 +290,18 @@ g_remote_port, g_local_host, g_local_port, g_rtp_conn_id, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to RTP socket, check your configuration"); + self.stop; + } res := RTP_CodecPort_CtrlFunct.f_IPL4_connect(RTCP, g_remote_host, g_remote_port+1, g_local_host, g_local_port+1, g_rtcp_conn_id, {udp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to RTCP socket, check your configuration"); + self.stop; + } CTRL.reply(RTPEM_connect:{g_remote_host, g_remote_port}); } [] CTRL.getcall(RTPEM_mode:{RTPEM_MODE_NONE}) { diff --git a/library/SMPP_Emulation.ttcn b/library/SMPP_Emulation.ttcn index 83e7801..c14340c 100644 --- a/library/SMPP_Emulation.ttcn +++ b/library/SMPP_Emulation.ttcn @@ -134,6 +134,10 @@ var IPL4asp_Types.Result res; res := SMPP_CodecPort_CtrlFunct.f_IPL4_connect(SMPP_PORT, remote_host, remote_port, local_host, local_port, 0, { tcp :={} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to SMPP port, check your configuration"); + self.stop; + } g_smpp_conn_id := res.connId; } diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index c1ff3fc..1892a42 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -68,6 +68,10 @@ * source/destionation ip/port and store the connection id in g_mgcp_conn_id * */ res := MGCP_CodecPort_CtrlFunct.f_IPL4_connect(MGCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {} }); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect MGCP, check your configuration"); + self.stop; + } g_mgcp_conn_id := res.connId; for (var integer i := 0; i < sizeof(vc_RTPEM); i := i+1) { diff --git a/mgw/RTP_Endpoint.ttcn b/mgw/RTP_Endpoint.ttcn index d33423a..3c939a2 100644 --- a/mgw/RTP_Endpoint.ttcn +++ b/mgw/RTP_Endpoint.ttcn @@ -109,8 +109,10 @@ res := f_IPL4_connect(RTP, sub.remote_name, sub.remote_port, sub.local_name, sub.local_port, sub.connection_id, { udp := {} }); - /* FIXME: Check for success (no res.errorCode) */ - + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect RTP, check your configuration"); + self.stop; + } /* connect without previous bind: save conenction id allocated by IPL4asp */ if (sub.connection_id == -1) { sub.connection_id := res.connId; @@ -132,7 +134,10 @@ var Result res; rtp_endpoint_sub_close(RTP, sub); res := f_IPL4_listen(RTP, sub.local_name, sub.local_port, { udp := {} }); - /* FIXME: Check for success (no res.errorCode) */ + if (not ispresent(res.connId)) { + setverdict(fail, "Could not listen to RTP, check your configuration"); + self.stop; + } sub.connection_id := res.connId; } diff --git a/selftest/Selftest.ttcn b/selftest/Selftest.ttcn index 1ff17fe..826d244 100644 --- a/selftest/Selftest.ttcn +++ b/selftest/Selftest.ttcn @@ -55,6 +55,10 @@ var Result res; map(self:IP, system:IP); res := IPL4asp_PortType.f_IPL4_connect(IP, "127.0.0.1", 55555, "", -1,-1, {tcp:={}}); + if (not ispresent(res.connId)) { + setverdict(fail, "Could not connect to TCP port, check your configuration"); + self.stop; + } g_ip_conn_id := res.connId; } -- To view, visit https://gerrit.osmocom.org/9268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id22a1b5189d81c4fca03d5e7aff60ffdd1ad56bf Gerrit-Change-Number: 9268 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu May 24 06:20:40 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 May 2018 06:20:40 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1212?= In-Reply-To: <1868002759.142.1527123189248.JavaMail.jenkins@jenkins.osmocom.org> References: <1868002759.142.1527123189248.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1802209257.147.1527142840811.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu May 24 07:34:58 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 May 2018 07:34:58 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/9234 ) Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... Patch Set 1: (1 comment) > (1 comment) > > patch looks good, just not sure about the semantics. what was the > alt-codec intended for and why don't we use it after all? I have no Idea what this alt_codec was about. When I get the things right then one could negotiate multiple codecs via SDP and then just use them. So basically we deal with multiple alternative codecs which we may switch afterwards and by the standard it may be definitely more than one alternative codec, thats why I do not get why there is only a single alt codec and not multiple ones. https://gerrit.osmocom.org/#/c/9234/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9234/1//COMMIT_MSG at 11 PS1, Line 11: - remove unused alt_codec field > oh so there's a scheme behind repeating the same statements Unfortunately yes. Every commit has a title, an explaination and a bullet point summary. I am not sure if this is right or so. We do not have official rules for this, right? -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 24 May 2018 07:34:58 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 08:21:34 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 24 May 2018 08:21:34 +0000 Subject: Change in osmo-mgw[master]: vty: clean up rtp port-range command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9260 to look at the new patch set (#2). Change subject: vty: clean up rtp port-range command ...................................................................... vty: clean up rtp port-range command The VTY command that sets the RTP port range does not check if the data entered by the user actually makes sens. Also it allwos to configur a range that starts at 0. - Make sure 0 can not be used as start or end of the range - make sure the end port number is always greater then the begin port number - Autocorrect uneaven port range beginnings to one port number before to ensure the range starts at an even port number - Autocorrect even port range ends to the next odd port number to ensure the range ends at an odd port number. Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 29 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/60/9260/2 -- To view, visit https://gerrit.osmocom.org/9260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Gerrit-Change-Number: 9260 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 08:30:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 08:30:47 +0000 Subject: Change in osmo-mgw[master]: vty: clean up rtp port-range command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9260 ) Change subject: vty: clean up rtp port-range command ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Gerrit-Change-Number: 9260 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 08:30:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 08:30:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 08:30:50 +0000 Subject: Change in osmo-mgw[master]: vty: clean up rtp port-range command In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9260 ) Change subject: vty: clean up rtp port-range command ...................................................................... vty: clean up rtp port-range command The VTY command that sets the RTP port range does not check if the data entered by the user actually makes sens. Also it allwos to configur a range that starts at 0. - Make sure 0 can not be used as start or end of the range - make sure the end port number is always greater then the begin port number - Autocorrect uneaven port range beginnings to one port number before to ensure the range starts at an even port number - Autocorrect even port range ends to the next odd port number to ensure the range ends at an odd port number. Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 29 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 392a176..3c1b596 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -282,13 +282,6 @@ return CMD_WARNING; } -static void parse_range(struct mgcp_port_range *range, const char **argv) -{ - range->range_start = atoi(argv[0]); - range->range_end = atoi(argv[1]); - range->last_port = g_cfg->net_ports.range_start; -} - #define RTP_STR "RTP configuration\n" #define UDP_PORT_STR "UDP Port number\n" #define NET_START_STR "First UDP port allocated\n" @@ -297,11 +290,38 @@ DEFUN(cfg_mgcp_rtp_port_range, cfg_mgcp_rtp_port_range_cmd, - "rtp port-range <0-65534> <0-65534>", + "rtp port-range <1024-65534> <1025-65535>", RTP_STR "Range of ports to use for the NET side\n" RANGE_START_STR RANGE_END_STR) { - parse_range(&g_cfg->net_ports, argv); + int start; + int end; + + start = atoi(argv[0]); + end = atoi(argv[1]); + + if (end < start) { + vty_out(vty, "range end port (%i) must be greater than the range start port (%i)!%s", + end, start, VTY_NEWLINE); + return CMD_WARNING; + } + + if (start & 1) { + vty_out(vty, "range must begin at an even port number, autocorrecting port (%i) to: %i%s", + start, start & 0xFFFE, VTY_NEWLINE); + start &= 0xFFFE; + } + + if ((end & 1) == 0) { + vty_out(vty, "range must end at an odd port number, autocorrecting port (%i) to: %i%s", + end, end | 1, VTY_NEWLINE); + end |= 1; + } + + g_cfg->net_ports.range_start = start; + g_cfg->net_ports.range_end = end; + g_cfg->net_ports.last_port = g_cfg->net_ports.range_start; + return CMD_SUCCESS; } ALIAS_DEPRECATED(cfg_mgcp_rtp_port_range, -- To view, visit https://gerrit.osmocom.org/9260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1312acba4f03f378594dbbeb4f31afd891d68d7 Gerrit-Change-Number: 9260 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 08:32:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 08:32:09 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Add value_strings for mncc_names. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Add value_strings for mncc_names. ...................................................................... Patch Set 1: Code-Review-1 We already have osmo_mncc_name() in libosmocore/src/gsm/mncc.c, please use the existing function. thanks! -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 08:32:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 08:35:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 08:35:06 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9270/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9270/1/src/mncc.c at 113 PS1, Line 113: mncc->cause.location = 2; please use GSM48_CAUSE_LOC_PUN_S_LU instead of a magic number "2". As for "coding", it appears we might not yet have a #define or enum for that. Please add it to libosmocore, and use it from here. Thanks! -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 08:35:06 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 09:37:33 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 09:37:33 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 09:37:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 09:39:28 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 09:39:28 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Thu, 24 May 2018 09:39:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 10:20:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 10:20:38 +0000 Subject: Change in libosmocore[master]: mncc: properly export osmo_mncc_name() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9272 Change subject: mncc: properly export osmo_mncc_name() ...................................................................... mncc: properly export osmo_mncc_name() For some strange reason, the osmo_mncc_name() inline function was not in the mncc.h header, but in the mncc.c file. Let's fix that. Change-Id: I2c3666510c981dffa4ba25bed517fd7ebd1250f5 --- M include/osmocom/gsm/mncc.h M src/gsm/libosmogsm.map M src/gsm/mncc.c 3 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/9272/1 diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 5ca2986..6b94d46 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -91,3 +91,8 @@ #define osmo_mncc_log(ss, level, prefix, msg, len) \ _osmo_mncc_log(ss, level, __BASE_FILE__, __LINE__, prefix, msg, len); + +extern const struct value_string osmo_mncc_names[]; +static inline const char *osmo_mncc_name(uint32_t msg_type) { + return get_value_string(osmo_mncc_names, msg_type); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8c64020..c4b1b75 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -466,6 +466,7 @@ osmo_msisdn_str_valid; osmo_mncc_stringify; +osmo_mncc_names; _osmo_mncc_log; local: *; diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index fa4726c..938cf9a 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -244,10 +244,6 @@ { 0, NULL }, }; -static inline const char *osmo_mncc_name(uint32_t msg_type) { - return get_value_string(osmo_mncc_names, msg_type); -} - static void mncc_dump_rtp(struct msgb *str, const uint8_t *msg, unsigned int len) { const struct gsm_mncc_rtp *rtp = (const struct gsm_mncc_rtp *) msg; -- To view, visit https://gerrit.osmocom.org/9272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c3666510c981dffa4ba25bed517fd7ebd1250f5 Gerrit-Change-Number: 9272 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 10:39:24 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 24 May 2018 10:39:24 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 1: Code-Review-1 (7 comments) https://gerrit.osmocom.org/#/c/9271/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9271/1/src/mncc.c at 122 PS1, Line 122: ws, please fix. https://gerrit.osmocom.org/#/c/9271/1/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 54 PS1, Line 54: LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); Great, but unrelated to this change... Please do it in a separate one. https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 182 PS1, Line 182: other->cause=1; Do we have any enum or a group of defines for this? https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 235 PS1, Line 235: static void copy_cause_phrase(int *to_cause, char **to_phrase, ws ws https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 240 PS1, Line 240: } ws https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 248 PS1, Line 248: int sip_cause; ws https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 280 PS1, Line 280: ws -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 May 2018 10:39:24 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 10:59:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 10:59:58 +0000 Subject: Change in libosmocore[master]: mncc: properly export osmo_mncc_name() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9272 ) Change subject: mncc: properly export osmo_mncc_name() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c3666510c981dffa4ba25bed517fd7ebd1250f5 Gerrit-Change-Number: 9272 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 10:59:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 11:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 11:00:00 +0000 Subject: Change in libosmocore[master]: mncc: properly export osmo_mncc_name() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9272 ) Change subject: mncc: properly export osmo_mncc_name() ...................................................................... mncc: properly export osmo_mncc_name() For some strange reason, the osmo_mncc_name() inline function was not in the mncc.h header, but in the mncc.c file. Let's fix that. Change-Id: I2c3666510c981dffa4ba25bed517fd7ebd1250f5 --- M include/osmocom/gsm/mncc.h M src/gsm/libosmogsm.map M src/gsm/mncc.c 3 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/mncc.h b/include/osmocom/gsm/mncc.h index 5ca2986..6b94d46 100644 --- a/include/osmocom/gsm/mncc.h +++ b/include/osmocom/gsm/mncc.h @@ -91,3 +91,8 @@ #define osmo_mncc_log(ss, level, prefix, msg, len) \ _osmo_mncc_log(ss, level, __BASE_FILE__, __LINE__, prefix, msg, len); + +extern const struct value_string osmo_mncc_names[]; +static inline const char *osmo_mncc_name(uint32_t msg_type) { + return get_value_string(osmo_mncc_names, msg_type); +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 8c64020..c4b1b75 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -466,6 +466,7 @@ osmo_msisdn_str_valid; osmo_mncc_stringify; +osmo_mncc_names; _osmo_mncc_log; local: *; diff --git a/src/gsm/mncc.c b/src/gsm/mncc.c index fa4726c..938cf9a 100644 --- a/src/gsm/mncc.c +++ b/src/gsm/mncc.c @@ -244,10 +244,6 @@ { 0, NULL }, }; -static inline const char *osmo_mncc_name(uint32_t msg_type) { - return get_value_string(osmo_mncc_names, msg_type); -} - static void mncc_dump_rtp(struct msgb *str, const uint8_t *msg, unsigned int len) { const struct gsm_mncc_rtp *rtp = (const struct gsm_mncc_rtp *) msg; -- To view, visit https://gerrit.osmocom.org/9272 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c3666510c981dffa4ba25bed517fd7ebd1250f5 Gerrit-Change-Number: 9272 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 11:00:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 24 May 2018 11:00:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: PCUIF_CodecPort: Log PCU socket connect error string Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9273 Change subject: library: PCUIF_CodecPort: Log PCU socket connect error string ...................................................................... library: PCUIF_CodecPort: Log PCU socket connect error string Change-Id: I7045061770cda5b50d05dbf756656e380084a703 --- M library/PCUIF_CodecPort.ttcn 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/9273/1 diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index fe428af..c642202 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -65,7 +65,11 @@ [] pt.receive(UD_connect_result:?) -> value res { if (ispresent(res.result) and ispresent(res.result.result_code) and res.result.result_code == ERROR) { - setverdict(fail, "Error connecting to PCU socket"); + if (ispresent(res.result.err)) { + setverdict(fail, "Error connecting to PCU socket: ", res.result.err); + } else { + setverdict(fail, "Error connecting to PCU socket"); + } self.stop; } else { return res.id; -- To view, visit https://gerrit.osmocom.org/9273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7045061770cda5b50d05dbf756656e380084a703 Gerrit-Change-Number: 9273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 12:58:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 12:58:57 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9252 to look at the new patch set (#3). Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... fix double-free/use-after-free of pointers in struct e1inp_line Ensure that pointers in cloned e1inp_lines point to valid memory. Some members of struct e1inp_line can simply be deep-copied. Use talloc reference counting for pointers to objects which may be shared between clones (driver-private state and counters). Prevents double-free bugs, e.g. when multiple links referring to the same line are closed. Also, do not forget to unlink struct e1inp_line's counter group from the counter list. Fixes use-after-free in rate_ctr_timer_cb() during osmo-bts shutdown. Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Related: OS#3011 Related: OS#3137 --- M src/e1_input.c 1 file changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/52/9252/3 -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:00:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 24 May 2018 13:00:47 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 24 May 2018 13:00:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:03:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 13:03:52 +0000 Subject: Change in libosmo-abis[master]: fix double-free/use-after-free of pointers in struct e1inp_line In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9252 ) Change subject: fix double-free/use-after-free of pointers in struct e1inp_line ...................................................................... fix double-free/use-after-free of pointers in struct e1inp_line Ensure that pointers in cloned e1inp_lines point to valid memory. Some members of struct e1inp_line can simply be deep-copied. Use talloc reference counting for pointers to objects which may be shared between clones (driver-private state and counters). Prevents double-free bugs, e.g. when multiple links referring to the same line are closed. Also, do not forget to unlink struct e1inp_line's counter group from the counter list. Fixes use-after-free in rate_ctr_timer_cb() during osmo-bts shutdown. Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Related: OS#3011 Related: OS#3137 --- M src/e1_input.c 1 file changed, 40 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/e1_input.c b/src/e1_input.c index 29ba440..11949a1 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -394,6 +394,25 @@ return NULL; memcpy(clone, line, sizeof(struct e1inp_line)); + + if (line->name) { + clone->name = talloc_strdup(clone, line->name); + OSMO_ASSERT(clone->name); + } + if (line->sock_path) { + clone->sock_path = talloc_strdup(clone, line->sock_path); + OSMO_ASSERT(clone->sock_path); + } + + /* + * Rate counters and driver data are shared between clones. These are pointers + * to dynamic memory so we use reference counting to avoid a double-free (see OS#3137). + */ + OSMO_ASSERT(line->rate_ctr); + clone->rate_ctr = talloc_reference(clone, line->rate_ctr); + if (line->driver_data) + clone->driver_data = talloc_reference(clone, line->driver_data); + clone->refcnt = 1; return clone; } @@ -406,8 +425,28 @@ void e1inp_line_put(struct e1inp_line *line) { line->refcnt--; - if (line->refcnt == 0) + if (line->refcnt == 0) { + /* Remove our counter group from libosmocore's global counter + * list if we are freeing the last remaining talloc context. + * Otherwise we get a use-after-free when libosmocore's timer + * ticks again and attempts to update these counters (OS#3011). + * + * Note that talloc internally counts "secondary" references + * _in addition to_ the initial allocation context, so yes, + * we must check for *zero* remaining secondary contexts here. */ + if (talloc_reference_count(line->rate_ctr) == 0) { + rate_ctr_group_free(line->rate_ctr); + } else { + /* We are not freeing the last talloc context. + * Instead of calling talloc_free(), unlink this 'line' pointer + * which serves as one of several talloc contexts for the rate + * counters and driver private state. */ + talloc_unlink(line, line->rate_ctr); + if (line->driver_data) + talloc_unlink(line, line->driver_data); + } talloc_free(line); + } } void -- To view, visit https://gerrit.osmocom.org/9252 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9f4724b4a5a064801591e9acf4f2fd1db006d082 Gerrit-Change-Number: 9252 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 13:06:46 +0000 Subject: Change in osmo-bsc[master]: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() In-Reply-To: References: Message-ID: Stefan Sperling has submitted this change and it was merged. ( https://gerrit.osmocom.org/9242 ) Change subject: fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() ...................................................................... fix misaligned memory write access in abis_nm_ipaccess_rsl_connect() Use memcpy() to avoid unaligned access, instead of writing through a pointer cast to uint32_t. Problem spotted by address sanitizer: abis_nm.c:2802:24: runtime error: store to misaligned address 0x7ffc95396706 for type 'uint32_t', which requires 4 byte alignment 0x7ffc95396706: note: pointer points here 81 0b bb 80 00 00 00 00 ed 79 28 56 00 00 e0 9c 00 00 a0 61 00 00 ... ^ Related: OS#3196 Change-Id: I8e591a56ae522b371da01ea968151a7e6fa24bb9 --- M src/libbsc/abis_nm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_nm.c b/src/libbsc/abis_nm.c index b2cfa53..ea94d37 100644 --- a/src/libbsc/abis_nm.c +++ b/src/libbsc/abis_nm.c @@ -2799,7 +2799,7 @@ attr[1] = stream; attr[3] = port >> 8; attr[4] = port & 0xff; - *(uint32_t *)(attr+6) = ia.s_addr; + memcpy(attr + 6, &ia.s_addr, sizeof(uint32_t)); /* if ip == 0, we use the default IP */ if (ip == 0) -- To view, visit https://gerrit.osmocom.org/9242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e591a56ae522b371da01ea968151a7e6fa24bb9 Gerrit-Change-Number: 9242 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:38:17 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 13:38:17 +0000 Subject: Change in osmo-bsc[master]: show all global counters of osmo-bsc in vty In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9217 ) Change subject: show all global counters of osmo-bsc in vty ...................................................................... Patch Set 2: > (1 comment) There is already a function for this purpose in in libosmocore: vty_out_rate_ctr_group() But the output doesn't look as nice in this case: OsmoBSC# show statistics base station controller: Received handover attempts.: 0 (0/s 0/m 0/h 0/d) Sent no channel available responses.: 0 (0/s 0/m 0/h 0/d) Timeouts of timer T3103.: 0 (0/s 0/m 0/h 0/d) Received handover completed.: 0 (0/s 0/m 0/h 0/d) Received HO FAIL messages.: 0 (0/s 0/m 0/h 0/d) Paging attempts for a subscriber.: 0 (0/s 0/m 0/h 0/d) Paging request send failures because no responsible BTS was found.: 0 (0/s 0/m 0/h 0/d) Paging attempts with successful response.: 0 (0/s 0/m 0/h 0/d) Connection attempts from unknown IPA CCM Unit ID.: 0 (0/s 0/m 0/h 0/d) -- To view, visit https://gerrit.osmocom.org/9217 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 Gerrit-Change-Number: 9217 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Thu, 24 May 2018 13:38:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:44:53 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 13:44:53 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/9271/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9271/1/src/mncc.c at 122 PS1, Line 122: > ws, please fix. Yes.. It's a work in progess, not a final patch proposal. https://gerrit.osmocom.org/#/c/9271/1/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 182 PS1, Line 182: other->cause=1; > Do we have any enum or a group of defines for this? Yes, on the way. -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 May 2018 13:44:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 13:46:17 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 13:46:17 +0000 Subject: Change in osmo-sip-connector[master]: Implement MNCC Cause <-> SIP Call Error mapping In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9271 ) Change subject: Implement MNCC Cause <-> SIP Call Error mapping ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9271/1/src/sip.c File src/sip.c: https://gerrit.osmocom.org/#/c/9271/1/src/sip.c at 54 PS1, Line 54: LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now ringing.\n", leg); > Great, but unrelated to this change... [?] It got it here... again..it's just a WIP.. -- To view, visit https://gerrit.osmocom.org/9271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3f9796c8ecdfdd68274e9b32e748d32a4b8dc273 Gerrit-Change-Number: 9271 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 24 May 2018 13:46:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:51:16 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 14:51:16 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9269 to look at the new patch set (#2). Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Logging: Log mncc_names in mncc_data() Links libosmocore (libosmogsm) for access to osmo_mncc_name() Uses osmo_mncc_name() to output to debug log which MNCC_* message was received. Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac --- M configure.ac M src/Makefile.am M src/mncc.c M src/mncc_protocol.h 4 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/69/9269/2 -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:54:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 24 May 2018 14:54:15 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h File src/mncc_protocol.h: https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h at 199 PS2, Line 199: const char *get_mncc_name(const uint32_t value); This is not related to this patch? -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 14:54:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:55:20 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 May 2018 14:55:20 +0000 Subject: Change in osmo-ci[master]: ansible/setup-gsm-tester: add docker Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9274 Change subject: ansible/setup-gsm-tester: add docker ...................................................................... ansible/setup-gsm-tester: add docker Change-Id: Idfd96c4e3556b93ca85acb94a2176ec269a906d1 --- M ansible/setup-gsm-tester.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/74/9274/1 diff --git a/ansible/setup-gsm-tester.yml b/ansible/setup-gsm-tester.yml index a1a0389..36c8287 100644 --- a/ansible/setup-gsm-tester.yml +++ b/ansible/setup-gsm-tester.yml @@ -38,6 +38,11 @@ tags: - jenkins-slave + - name: docker + jenkins_user: jenkins + tags: + - docker + - name: udhcpd udhcpd_router: 10.42.42.1 udhcpd_range_start: 10.42.42.230 -- To view, visit https://gerrit.osmocom.org/9274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idfd96c4e3556b93ca85acb94a2176ec269a906d1 Gerrit-Change-Number: 9274 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:55:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 May 2018 14:55:21 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: add jenkins to the dialout group Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9275 Change subject: ansible: gsm-tester: add jenkins to the dialout group ...................................................................... ansible: gsm-tester: add jenkins to the dialout group To access tty* Change-Id: Icc7b3fa9ca7c14360d78069d8d42e6039afda32b --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/9275/1 diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index f7eb1ee..2b00270 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -150,6 +150,7 @@ with_items: - systemd-journal - osmo-gsm-tester + - dialout - name: setup state directory file: -- To view, visit https://gerrit.osmocom.org/9275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icc7b3fa9ca7c14360d78069d8d42e6039afda32b Gerrit-Change-Number: 9275 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:55:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Thu, 24 May 2018 14:55:21 +0000 Subject: Change in osmo-ci[master]: ansible: add a simple README.md Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9276 Change subject: ansible: add a simple README.md ...................................................................... ansible: add a simple README.md Change-Id: I96057bb92faa8e3375c5bad20ef1536475807b67 --- A ansible/README.md 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/9276/1 diff --git a/ansible/README.md b/ansible/README.md new file mode 100644 index 0000000..21763f4 --- /dev/null +++ b/ansible/README.md @@ -0,0 +1,20 @@ +# ansible repository + +Ansible is an automisation, provisioning and configuration management utility. + +# How to use it? + +- you need ansible installed (version 2.4, other might work as well) + +# How to setup the gsm-tester? + +`ansible-playbook -i hosts setup-gsm-tester.yml` + +Your ssh key need to be deployed on the host. +Further information on this job can be found in **setup-gsm-tester.md**. + +# How to setup a jenkin slave? + +`ansible-playbook -i hosts setup-jenkins-slave.yml` + +Further information on this job and around the setup can be found on the redmine wiki. -- To view, visit https://gerrit.osmocom.org/9276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96057bb92faa8e3375c5bad20ef1536475807b67 Gerrit-Change-Number: 9276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:55:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 24 May 2018 14:55:45 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h File src/mncc_protocol.h: https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h at 199 PS2, Line 199: const char *get_mncc_name(const uint32_t value); > This is not related to this patch? Can this function actually be dropped in this patch? Is it still needed?. -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 14:55:45 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:56:37 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 14:56:37 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9269 to look at the new patch set (#3). Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Logging: Log mncc_names in mncc_data() Links libosmocore (libosmogsm) for access to osmo_mncc_name() Remove reference to get_mncc_name() in src/mncc_protocol.h Uses osmo_mncc_name() to output to debug log which MNCC_* message was received. Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac --- M configure.ac M src/Makefile.am M src/mncc.c M src/mncc_protocol.h 4 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/69/9269/3 -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 14:58:03 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Thu, 24 May 2018 14:58:03 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h File src/mncc_protocol.h: https://gerrit.osmocom.org/#/c/9269/2/src/mncc_protocol.h at 199 PS2, Line 199: void mncc_set_cause(struct gsm_mncc *data, int loc, int val); > This is not related to this patch? Done -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 14:58:03 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 15:00:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 24 May 2018 15:00:50 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 15:00:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:06:47 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 16:06:47 +0000 Subject: Change in libosmocore[master]: introduce vty_out_rate_ctr_group_fmt() function Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9277 Change subject: introduce vty_out_rate_ctr_group_fmt() function ...................................................................... introduce vty_out_rate_ctr_group_fmt() function This new function can be used to print a rate counter group according to a format string. The intention is to generalize and replace manual printing of counters as implemented for the 'show statistics' VTY command of osmo-bsc. Related: OS#3245 Related: osmo-bsc commit 71d524c059c5a5c90e7cb77d8a2134c1c68b9cde (g#9217) Change-Id: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd --- M include/osmocom/vty/misc.h M src/vty/utils.c 2 files changed, 138 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/9277/1 diff --git a/include/osmocom/vty/misc.h b/include/osmocom/vty/misc.h index 335558d..2ad9650 100644 --- a/include/osmocom/vty/misc.h +++ b/include/osmocom/vty/misc.h @@ -14,6 +14,8 @@ void vty_out_rate_ctr_group(struct vty *vty, const char *prefix, struct rate_ctr_group *ctrg); +void vty_out_rate_ctr_group_fmt(struct vty *vty, const char *fmt, + struct rate_ctr_group *ctrg); void vty_out_stat_item_group(struct vty *vty, const char *prefix, struct osmo_stat_item_group *statg); diff --git a/src/vty/utils.c b/src/vty/utils.c index 8cd0b35..4d37093 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -84,6 +84,142 @@ rate_ctr_for_each_counter(ctrg, rate_ctr_handler, &vctx); } +static char * +pad_append_str(char *s, const char *a, int minwidth) +{ + s = talloc_asprintf_append(s, "%*s", minwidth, a); + OSMO_ASSERT(s); + return s; +} + +static char * +pad_append_ctr(char *s, uint64_t ctr, int minwidth, void *ctx) +{ + s = talloc_asprintf_append(s, "%*" PRIu64, minwidth, ctr); + OSMO_ASSERT(s); + return s; +} + +static int rate_ctr_handler_fmt( + struct rate_ctr_group *ctrg, struct rate_ctr *ctr, + const struct rate_ctr_desc *desc, void *vctx_) +{ + struct vty_out_context *vctx = vctx_; + struct vty *vty = vctx->vty; + const char *fmt = vctx->prefix; + char *s = talloc_strdup(vty, ""); + OSMO_ASSERT(s); + + while (*fmt) { + int ch, minwidth = 0, sign = 1; + char *p = strchr(fmt, '%'); + + if (p == NULL) { + /* No further % directives in format string. Copy rest verbatim and exit. */ + s = talloc_strdup_append_buffer(s, fmt); + OSMO_ASSERT(s); + break; + } else { + ptrdiff_t len; + + OSMO_ASSERT(p >= fmt); + len = p - fmt; + if (len) { + /* Copy bytes verbatim until next '%' byte. */ + s = talloc_strndup_append_buffer(s, fmt, len); + OSMO_ASSERT(s); + } + fmt = (const char *)(p + 1); /* skip past '%' */ + if (*fmt == '\0') + break; + } + + ch = *fmt++; + if (ch == '-' && isdigit(*fmt)) { + sign = -1; + ch = *fmt++; + } + while (isdigit(ch) && *fmt != '\0') { + minwidth *= 10; + minwidth += (ch - '0'); + ch = *fmt++; + } + minwidth *= sign; + + switch (ch) { + case '%': + s = talloc_asprintf_append(s, "%c", ch); + OSMO_ASSERT(s); + break; + case 'd': + s = pad_append_str(s, desc->description, minwidth); + break; + case 'n': + s = pad_append_str(s, desc->name, minwidth); + break; + case 'c': + s = pad_append_ctr(s, ctr->current, minwidth, vty); + break; + case 'p': + s = pad_append_ctr(s, ctr->previous, minwidth, vty); + break; + case 'S': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth, vty); + break; + case 'M': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth, vty); + break; + case 'H': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth, vty); + break; + case 'D': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth, vty); + break; + default: + break; + } + } + + vty_out(vty, "%s%s", s, VTY_NEWLINE); + talloc_free(s); + + return 0; +} + +/*! print a rate counter group to given VTY, formatting the line for each counter according to a format string. + * + * The following format string directives are supported: + * - %d: The description of the counter + * - %n: The name of the counter + * - %c: The current value of the counter + * - %p: The previous value of the counter + * - %S: The interval of the counter in seconds + * - %M: The interval of the counter in minutes + * - %H: The interval of the counter in hours + * - %D: The interval of the counter in days + * - %%: Print a literal %. + * + * An optional number between % and the letter in a format directive may be used to set a minimum field width. + * If the expanded format directive is smaller than this width (according to strlen()) the string will be + * left-padded (if the number is positive) or right-padded (if the number is negative) with spaces. + * For example, "%25n" prints the counter name left-padded up to a minimum width of 25 columns. + * + * VTY_NEWLINE will be appended to the format string when it is printed. + * + * \param[in] vty The VTY to which it should be printed + * \param[in] ctrg Rate counter group to be printed + * \param[in] fmt A format which may contain the above directives. + */ +void vty_out_rate_ctr_group_fmt(struct vty *vty, const char *fmt, + struct rate_ctr_group *ctrg) +{ + struct vty_out_context vctx = {vty, fmt}; + + vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); + + rate_ctr_for_each_counter(ctrg, rate_ctr_handler_fmt, &vctx); +} + static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *vctx_) { struct vty_out_context *vctx = vctx_; -- To view, visit https://gerrit.osmocom.org/9277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Gerrit-Change-Number: 9277 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:43:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 16:43:39 +0000 Subject: Change in libosmocore[master]: Add a 'show rate-counters' VTY command. Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9278 Change subject: Add a 'show rate-counters' VTY command. ...................................................................... Add a 'show rate-counters' VTY command. Add a new VTY command which shows all rate counters registered with libosmocom. Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Depends: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Related: OS#3245 --- M src/vty/stats_vty.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/9278/1 diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index faa136d..8d90945 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -527,6 +527,22 @@ return CMD_SUCCESS; } +static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) +{ + struct vty *vty = sctx_; + vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); + return 0; +} + +DEFUN(show_rate_counters, + show_rate_counters_cmd, + "show rate-counters", + SHOW_STR "Show all rate counters\n") +{ + rate_ctr_for_each_group(rate_ctr_group_handler, vty); + return CMD_SUCCESS; +} + static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_reporter *srep) { if (srep == NULL) @@ -620,4 +636,5 @@ install_element(CFG_STATS_NODE, &cfg_stats_reporter_disable_cmd); install_element_ve(&show_stats_asciidoc_table_cmd); + install_element_ve(&show_rate_counters_cmd); } -- To view, visit https://gerrit.osmocom.org/9278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Gerrit-Change-Number: 9278 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:44:52 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 24 May 2018 16:44:52 +0000 Subject: Change in libosmocore[master]: Add a 'show rate-counters' VTY command. In-Reply-To: References: Message-ID: Stefan Sperling has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/9278 ) Change subject: Add a 'show rate-counters' VTY command. ...................................................................... Add a 'show rate-counters' VTY command. Add a new VTY command which shows all rate counters registered with libosmocore. Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Depends: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Related: OS#3245 --- M src/vty/stats_vty.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/9278/2 -- To view, visit https://gerrit.osmocom.org/9278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Gerrit-Change-Number: 9278 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:45 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:45 +0000 Subject: Change in osmo-bsc[master]: add bsc_stubs.h to workaround linking hell for utils and tests Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9279 Change subject: add bsc_stubs.h to workaround linking hell for utils and tests ...................................................................... add bsc_stubs.h to workaround linking hell for utils and tests libbsc currently depends on functions defined in osmo-bsc/. Until we clean that up, unify the place to define stubs that allow linking. (Otherwise I would edit all those separate scopes for each new BSSMAP function.) For reasons I can't even begin to understand, simply including this header with trivial stubs suddenly causes the linker to require libosmo-mgcp-client and libosmo-sigtran in bsc_test and gsm0408_test. Whatever, go ahead then. Change-Id: I000be689ed071aced1a085284f924a7e77e5656d --- M include/osmocom/bsc/Makefile.am A include/osmocom/bsc/bsc_stubs.h M src/ipaccess/ipaccess-config.c M src/utils/bs11_config.c M tests/abis/abis_test.c M tests/bsc-nat/bsc_nat_test.c M tests/bsc/Makefile.am M tests/bsc/bsc_test.c M tests/channel/channel_test.c M tests/gsm0408/Makefile.am M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 13 files changed, 48 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/9279/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index b25dfd8..5a1370c 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -52,4 +52,5 @@ vty.h \ bsc_api.h \ penalty_timers.h \ + bsc_stubs.h \ $(NULL) diff --git a/include/osmocom/bsc/bsc_stubs.h b/include/osmocom/bsc/bsc_stubs.h new file mode 100644 index 0000000..7b3244e --- /dev/null +++ b/include/osmocom/bsc/bsc_stubs.h @@ -0,0 +1,22 @@ +/* libbsc currently references some BSSMAP functions only implemented within osmo-bsc/. Until that gets + * cleaned up properly, various utils and C tests need these stubs to successfully link a complete + * binary. This nonsense should disappear as soon as we get time to fix it. */ + +struct gsm_subscriber_connection; +struct msgb; +struct gsm_lchan; +struct gsm0808_handover_required; +struct handover; + +int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) +{ OSMO_ASSERT(false); } + +int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) +{ return 0; } + +int bsc_send_handover_required(struct gsm_lchan *lchan, + const struct gsm0808_handover_required *params) +{ OSMO_ASSERT(false); } + +int bsc_send_handover_request_ack(struct handover *ho, struct msgb *rr_ho_command) +{ OSMO_ASSERT(false); } diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 2236063..f88ca6e 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -55,6 +55,8 @@ #include #include +#include + struct gsm_network *bsc_gsmnet; static int net_listen_testnr; @@ -1072,15 +1074,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index 8d4de01..831c198 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -45,6 +45,8 @@ #include #include +#include + static void *tall_bs11cfg_ctx; static struct e1inp_sign_link *oml_link; @@ -969,15 +971,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index faf9ea5..93f5924 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -29,6 +29,8 @@ #include #include +#include + static const uint8_t load_config[] = { 0x42, 0x12, 0x00, 0x08, 0x31, 0x36, 0x38, 0x64, 0x34, 0x37, 0x32, 0x00, 0x13, 0x00, 0x0b, 0x76, diff --git a/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c index 7aa39ec..fcc01f2 100644 --- a/tests/bsc-nat/bsc_nat_test.c +++ b/tests/bsc-nat/bsc_nat_test.c @@ -29,6 +29,8 @@ #include #include +#include + #include #include #include diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am index a436c27..89e897c 100644 --- a/tests/bsc/Makefile.am +++ b/tests/bsc/Makefile.am @@ -9,7 +9,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ - $(LIBOSMOLEGACYMGCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) @@ -37,7 +37,8 @@ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOLEGACYMGCP_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ $(LIBRARY_GSM) \ -lrt \ $(NULL) diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 106b08b..d7b8ccd 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -32,6 +32,8 @@ #include #include +#include + #include #include #include @@ -239,7 +241,3 @@ talloc_free(ctx); return 0; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} diff --git a/tests/channel/channel_test.c b/tests/channel/channel_test.c index e8f6cd9..dcffa87 100644 --- a/tests/channel/channel_test.c +++ b/tests/channel/channel_test.c @@ -29,6 +29,8 @@ #include #include +#include + void test_bts_debug_print(void) { struct gsm_network *network; diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index 9a74d44..0c917ad 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -8,6 +8,8 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ $(NULL) noinst_PROGRAMS = \ @@ -27,4 +29,6 @@ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ $(NULL) diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index a934806..da02117 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -31,6 +31,8 @@ #include #include +#include + #include #include #include @@ -844,7 +846,3 @@ return EXIT_SUCCESS; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 82afbe5..caa57c1 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -43,6 +43,8 @@ #include #include +#include + void *ctx; struct gsm_network *bsc_gsmnet; @@ -1695,5 +1697,3 @@ void trau_mux_map_lchan() {} void trau_recv_lchan() {} void trau_send_frame() {} -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 8e8626d..e15529f 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -23,6 +23,8 @@ #include #include +#include + #include #include #include -- To view, visit https://gerrit.osmocom.org/9279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I000be689ed071aced1a085284f924a7e77e5656d Gerrit-Change-Number: 9279 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:46 +0000 Subject: Change in osmo-bsc[master]: cosmetic: gscon: undup code: add common assignment_failed() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9280 Change subject: cosmetic: gscon: undup code: add common assignment_failed() ...................................................................... cosmetic: gscon: undup code: add common assignment_failed() Call one common function to signal Assignment Failure and transition back to ST_ACTIVE. Change-Id: I1ce10a3ead286cdb6ad529fc293b6cecd151cc9a --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 33 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/9280/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 3e0ccc0..7617dba 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -386,6 +386,22 @@ } } +#define assignment_failed(fi, cause) \ + _assignment_failed(fi, cause, __FILE__, __LINE__) +static void _assignment_failed(struct osmo_fsm_inst *fi, enum gsm0808_cause cause, + const char *file, int line) +{ + struct gsm_subscriber_connection *conn = fi->priv; + struct msgb *resp = NULL; + + LOGPFSMLSRC(fi, LOGL_ERROR, file, line, "Assignment failed: %s\n", gsm0808_cause_name(cause)); + + resp = gsm0808_create_assignment_failure(cause, NULL); + sigtran_send(conn, resp, fi); + if (fi->state != ST_ACTIVE) + osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); +} + /* We're on an active subscriber connection, passing DTAP back and forth */ static void gscon_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -424,8 +440,7 @@ mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_BTS, GSCON_EV_MGW_CRCX_RESP_BTS, &conn_peer); if (!conn->user_plane.fi_bts) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); return; } break; @@ -443,8 +458,7 @@ send_ass_compl(conn->lchan, fi, false); return; } else if (rc != 0) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); return; } @@ -459,8 +473,7 @@ conn->user_plane.full_rate); /* The requested channel mode is not supported */ - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP, NULL); - sigtran_send(conn, resp, fi); + assignment_failed(fi, GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP); break; } break; @@ -504,7 +517,6 @@ { struct gsm_subscriber_connection *conn = fi->priv; struct mgcp_conn_peer *conn_peer = NULL; - struct msgb *resp = NULL; int rc; switch (event) { @@ -514,9 +526,7 @@ /* Check if the MGW has assigned an enpoint to us, otherwise we * can not proceed. */ if (strlen(conn_peer->endpoint) <= 0) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); return; } @@ -535,9 +545,7 @@ conn->user_plane.rtp_ip = osmo_ntohl(inet_addr(conn_peer->addr)); rc = gsm0808_assign_req(conn, conn->user_plane.chan_mode, conn->user_plane.full_rate); if (rc != 0) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_RQSTED_SPEECH_VERSION_UNAVAILABLE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_RQSTED_SPEECH_VERSION_UNAVAILABLE); return; } @@ -565,7 +573,6 @@ struct gsm_lchan *lchan = conn->lchan; struct mgcp_conn_peer conn_peer; struct in_addr addr; - struct msgb *resp = NULL; int rc; switch (event) { @@ -590,9 +597,7 @@ osmo_fsm_inst_state_chg(fi, ST_WAIT_MDCX_BTS, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR); rc = mgcp_conn_modify(conn->user_plane.fi_bts, GSCON_EV_MGW_MDCX_RESP_BTS, &conn_peer); if (rc != 0) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); return; } break; @@ -614,9 +619,12 @@ break; case GSCON_EV_RR_ASS_FAIL: - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_RQSTED_TERRESTRIAL_RESOURCE_UNAVAILABLE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + { + enum gsm0808_cause cause = GSM0808_CAUSE_RQSTED_TERRESTRIAL_RESOURCE_UNAVAILABLE; + if (data) + cause = *((enum gsm0808_cause*)data); + assignment_failed(fi, cause); + } break; case GSCON_EV_MO_DTAP: forward_dtap(conn, (struct msgb *)data, fi); @@ -639,7 +647,6 @@ struct gsm_subscriber_connection *conn = fi->priv; struct mgcp_conn_peer conn_peer; struct sockaddr_in *sin = NULL; - struct msgb *resp = NULL; switch (event) { case GSCON_EV_MGW_MDCX_RESP_BTS: @@ -662,9 +669,7 @@ mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer); if (!conn->user_plane.fi_bts) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); return; } @@ -964,11 +969,8 @@ * with an assignment failure */ OSMO_ASSERT(fi->state != ST_INIT && fi->state != ST_WAIT_CC); if (fi->state == ST_WAIT_CRCX_BTS || fi->state == ST_WAIT_ASS_CMPL || fi->state == ST_WAIT_MDCX_BTS - || fi->state == ST_WAIT_CRCX_MSC) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); - } + || fi->state == ST_WAIT_CRCX_MSC) + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); break; case GSCON_EV_A_CLEAR_CMD: /* MSC tells us to cleanly shut down */ @@ -1067,7 +1069,6 @@ static int gscon_timer_cb(struct osmo_fsm_inst *fi) { struct gsm_subscriber_connection *conn = fi->priv; - struct msgb *resp = NULL; switch (fi->T) { case 993210: @@ -1083,14 +1084,10 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); break; case GSM0808_T10_TIMER_NR: /* Assignment Failed */ - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE); break; case MGCP_MGW_TIMEOUT_TIMER_NR: /* Assignment failed (no response from MGW) */ - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); - osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + assignment_failed(fi, GSM0808_CAUSE_EQUIPMENT_FAILURE); break; case MGCP_MGW_HO_TIMEOUT_TIMER_NR: /* Handover failed (no response from MGW) */ osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); -- To view, visit https://gerrit.osmocom.org/9280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ce10a3ead286cdb6ad529fc293b6cecd151cc9a Gerrit-Change-Number: 9280 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:46 +0000 Subject: Change in osmo-bsc[master]: assignment: signal assignment failure on chan act nack Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9281 Change subject: assignment: signal assignment failure on chan act nack ...................................................................... assignment: signal assignment failure on chan act nack When the BTS responds with a Chan Act NACK, i.e. the lchan could not be activated, immediately signal Assignment Failure to the MSC (in handle_chan_nack()). In handle_chan_nack(), adjust log: instead of waiting for timeout, we now signal Assignment Failure. Cosmetic: in this file, the struct bsc_api* is typically named 'bsc', not 'api', so rename the arg. Drop misleading logging from bsc_assign_fail(): instead of transmitting the Assignment Failure message, it actually signals an FSM event. Leave logging of that to the FSM logging. Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270 --- M src/libbsc/bsc_api.c M src/osmo-bsc/osmo_bsc_api.c 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/9281/1 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 8ae781e..043a5a7 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -825,14 +825,15 @@ } static void handle_chan_nack(struct gsm_subscriber_connection *conn, - struct bsc_api *api, struct gsm_lchan *lchan) + struct bsc_api *bsc, struct gsm_lchan *lchan) { if (conn->secondary_lchan != lchan) return; - LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed. Waiting for timeout now\n"); + LOGPLCHAN(lchan, DMSC, LOGL_ERROR, "Channel activation failed.\n"); conn->secondary_lchan->conn = NULL; conn->secondary_lchan = NULL; + bsc->assign_fail(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE, NULL); } static __attribute__((constructor)) void on_dso_load_bsc(void) diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index 8c16bde..e026b69 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -426,7 +426,6 @@ static void bsc_assign_fail(struct gsm_subscriber_connection *conn, uint8_t cause, uint8_t *rr_cause) { - LOGP(DMSC, LOGL_INFO, "Tx MSC ASSIGN FAIL\n"); osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_RR_ASS_FAIL, NULL); } -- To view, visit https://gerrit.osmocom.org/9281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270 Gerrit-Change-Number: 9281 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:46 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:46 +0000 Subject: Change in osmo-bsc[master]: log: fix logging in rsl_rx_chan_act_nack() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9282 Change subject: log: fix logging in rsl_rx_chan_act_nack() ...................................................................... log: fix logging in rsl_rx_chan_act_nack() In each code path within rsl_rx_chan_act_nack(), do separate logging of the NACK to ensure proper termination of each log line. When receiving a Chan Act NACK, we possibly mixed a LOGP() within an unterminated other LOGP() that had not been ended with a LOGPC() yet. Change-Id: Icd2772b21ef3a2ff5af11b7c92dff0ecb4d87ff0 --- M src/libbsc/abis_rsl.c 1 file changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/82/9282/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index ffbf630..39de1b7 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -1328,18 +1328,21 @@ return -1; } - LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK ", - gsm_lchan_name(msg->lchan)); - /* BTS has rejected channel activation ?!? */ - if (dh->ie_chan != RSL_IE_CHAN_NR) + if (dh->ie_chan != RSL_IE_CHAN_NR) { + LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK, and chan nr mismatches\n", + gsm_lchan_name(msg->lchan)); return -EINVAL; + } rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg)-sizeof(*dh)); if (TLVP_PRESENT(&tp, RSL_IE_CAUSE)) { const uint8_t *cause = TLVP_VAL(&tp, RSL_IE_CAUSE); + LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK: ", + gsm_lchan_name(msg->lchan)); print_rsl_cause(LOGL_ERROR, cause, TLVP_LEN(&tp, RSL_IE_CAUSE)); + LOGPC(DRSL, LOGL_ERROR, "\n"); msg->lchan->error_cause = *cause; if (*cause != RSL_ERR_RCH_ALR_ACTV_ALLOC) { rsl_lchan_mark_broken(msg->lchan, "NACK on activation"); @@ -1347,11 +1350,11 @@ rsl_rf_chan_release(msg->lchan, 1, SACCH_DEACTIVATE); } else { + LOGP(DRSL, LOGL_ERROR, "%s CHANNEL ACTIVATE NACK, no cause IE\n", + gsm_lchan_name(msg->lchan)); rsl_lchan_mark_broken(msg->lchan, "NACK on activation no IE"); } - LOGPC(DRSL, LOGL_ERROR, "\n"); - send_lchan_signal(S_LCHAN_ACTIVATE_NACK, msg->lchan, NULL); return 0; } -- To view, visit https://gerrit.osmocom.org/9282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icd2772b21ef3a2ff5af11b7c92dff0ecb4d87ff0 Gerrit-Change-Number: 9282 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:47 +0000 Subject: Change in osmo-bsc[master]: log: assignment: add two logs on unexpected lchan release Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9283 Change subject: log: assignment: add two logs on unexpected lchan release ...................................................................... log: assignment: add two logs on unexpected lchan release Change-Id: Ib61125ebc41e55dc4a6595db8c8559c62b3ed2c0 --- M src/libbsc/bsc_api.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/9283/1 diff --git a/src/libbsc/bsc_api.c b/src/libbsc/bsc_api.c index 043a5a7..0f2bd12 100644 --- a/src/libbsc/bsc_api.c +++ b/src/libbsc/bsc_api.c @@ -777,6 +777,7 @@ switch (signal) { case S_LCHAN_UNEXPECTED_RELEASE: + LOGPLCHAN(lchan, DMSC, LOGL_NOTICE, "S_LCHAN_UNEXPECTED_RELEASE\n"); handle_release(lchan->conn, bsc, lchan); break; case S_LCHAN_ACTIVATE_ACK: @@ -794,6 +795,8 @@ struct bsc_api *bsc, struct gsm_lchan *lchan) { if (conn->secondary_lchan == lchan) { + LOGPLCHAN(lchan, DMSC, LOGL_NOTICE, + "lchan release on new lchan, Assignment failed\n"); osmo_timer_del(&conn->T10); conn->secondary_lchan = NULL; -- To view, visit https://gerrit.osmocom.org/9283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib61125ebc41e55dc4a6595db8c8559c62b3ed2c0 Gerrit-Change-Number: 9283 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:47 +0000 Subject: Change in osmo-bsc[master]: use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9284 Change subject: use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel() ...................................................................... use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel() The guts of bssap_speech_from_lchan() and lchan_to_chosen_channel() have been moved to libosmocore; call that. The functions become mere wrappers to feed the right lchan members. Depends: I8a3cc5d4548e9a78d945d54c69ccced251edcec9 (libosmocore) Change-Id: Ib5c940a9dae11c5e26d4b47fa9d95fef889ad2f6 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 5 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/9284/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 7617dba..e1706d2 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -147,82 +147,15 @@ /* See TS 48.008 3.2.2.11 Channel Type Octet 5 */ static int bssap_speech_from_lchan(const struct gsm_lchan *lchan) { - switch (lchan->type) { - case GSM_LCHAN_TCH_H: - switch (lchan->tch_mode) { - case GSM48_CMODE_SPEECH_V1: - return 0x05; - case GSM48_CMODE_SPEECH_AMR: - return 0x25; - default: - return -1; - } - break; - case GSM_LCHAN_TCH_F: - switch (lchan->tch_mode) { - case GSM48_CMODE_SPEECH_V1: - return 0x01; - case GSM48_CMODE_SPEECH_EFR: - return 0x11; - case GSM48_CMODE_SPEECH_AMR: - return 0x21; - default: - return -1; - } - break; - default: - return -1; - } + return gsm0808_permitted_speech(lchan->type, lchan->tch_mode); } -/* GSM 08.08 3.2.2.33 */ static uint8_t lchan_to_chosen_channel(struct gsm_lchan *lchan) { - uint8_t channel_mode = 0, channel = 0; - - switch (lchan->tch_mode) { - case GSM48_CMODE_SPEECH_V1: - case GSM48_CMODE_SPEECH_EFR: - case GSM48_CMODE_SPEECH_AMR: - channel_mode = 0x9; - break; - case GSM48_CMODE_SIGN: - channel_mode = 0x8; - break; - case GSM48_CMODE_DATA_14k5: - channel_mode = 0xe; - break; - case GSM48_CMODE_DATA_12k0: - channel_mode = 0xb; - break; - case GSM48_CMODE_DATA_6k0: - channel_mode = 0xc; - break; - case GSM48_CMODE_DATA_3k6: - channel_mode = 0xd; - break; - } - - switch (lchan->type) { - case GSM_LCHAN_NONE: - channel = 0x0; - break; - case GSM_LCHAN_SDCCH: - channel = 0x1; - break; - case GSM_LCHAN_TCH_F: - channel = 0x8; - break; - case GSM_LCHAN_TCH_H: - channel = 0x9; - break; - case GSM_LCHAN_UNKNOWN: - default: - LOGP(DMSC, LOGL_ERROR, "Unknown lchan type: %p\n", lchan); - break; - } - - return channel_mode << 4 | channel; + uint8_t chosen_channel = gsm0808_chosen_channel(lchan->tch_mode, lchan->type); + if (!chosen_channel) + LOGP(DMSC, LOGL_ERROR, "Unknown lchan type or TCH mode: %s\n", gsm_lchan_name(lchan)); + return chosen_channel; } /* Generate and send assignment complete message */ -- To view, visit https://gerrit.osmocom.org/9284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5c940a9dae11c5e26d4b47fa9d95fef889ad2f6 Gerrit-Change-Number: 9284 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:47 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:47 +0000 Subject: Change in osmo-bsc[master]: cosmetic: penalty timers: constify, tweak doc Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9285 Change subject: cosmetic: penalty timers: constify, tweak doc ...................................................................... cosmetic: penalty timers: constify, tweak doc Change-Id: I28addc9a16a4c81978290303d368f630a8334228 --- M include/osmocom/bsc/penalty_timers.h M src/libbsc/penalty_timers.c 2 files changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/9285/1 diff --git a/include/osmocom/bsc/penalty_timers.h b/include/osmocom/bsc/penalty_timers.h index 4b1dcce..3aae8a0 100644 --- a/include/osmocom/bsc/penalty_timers.h +++ b/include/osmocom/bsc/penalty_timers.h @@ -10,24 +10,29 @@ * returns an empty struct penalty_timers. */ struct penalty_timers *penalty_timers_init(void *ctx); -/* Add a penalty timer for a BTS. +/* Add a penalty timer for an arbitary object. + * Note: the ownership of for_object remains with the caller; it is handled as a mere void* value, so + * invalid pointers can be handled without problems, while common sense dictates that invalidated + * pointers (freed objects) should probably be removed from this list. More importantly, the pointer must + * match any pointers used to query penalty timers, so for_object should reference some global/singleton + * object that tends to stay around longer than the penalty timers. * param pt: penalty timers list as from penalty_timers_init(). * param for_object: arbitrary pointer reference to store a penalty timer for (passing NULL is possible, * but note that penalty_timers_clear() will clear all timers if given for_object=NULL). * param timeout: penalty time in seconds. */ -void penalty_timers_add(struct penalty_timers *pt, void *for_object, int timeout); +void penalty_timers_add(struct penalty_timers *pt, const void *for_object, int timeout); -/* Return the amount of penalty time remaining for a BTS. +/* Return the amount of penalty time remaining for an object. * param pt: penalty timers list as from penalty_timers_init(). * param for_object: arbitrary pointer reference to query penalty timers for. * returns seconds remaining until all penalty time has expired. */ -unsigned int penalty_timers_remaining(struct penalty_timers *pt, void *for_object); +unsigned int penalty_timers_remaining(struct penalty_timers *pt, const void *for_object); -/* Clear penalty timers for one or all BTS. +/* Clear penalty timers for one or all objects. * param pt: penalty timers list as from penalty_timers_init(). * param for_object: arbitrary pointer reference to clear penalty time for, * or NULL to clear all timers. */ -void penalty_timers_clear(struct penalty_timers *pt, void *for_object); +void penalty_timers_clear(struct penalty_timers *pt, const void *for_object); /* Free a struct as returned from penalty_timers_init(). * Clear all timers from the list, deallocate the list and set the pointer to NULL. diff --git a/src/libbsc/penalty_timers.c b/src/libbsc/penalty_timers.c index b80fec9..02cf246 100644 --- a/src/libbsc/penalty_timers.c +++ b/src/libbsc/penalty_timers.c @@ -34,7 +34,7 @@ struct penalty_timer { struct llist_head entry; - void *for_object; + const void *for_object; unsigned int timeout; }; @@ -55,7 +55,7 @@ return pt; } -void penalty_timers_add(struct penalty_timers *pt, void *for_object, int timeout) +void penalty_timers_add(struct penalty_timers *pt, const void *for_object, int timeout) { struct penalty_timer *timer; unsigned int now; @@ -89,7 +89,7 @@ llist_add_tail(&timer->entry, &pt->timers); } -unsigned int penalty_timers_remaining(struct penalty_timers *pt, void *for_object) +unsigned int penalty_timers_remaining(struct penalty_timers *pt, const void *for_object) { struct penalty_timer *timer; unsigned int now = time_now(); @@ -107,7 +107,7 @@ return max_remaining; } -void penalty_timers_clear(struct penalty_timers *pt, void *for_object) +void penalty_timers_clear(struct penalty_timers *pt, const void *for_object) { struct penalty_timer *timer, *timer2; llist_for_each_entry_safe(timer, timer2, &pt->timers, entry) { -- To view, visit https://gerrit.osmocom.org/9285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I28addc9a16a4c81978290303d368f630a8334228 Gerrit-Change-Number: 9285 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:48 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_subscr_alloc: log initial get Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9286 Change subject: cosmetic: bsc_subscr_alloc: log initial get ...................................................................... cosmetic: bsc_subscr_alloc: log initial get Instead of silently setting the use count to 1, instead increment with an explicit bsc_subsct_get(), which then logs the event along with the place that created the subscriber. Change-Id: Ia72f8010b7b2e1ca44e3b005c0f2c05f3eeae8d5 --- M src/libbsc/bsc_subscriber.c M tests/subscr/bsc_subscr_test.err 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/9286/1 diff --git a/src/libbsc/bsc_subscriber.c b/src/libbsc/bsc_subscriber.c index d9d90ba..65a660b 100644 --- a/src/libbsc/bsc_subscriber.c +++ b/src/libbsc/bsc_subscriber.c @@ -41,7 +41,6 @@ return NULL; llist_add_tail(&bsub->entry, list); - bsub->use_count = 1; return bsub; } @@ -92,7 +91,7 @@ return bsub; bsub = bsc_subscr_alloc(list); bsc_subscr_set_imsi(bsub, imsi); - return bsub; + return bsc_subscr_get(bsub); } struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, @@ -104,7 +103,7 @@ return bsub; bsub = bsc_subscr_alloc(list); bsub->tmsi = tmsi; - return bsub; + return bsc_subscr_get(bsub); } const char *bsc_subscr_name(struct bsc_subscr *bsub) diff --git a/tests/subscr/bsc_subscr_test.err b/tests/subscr/bsc_subscr_test.err index a66317a..afc8bf7 100644 --- a/tests/subscr/bsc_subscr_test.err +++ b/tests/subscr/bsc_subscr_test.err @@ -1,5 +1,8 @@ +DREF BSC subscr IMSI:1234567890 usage increases to: 1 DREF BSC subscr IMSI:1234567890 usage increases to: 2 DREF BSC subscr IMSI:1234567890 usage decreases to: 1 +DREF BSC subscr IMSI:9876543210 usage increases to: 1 +DREF BSC subscr IMSI:5656565656 usage increases to: 1 DREF BSC subscr IMSI:1234567890 usage increases to: 2 DREF BSC subscr IMSI:1234567890 usage decreases to: 1 DREF BSC subscr IMSI:9876543210 usage increases to: 2 -- To view, visit https://gerrit.osmocom.org/9286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia72f8010b7b2e1ca44e3b005c0f2c05f3eeae8d5 Gerrit-Change-Number: 9286 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:48 +0000 Subject: Change in osmo-bsc[master]: gscon: put subscriber a little later Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9287 Change subject: gscon: put subscriber a little later ...................................................................... gscon: put subscriber a little later Keep the bsc_subscr associated with the conn as long as possible, to benefit logging, which then contains the subscriber identity (if any). Change-Id: Ifa528b58842a02509bfe0af6915c64bd67058bcd --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/9287/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index e1706d2..9f44078 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -967,12 +967,6 @@ conn->lchan = NULL; } - if (conn->bsub) { - LOGPFSML(fi, LOGL_DEBUG, "Putting bsc_subscr\n"); - bsc_subscr_put(conn->bsub); - conn->bsub = NULL; - } - if (conn->sccp.state != SUBSCR_SCCP_ST_NONE) { LOGPFSML(fi, LOGL_DEBUG, "Disconnecting SCCP\n"); struct bsc_msc_data *msc = conn->sccp.msc; @@ -986,6 +980,12 @@ penalty_timers_free(&conn->hodec2.penalty_timers); + if (conn->bsub) { + LOGPFSML(fi, LOGL_DEBUG, "Putting bsc_subscr\n"); + bsc_subscr_put(conn->bsub); + conn->bsub = NULL; + } + llist_del(&conn->entry); talloc_free(conn); fi->priv = NULL; -- To view, visit https://gerrit.osmocom.org/9287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ifa528b58842a02509bfe0af6915c64bd67058bcd Gerrit-Change-Number: 9287 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:48 +0000 Subject: Change in osmo-bsc[master]: try to pick up subsrc IMSI on l3-compl Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9288 Change subject: try to pick up subsrc IMSI on l3-compl ...................................................................... try to pick up subsrc IMSI on l3-compl This is a tiny step towards being aware of a connection's subscriber identity. Iff the Layer 3 Complete message contains an IMSI, associate a bsc_subscr with the conn, so that subsequent logging and possibly meas_feed contains the IMSI. For any L3 Complete using TMSI, this has no effect whatsoever. Related: OS#2969 Change-Id: I3b696a0c0932e3abcb682ba231db65755d8c27a6 --- M src/osmo-bsc/osmo_bsc_api.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/9288/1 diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index e026b69..4773488 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -20,10 +20,12 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -261,8 +263,22 @@ return BSC_API_CONN_POL_REJECT; } - if (imsi) + /* TODO: also extract TMSI. We get an IMSI only when an initial L3 Complete comes in that + * contains an IMSI. We filter by IMSI. A TMSI identity is never returned here, see e.g. + * _cr_check_loc_upd() and other similar functions called from bsc_msg_filter_initial(). */ + if (imsi) { conn->filter_state.imsi = talloc_steal(conn, imsi); + if (conn->bsub) { + /* Already a subscriber on L3 Complete? Should never happen... */ + if (conn->bsub->imsi[0] + && strcmp(conn->bsub->imsi, imsi)) + LOGP(DMSC, LOGL_ERROR, "Subscriber's IMSI changes from %s to %s\n", + conn->bsub->imsi, imsi); + bsc_subscr_set_imsi(conn->bsub, imsi); + } else + conn->bsub = bsc_subscr_find_or_create_by_imsi(msc->network->bsc_subscribers, + imsi); + } conn->filter_state.con_type = con_type; /* check return value, if failed check msg for and send USSD */ -- To view, visit https://gerrit.osmocom.org/9288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b696a0c0932e3abcb682ba231db65755d8c27a6 Gerrit-Change-Number: 9288 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:48 +0000 Subject: Change in osmo-bsc[master]: store subscriber identity on paging Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9289 Change subject: store subscriber identity on paging ...................................................................... store subscriber identity on paging Another small step towards being aware of the subscriber identity. Any connection initiated by paging will subsequently log the subscriber's identity -- of course not necessarily the IMSI, if paging was done by TMSI. This is only for Paging, not the Paging Response; for that see, L3 Complete. Related: OS#2969 Change-Id: I0ab7bedfe693bb4e42a04fb0585b94a730ff2d9b --- M src/libbsc/paging.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/9289/1 diff --git a/src/libbsc/paging.c b/src/libbsc/paging.c index cdcae51..820921c 100644 --- a/src/libbsc/paging.c +++ b/src/libbsc/paging.c @@ -388,6 +388,7 @@ struct gsm_bts *bts; log_set_context(LOG_CTX_BSC_SUBSCR, bsub); + conn->bsub = bsc_subscr_get(bsub); /* Stop this first and dispatch the request */ if (_bts) { -- To view, visit https://gerrit.osmocom.org/9289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0ab7bedfe693bb4e42a04fb0585b94a730ff2d9b Gerrit-Change-Number: 9289 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:49 +0000 Subject: Change in osmo-bsc[master]: cosmetic: handover_test: add IMSI to subscr for logging Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9290 Change subject: cosmetic: handover_test: add IMSI to subscr for logging ...................................................................... cosmetic: handover_test: add IMSI to subscr for logging Change-Id: I52fa8f3183c93ed362d8252d20daf00c60a117c8 --- M tests/handover/handover_test.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/9290/1 diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index caa57c1..926ecda 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -242,8 +242,12 @@ void create_conn(struct gsm_lchan *lchan) { + static unsigned int next_imsi = 0; + char imsi[sizeof(lchan->conn->bsub->imsi)]; + struct gsm_network *net = lchan->ts->trx->bts->network; struct gsm_subscriber_connection *conn; - conn = bsc_subscr_con_allocate(lchan->ts->trx->bts->network); + + conn = bsc_subscr_con_allocate(net); /* CAUTION HACK: When __real_mgcp_conn_modify() is called by the GSCON * FSM, then we need to know the reference to caller FSM (GSCON FSM). @@ -257,6 +261,12 @@ lchan->conn = conn; conn->lchan = lchan; + + /* Make up a new IMSI for this test, for logging the subscriber */ + next_imsi ++; + snprintf(imsi, sizeof(imsi), "%06u", next_imsi); + lchan->conn->bsub = bsc_subscr_find_or_create_by_imsi(net->bsc_subscribers, imsi); + /* kick the FSM from INIT through to the ACTIVE state */ osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, NULL); osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_CFM, NULL); -- To view, visit https://gerrit.osmocom.org/9290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I52fa8f3183c93ed362d8252d20daf00c60a117c8 Gerrit-Change-Number: 9290 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 16:59:49 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 16:59:49 +0000 Subject: Change in osmo-bsc[master]: HO: introduce T7, T8, T101 timers Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9291 Change subject: HO: introduce T7, T8, T101 timers ...................................................................... HO: introduce T7, T8, T101 timers Will be used in upcoming inter-BSC handover. Change-Id: If9ecccc793426d214019f299b19d6ffa5a186546 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/bsc_vty.c M src/libbsc/net_init.c 3 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/91/9291/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5ba4362..aee7c5e 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1174,6 +1174,9 @@ #define GSM_T3119_DEFAULT 10 #define GSM_T3122_DEFAULT 10 #define GSM_T3141_DEFAULT 10 +#define GSM_T7_DEFAULT 10 /* inter-BSC MO Handover first timeout, in seconds */ +#define GSM_T8_DEFAULT 10 /* inter-BSC MO Handover second timeout, in seconds */ +#define GSM_T101_DEFAULT 10 /* inter-BSC MT Handover timeout, in seconds */ struct gsm_tz { int override; /* if 0, use system's time zone instead. */ @@ -1210,7 +1213,7 @@ /* timer values */ int T3101; - int T3103; + int T3103; /*< Handover timeout */ int T3105; int T3107; int T3109; @@ -1221,6 +1224,9 @@ int T3119; int T3122; int T3141; + int T7; /*< inter-BSC handover MO timeout from Handover Required to Handover Command */ + int T8; /*< inter-BSC handover MO timeout from Handover Command to final Clear*/ + int T101; /*< inter-BSC handover MT timeout from Handover Request to Handover Accept */ enum gsm_chan_t ctype_by_chreq[_NUM_CHREQ_T]; diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index e53a14f..ee00d04 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -1001,6 +1001,10 @@ VTY_OUT_TIMER(3119); VTY_OUT_TIMER(3122); VTY_OUT_TIMER(3141); + VTY_OUT_TIMER(7); + VTY_OUT_TIMER(8); + VTY_OUT_TIMER(101); + if (!gsmnet->dyn_ts_allow_tch_f) vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE); if (gsmnet->tz.override != 0) { @@ -1898,6 +1902,9 @@ DECLARE_TIMER(3119, "Currently not used") DECLARE_TIMER(3122, "Default waiting time (seconds) after IMM ASS REJECT") DECLARE_TIMER(3141, "Currently not used") +DECLARE_TIMER(7, "Set the outgoing inter-BSC Handover timeout, from Handover Required to Handover Command") +DECLARE_TIMER(8, "Set the outgoing inter-BSC Handover timeout, from Handover Command to final Clear") +DECLARE_TIMER(101, "Set the incoming inter-BSC Handover timeout, from Handover Request to Accept") DEFUN_DEPRECATED(cfg_net_dtx, cfg_net_dtx_cmd, @@ -4823,6 +4830,9 @@ install_element(GSMNET_NODE, &cfg_net_T3119_cmd); install_element(GSMNET_NODE, &cfg_net_T3122_cmd); install_element(GSMNET_NODE, &cfg_net_T3141_cmd); + install_element(GSMNET_NODE, &cfg_net_T7_cmd); + install_element(GSMNET_NODE, &cfg_net_T8_cmd); + install_element(GSMNET_NODE, &cfg_net_T101_cmd); install_element(GSMNET_NODE, &cfg_net_dtx_cmd); install_element(GSMNET_NODE, &cfg_net_pag_any_tch_cmd); /* See also handover commands added on net level from handover_vty.c */ diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c index f03a2e1..d8b2093 100644 --- a/src/libbsc/net_init.c +++ b/src/libbsc/net_init.c @@ -89,6 +89,9 @@ net->T3119 = GSM_T3119_DEFAULT; net->T3122 = GSM_T3122_DEFAULT; net->T3141 = GSM_T3141_DEFAULT; + net->T7 = GSM_T7_DEFAULT; + net->T8 = GSM_T8_DEFAULT; + net->T101 = GSM_T101_DEFAULT; net->ho = ho_cfg_init(net, NULL); net->hodec2.congestion_check_interval_s = HO_CFG_CONGESTION_CHECK_DEFAULT; -- To view, visit https://gerrit.osmocom.org/9291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9ecccc793426d214019f299b19d6ffa5a186546 Gerrit-Change-Number: 9291 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:19:41 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Thu, 24 May 2018 17:19:41 +0000 Subject: Change in osmo-bsc[master]: cosmetic: gscon: drop odd use of OSMO_STRINGIFY Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9292 Change subject: cosmetic: gscon: drop odd use of OSMO_STRINGIFY ...................................................................... cosmetic: gscon: drop odd use of OSMO_STRINGIFY Do not invoke OSMO_STRINGIFY() with arbitrary names, just quote instead. The idea was that OSMO_STRINGIFY() avoids typos by ensuring well-defined names are stringified, but this highlights that OSMO_STRINGIFY() is in fact usable with completely arbitrary arguments and actually lacks the validation part :/ Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/9292/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 9f44078..84d4cc8 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -791,19 +791,19 @@ static const struct osmo_fsm_state gscon_fsm_states[] = { [ST_INIT] = { - .name = OSMO_STRINGIFY(INIT), + .name = "INIT", .in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND), .out_state_mask = S(ST_WAIT_CC), .action = gscon_fsm_init, }, [ST_WAIT_CC] = { - .name = OSMO_STRINGIFY(WAIT_CC), + .name = "WAIT_CC", .in_event_mask = S(GSCON_EV_A_CONN_CFM), .out_state_mask = S(ST_ACTIVE), .action = gscon_fsm_wait_cc, }, [ST_ACTIVE] = { - .name = OSMO_STRINGIFY(ACTIVE), + .name = "ACTIVE", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) | S(GSCON_EV_A_HO_REQ) | S(GSCON_EV_HO_START), .out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) | @@ -811,37 +811,37 @@ .action = gscon_fsm_active, }, [ST_WAIT_CRCX_BTS] = { - .name = OSMO_STRINGIFY(WAIT_CRCX_BTS), + .name = "WAIT_CRCX_BTS", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_BTS), .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_ASS_CMPL), .action = gscon_fsm_wait_crcx_bts, }, [ST_WAIT_ASS_CMPL] = { - .name = OSMO_STRINGIFY(WAIT_ASS_CMPL), + .name = "WAIT_ASS_CMPL", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_ASS_COMPL) | S(GSCON_EV_RR_ASS_FAIL), .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS), .action = gscon_fsm_wait_ass_cmpl, }, [ST_WAIT_MDCX_BTS] = { - .name = OSMO_STRINGIFY(WAIT_MDCX_BTS), + .name = "WAIT_MDCX_BTS", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS), .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_CRCX_MSC), .action = gscon_fsm_wait_mdcx_bts, }, [ST_WAIT_CRCX_MSC] = { - .name = OSMO_STRINGIFY(WAIT_CRCX_MSC), + .name = "WAIT_CRCX_MSC", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_CRCX_RESP_MSC), .out_state_mask = S(ST_ACTIVE), .action = gscon_fsm_wait_crcx_msc, }, [ST_WAIT_MODE_MODIFY_ACK] = { - .name = OSMO_STRINGIFY(WAIT_MODE_MODIFY_ACK), + .name = "WAIT_MODE_MODIFY_ACK", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_MODE_MODIFY_ACK), .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING), .action = gscon_fsm_wait_mode_modify_ack, }, [ST_CLEARING] = { - .name = OSMO_STRINGIFY(CLEARING), + .name = "CLEARING", .in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL), .action = gscon_fsm_clearing, }, @@ -850,27 +850,27 @@ * program flow in handover_logic.c a bit and handle some of the logic * here? */ [ST_WAIT_MT_HO_ACC] = { - .name = OSMO_STRINGIFY(WAIT_MT_HO_ACC), + .name = "WAIT_MT_HO_ACC", }, [ST_WAIT_MT_HO_COMPL] = { - .name = OSMO_STRINGIFY(WAIT_MT_HO_COMPL), + .name = "WAIT_MT_HO_COMPL", }, [ST_WAIT_MO_HO_CMD] = { - .name = OSMO_STRINGIFY(WAIT_MO_HO_CMD), + .name = "WAIT_MO_HO_CMD", }, [ST_MO_HO_PROCEEDING] = { - .name = OSMO_STRINGIFY(MO_HO_PROCEEDING), + .name = "MO_HO_PROCEEDING", }, /* Internal handover */ [ST_WAIT_HO_COMPL] = { - .name = OSMO_STRINGIFY(WAIT_HO_COMPL), + .name = "WAIT_HO_COMPL", .in_event_mask = S(GSCON_EV_HO_COMPL) | S(GSCON_EV_HO_FAIL) | S(GSCON_EV_HO_TIMEOUT), .out_state_mask = S(ST_ACTIVE) | S(ST_WAIT_MDCX_BTS_HO) | S(ST_CLEARING), .action = gscon_fsm_wait_ho_compl, }, [ST_WAIT_MDCX_BTS_HO] = { - .name = OSMO_STRINGIFY(WAIT_MDCX_BTS_HO), + .name = "WAIT_MDCX_BTS_HO", .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_MGW_MDCX_RESP_BTS), .action = gscon_fsm_wait_mdcx_bts_ho, .out_state_mask = S(ST_ACTIVE), -- To view, visit https://gerrit.osmocom.org/9292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1 Gerrit-Change-Number: 9292 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:53:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:53:25 +0000 Subject: Change in libosmocore[master]: Add a 'show rate-counters' VTY command. In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9278 ) Change subject: Add a 'show rate-counters' VTY command. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Gerrit-Change-Number: 9278 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 17:53:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:55:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:55:35 +0000 Subject: Change in osmo-ci[master]: ansible: add a simple README.md In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9276 ) Change subject: ansible: add a simple README.md ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96057bb92faa8e3375c5bad20ef1536475807b67 Gerrit-Change-Number: 9276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 17:55:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:55:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:55:48 +0000 Subject: Change in osmo-ci[master]: ansible/setup-gsm-tester: add docker In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9274 ) Change subject: ansible/setup-gsm-tester: add docker ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idfd96c4e3556b93ca85acb94a2176ec269a906d1 Gerrit-Change-Number: 9274 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 17:55:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:55:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:55:57 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: add jenkins to the dialout group In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9275 ) Change subject: ansible: gsm-tester: add jenkins to the dialout group ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icc7b3fa9ca7c14360d78069d8d42e6039afda32b Gerrit-Change-Number: 9275 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 17:55:57 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:56:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:56:01 +0000 Subject: Change in osmo-ci[master]: ansible/setup-gsm-tester: add docker In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9274 ) Change subject: ansible/setup-gsm-tester: add docker ...................................................................... ansible/setup-gsm-tester: add docker Change-Id: Idfd96c4e3556b93ca85acb94a2176ec269a906d1 --- M ansible/setup-gsm-tester.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/setup-gsm-tester.yml b/ansible/setup-gsm-tester.yml index a1a0389..36c8287 100644 --- a/ansible/setup-gsm-tester.yml +++ b/ansible/setup-gsm-tester.yml @@ -38,6 +38,11 @@ tags: - jenkins-slave + - name: docker + jenkins_user: jenkins + tags: + - docker + - name: udhcpd udhcpd_router: 10.42.42.1 udhcpd_range_start: 10.42.42.230 -- To view, visit https://gerrit.osmocom.org/9274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfd96c4e3556b93ca85acb94a2176ec269a906d1 Gerrit-Change-Number: 9274 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:56:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:56:02 +0000 Subject: Change in osmo-ci[master]: ansible: gsm-tester: add jenkins to the dialout group In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9275 ) Change subject: ansible: gsm-tester: add jenkins to the dialout group ...................................................................... ansible: gsm-tester: add jenkins to the dialout group To access tty* Change-Id: Icc7b3fa9ca7c14360d78069d8d42e6039afda32b --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index f7eb1ee..2b00270 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -150,6 +150,7 @@ with_items: - systemd-journal - osmo-gsm-tester + - dialout - name: setup state directory file: -- To view, visit https://gerrit.osmocom.org/9275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icc7b3fa9ca7c14360d78069d8d42e6039afda32b Gerrit-Change-Number: 9275 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:56:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:56:02 +0000 Subject: Change in osmo-ci[master]: ansible: add a simple README.md In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9276 ) Change subject: ansible: add a simple README.md ...................................................................... ansible: add a simple README.md Change-Id: I96057bb92faa8e3375c5bad20ef1536475807b67 --- A ansible/README.md 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/README.md b/ansible/README.md new file mode 100644 index 0000000..21763f4 --- /dev/null +++ b/ansible/README.md @@ -0,0 +1,20 @@ +# ansible repository + +Ansible is an automisation, provisioning and configuration management utility. + +# How to use it? + +- you need ansible installed (version 2.4, other might work as well) + +# How to setup the gsm-tester? + +`ansible-playbook -i hosts setup-gsm-tester.yml` + +Your ssh key need to be deployed on the host. +Further information on this job can be found in **setup-gsm-tester.md**. + +# How to setup a jenkin slave? + +`ansible-playbook -i hosts setup-jenkins-slave.yml` + +Further information on this job and around the setup can be found on the redmine wiki. -- To view, visit https://gerrit.osmocom.org/9276 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96057bb92faa8e3375c5bad20ef1536475807b67 Gerrit-Change-Number: 9276 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:57:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:57:31 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 3: Code-Review+2 just a general comment: Have you seen udtrace which I created for better tracing on the MNCC socket? See https://github.com/laf0rge/udtrace -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 24 May 2018 17:57:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:58:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:58:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: PCUIF_CodecPort: Log PCU socket connect error string In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9273 ) Change subject: library: PCUIF_CodecPort: Log PCU socket connect error string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7045061770cda5b50d05dbf756656e380084a703 Gerrit-Change-Number: 9273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 24 May 2018 17:58:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 17:58:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 17:58:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: PCUIF_CodecPort: Log PCU socket connect error string In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9273 ) Change subject: library: PCUIF_CodecPort: Log PCU socket connect error string ...................................................................... library: PCUIF_CodecPort: Log PCU socket connect error string Change-Id: I7045061770cda5b50d05dbf756656e380084a703 --- M library/PCUIF_CodecPort.ttcn 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index fe428af..c642202 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -65,7 +65,11 @@ [] pt.receive(UD_connect_result:?) -> value res { if (ispresent(res.result) and ispresent(res.result.result_code) and res.result.result_code == ERROR) { - setverdict(fail, "Error connecting to PCU socket"); + if (ispresent(res.result.err)) { + setverdict(fail, "Error connecting to PCU socket: ", res.result.err); + } else { + setverdict(fail, "Error connecting to PCU socket"); + } self.stop; } else { return res.id; -- To view, visit https://gerrit.osmocom.org/9273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7045061770cda5b50d05dbf756656e380084a703 Gerrit-Change-Number: 9273 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 24 18:03:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 24 May 2018 18:03:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP/IPA integration: Wait for SCCPLite to be established Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9293 Change subject: BSSAP/IPA integration: Wait for SCCPLite to be established ...................................................................... BSSAP/IPA integration: Wait for SCCPLite to be established Before this patch, we had some problems related to synchronization between the IPA transport, SCCP emulation and BSSAP layer in SCCPlite configurations. This code ensures that f_bssap_init() will block until the IPA connection (client or server) is established, and then start the SCCP and BSSAP emulation components in the right order. This in turn ensures that the initial BSSMAP RESET that we're sending from the TTCN-3 side is only sent once the IPA connection is fully established, and the CCM Identity handshake has happened before. Change-Id: I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 Related: OS#2544 --- M library/BSSAP_Adapter.ttcn M library/IPA_Emulation.ttcnpp 2 files changed, 44 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/9293/1 diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 1a9fdb4..7404a6f 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -28,8 +28,9 @@ type record BSSAP_Adapter { /* component references */ - M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ - IPA_Emulation_CT vc_IPA, /* only in SCCPliste */ + M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ + IPA_Emulation_CT vc_IPA, /* only in SCCPlite */ + IPA_EventWaiter_CT vc_WAIT, /* only in SCCPlite */ SCCP_CT vc_SCCP, MSC_SCCP_MTP3_parameters sccp_pars, @@ -114,18 +115,32 @@ map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); /* connect MTP3 service provider (IPA) to lower side of SCCP */ connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT"); + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, cfg.sctp_addr.local_sctp_port)); + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } case (BSSAP_TRANSPORT_SCCPlite_CLIENT) { ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA"); map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); /* connect MTP3 service provider (IPA) to lower side of SCCP */ connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT"); + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr, cfg.sctp_addr.remote_sctp_port, cfg.sctp_addr.local_ip_addr, cfg.sctp_addr.local_sctp_port)); + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } case else { setverdict(fail, "Unsuppored BSSAP_Transport"); @@ -133,8 +148,6 @@ } } - ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); - if (isvalue(ops)) { timer T := 5.0; T.start; @@ -145,6 +158,9 @@ /* start the BSSMAP emulation */ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } + + ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); + } diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 41a3968..df2b15e 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -243,6 +243,9 @@ } private function f_send_IPA_EVT(template ASP_IPA_Event evt) runs on IPA_Emulation_CT { + if (IPA_SP_PORT.checkstate("Connected")) { + IPA_SP_PORT.send(evt); + } #ifdef IPA_EMULATION_RSL if (IPA_RSL_PORT.checkstate("Connected")) { IPA_RSL_PORT.send(evt); @@ -368,6 +371,7 @@ * the TCP connection is established. Other implementations may differ. * We currently ignore it completely - but actually we should make sure that * one ID_ACK is received by the server at some point */ + f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK)); } case (IPAC_MSGT_ID_RESP) { log("IPA ID RESP: ", ccm.u.resp); @@ -635,4 +639,24 @@ } } +/*********************************************************************** + * IPA Event waiter component. Wait for ASP_IPA_EVENT_ID_ACK + ***********************************************************************/ + +type component IPA_EventWaiter_CT { + port IPA_SP_PT IPA_SP_PORT; +} + +function waiter_main(template ASP_IPA_Event wait_for := t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK)) +runs on IPA_EventWaiter_CT { + + alt { + [] IPA_SP_PORT.receive(wait_for) { + setverdict(pass); + } + [] IPA_SP_PORT.receive { repeat; } + } +} + + } -- To view, visit https://gerrit.osmocom.org/9293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 Gerrit-Change-Number: 9293 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu May 24 22:21:28 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 May 2018 22:21:28 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#45?= In-Reply-To: <876597982.141.1527115281069.JavaMail.jenkins@jenkins.osmocom.org> References: <876597982.141.1527115281069.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1174115114.151.1527200488470.JavaMail.jenkins@jenkins.osmocom.org> See Changes: [steve] tuner_r82xx: turn off loop-through, remove dead code ------------------------------------------ [...truncated 93.31 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-13275/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-13275/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-13275/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-13275/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-13275/ libtool: install: (cd /tmp/am-dc-13275/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-13275/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-13275/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-13275/ libtool: install: chmod 644 /tmp/am-dc-13275/ libtool: install: ranlib /tmp/am-dc-13275/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-13275/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-13275/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-13275/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-13275/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-13275/ /bin/mkdir -p '/tmp/am-dc-13275/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-13275/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-13275/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-13275/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-13275/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-13275/ libtool: uninstall: rm -f /tmp/am-dc-13275/ /tmp/am-dc-13275/ /tmp/am-dc-13275/ /tmp/am-dc-13275/ /tmp/am-dc-13275/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-13275/ && rm -f html.tar ) ( cd '/tmp/am-dc-13275/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-13275/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Thu May 24 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 24 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#46?= In-Reply-To: <1174115114.151.1527200488470.JavaMail.jenkins@jenkins.osmocom.org> References: <1174115114.151.1527200488470.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1128581355.152.1527201681037.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20313/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-20313/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-20313/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-20313/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-20313/ libtool: install: (cd /tmp/am-dc-20313/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-20313/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-20313/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-20313/ libtool: install: chmod 644 /tmp/am-dc-20313/ libtool: install: ranlib /tmp/am-dc-20313/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-20313/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-20313/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-20313/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-20313/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-20313/ /bin/mkdir -p '/tmp/am-dc-20313/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-20313/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-20313/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-20313/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-20313/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-20313/ libtool: uninstall: rm -f /tmp/am-dc-20313/ /tmp/am-dc-20313/ /tmp/am-dc-20313/ /tmp/am-dc-20313/ /tmp/am-dc-20313/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-20313/ && rm -f html.tar ) ( cd '/tmp/am-dc-20313/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-20313/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Fri May 25 06:34:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:34:23 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Logging: Log mncc_names in mncc_data() Links libosmocore (libosmogsm) for access to osmo_mncc_name() Remove reference to get_mncc_name() in src/mncc_protocol.h Uses osmo_mncc_name() to output to debug log which MNCC_* message was received. Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac --- M configure.ac M src/Makefile.am M src/mncc.c M src/mncc_protocol.h 4 files changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 20b682e..e84cb83 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ AC_PROG_CC PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) diff --git a/src/Makefile.am b/src/Makefile.am index b90e38c..7a955fa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = osmo-sip-connector -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(SOFIASIP_CFLAGS) +AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(SOFIASIP_CFLAGS) noinst_HEADERS = \ evpoll.h vty.h mncc_protocol.h app.h mncc.h sip.h call.h sdp.h logging.h @@ -17,4 +17,5 @@ osmo_sip_connector_LDADD = \ $(SOFIASIP_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOVTY_LIBS) + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOGSM_LIBS) diff --git a/src/mncc.c b/src/mncc.c index c0c082b..3b9f0f4 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -820,6 +820,9 @@ } memcpy(&msg_type, buf, 4); + + LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n", osmo_mncc_name(msg_type)); + switch (msg_type) { case MNCC_SOCKET_HELLO: check_hello(conn, buf, rc); diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 49f0c8b..4950a77 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -196,7 +196,6 @@ uint32_t callref[2]; }; -const char *get_mncc_name(int value); void mncc_set_cause(struct gsm_mncc *data, int loc, int val); void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:37:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:37:20 +0000 Subject: Change in osmo-bsc[master]: add bsc_stubs.h to workaround linking hell for utils and tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9279 ) Change subject: add bsc_stubs.h to workaround linking hell for utils and tests ...................................................................... Patch Set 1: what's the plan to get rid of this? This can only be a temporary work-around, right? What's the argument against simply moving libbsc/* to osmo-bsc/ ? The original reason to have libbsc was that we can generate both the osmo-nitb and the osmo-bsc[-sccplite] binaries from it. -- To view, visit https://gerrit.osmocom.org/9279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000be689ed071aced1a085284f924a7e77e5656d Gerrit-Change-Number: 9279 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 06:37:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:38:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:38:11 +0000 Subject: Change in osmo-bsc[master]: cosmetic: gscon: undup code: add common assignment_failed() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9280 ) Change subject: cosmetic: gscon: undup code: add common assignment_failed() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9280 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ce10a3ead286cdb6ad529fc293b6cecd151cc9a Gerrit-Change-Number: 9280 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:38:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:40:21 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:40:21 +0000 Subject: Change in osmo-bsc[master]: assignment: signal assignment failure on chan act nack In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9281 ) Change subject: assignment: signal assignment failure on chan act nack ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9281/1/src/osmo-bsc/osmo_bsc_api.c File src/osmo-bsc/osmo_bsc_api.c: https://gerrit.osmocom.org/#/c/9281/1/src/osmo-bsc/osmo_bsc_api.c at 429 PS1, Line 429: osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_RR_ASS_FAIL, NULL); rather than having a function that consists of only one other function call (and discarding two thirds of the function arguments), I suggest to remove this entirely? -- To view, visit https://gerrit.osmocom.org/9281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270 Gerrit-Change-Number: 9281 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 06:40:21 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:41:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:41:08 +0000 Subject: Change in osmo-bsc[master]: log: fix logging in rsl_rx_chan_act_nack() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9282 ) Change subject: log: fix logging in rsl_rx_chan_act_nack() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icd2772b21ef3a2ff5af11b7c92dff0ecb4d87ff0 Gerrit-Change-Number: 9282 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:41:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:41:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:41:34 +0000 Subject: Change in osmo-bsc[master]: log: assignment: add two logs on unexpected lchan release In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9283 ) Change subject: log: assignment: add two logs on unexpected lchan release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib61125ebc41e55dc4a6595db8c8559c62b3ed2c0 Gerrit-Change-Number: 9283 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:41:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:42:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:42:00 +0000 Subject: Change in osmo-bsc[master]: use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9284 ) Change subject: use libosmocore's gsm0808_permitted_speech(), gsm0808_chosen_channel() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib5c940a9dae11c5e26d4b47fa9d95fef889ad2f6 Gerrit-Change-Number: 9284 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:42:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:43:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:43:07 +0000 Subject: Change in osmo-bsc[master]: cosmetic: penalty timers: constify, tweak doc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9285 ) Change subject: cosmetic: penalty timers: constify, tweak doc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I28addc9a16a4c81978290303d368f630a8334228 Gerrit-Change-Number: 9285 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:43:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:43:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:43:30 +0000 Subject: Change in osmo-bsc[master]: cosmetic: bsc_subscr_alloc: log initial get In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9286 ) Change subject: cosmetic: bsc_subscr_alloc: log initial get ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia72f8010b7b2e1ca44e3b005c0f2c05f3eeae8d5 Gerrit-Change-Number: 9286 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:43:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:43:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:43:50 +0000 Subject: Change in osmo-bsc[master]: gscon: put subscriber a little later In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9287 ) Change subject: gscon: put subscriber a little later ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9287 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifa528b58842a02509bfe0af6915c64bd67058bcd Gerrit-Change-Number: 9287 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:43:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:46:34 +0000 Subject: Change in osmo-bsc[master]: try to pick up subsrc IMSI on l3-compl In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9288 ) Change subject: try to pick up subsrc IMSI on l3-compl ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9288 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b696a0c0932e3abcb682ba231db65755d8c27a6 Gerrit-Change-Number: 9288 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:46:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:48:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:48:18 +0000 Subject: Change in osmo-bsc[master]: store subscriber identity on paging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9289 ) Change subject: store subscriber identity on paging ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9289/1/src/libbsc/paging.c File src/libbsc/paging.c: https://gerrit.osmocom.org/#/c/9289/1/src/libbsc/paging.c at 391 PS1, Line 391: conn->bsub = bsc_subscr_get(bsub); this looks a bit odd as we're only incrementing the bsup use count in this patch, but we don't add a corresponding put. I presume the put has already existed before? -- To view, visit https://gerrit.osmocom.org/9289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ab7bedfe693bb4e42a04fb0585b94a730ff2d9b Gerrit-Change-Number: 9289 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:48:18 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:49:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:49:09 +0000 Subject: Change in osmo-bsc[master]: cosmetic: handover_test: add IMSI to subscr for logging In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9290 ) Change subject: cosmetic: handover_test: add IMSI to subscr for logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9290 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I52fa8f3183c93ed362d8252d20daf00c60a117c8 Gerrit-Change-Number: 9290 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:49:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:50:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:50:04 +0000 Subject: Change in osmo-bsc[master]: HO: introduce T7, T8, T101 timers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9291 ) Change subject: HO: introduce T7, T8, T101 timers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9291 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9ecccc793426d214019f299b19d6ffa5a186546 Gerrit-Change-Number: 9291 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:50:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 06:50:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 06:50:26 +0000 Subject: Change in osmo-bsc[master]: cosmetic: gscon: drop odd use of OSMO_STRINGIFY In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9292 ) Change subject: cosmetic: gscon: drop odd use of OSMO_STRINGIFY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I458cd2cd0d6ddb0e6db3bb8d546a20336ae8c5f1 Gerrit-Change-Number: 9292 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 06:50:26 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 07:46:34 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 07:46:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP/IPA integration: Wait for SCCPLite to be established In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9293 ) Change subject: BSSAP/IPA integration: Wait for SCCPLite to be established ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 Gerrit-Change-Number: 9293 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 07:46:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 07:46:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 07:46:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP/IPA integration: Wait for SCCPLite to be established In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9293 ) Change subject: BSSAP/IPA integration: Wait for SCCPLite to be established ...................................................................... BSSAP/IPA integration: Wait for SCCPLite to be established Before this patch, we had some problems related to synchronization between the IPA transport, SCCP emulation and BSSAP layer in SCCPlite configurations. This code ensures that f_bssap_init() will block until the IPA connection (client or server) is established, and then start the SCCP and BSSAP emulation components in the right order. This in turn ensures that the initial BSSMAP RESET that we're sending from the TTCN-3 side is only sent once the IPA connection is fully established, and the CCM Identity handshake has happened before. Change-Id: I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 Related: OS#2544 --- M library/BSSAP_Adapter.ttcn M library/IPA_Emulation.ttcnpp 2 files changed, 44 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 1a9fdb4..7404a6f 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -28,8 +28,9 @@ type record BSSAP_Adapter { /* component references */ - M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ - IPA_Emulation_CT vc_IPA, /* only in SCCPliste */ + M3UA_CT vc_M3UA, /* only in 3GPP AoIP */ + IPA_Emulation_CT vc_IPA, /* only in SCCPlite */ + IPA_EventWaiter_CT vc_WAIT, /* only in SCCPlite */ SCCP_CT vc_SCCP, MSC_SCCP_MTP3_parameters sccp_pars, @@ -114,18 +115,32 @@ map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); /* connect MTP3 service provider (IPA) to lower side of SCCP */ connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT"); + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr, cfg.sctp_addr.local_sctp_port)); + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } case (BSSAP_TRANSPORT_SCCPlite_CLIENT) { ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA"); map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT); /* connect MTP3 service provider (IPA) to lower side of SCCP */ connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT); + /* connect waiter to general IPA port (for ASP_IPA_Event) */ + ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT"); + connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); + ba.vc_WAIT.start(IPA_Emulation.waiter_main()); ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr, cfg.sctp_addr.remote_sctp_port, cfg.sctp_addr.local_ip_addr, cfg.sctp_addr.local_sctp_port)); + /* wait until we received an IPA CCM ID_ACK */ + ba.vc_WAIT.done; + disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT); } case else { setverdict(fail, "Unsuppored BSSAP_Transport"); @@ -133,8 +148,6 @@ } } - ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); - if (isvalue(ops)) { timer T := 5.0; T.start; @@ -145,6 +158,9 @@ /* start the BSSMAP emulation */ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } + + ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); + } diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp index 41a3968..df2b15e 100644 --- a/library/IPA_Emulation.ttcnpp +++ b/library/IPA_Emulation.ttcnpp @@ -243,6 +243,9 @@ } private function f_send_IPA_EVT(template ASP_IPA_Event evt) runs on IPA_Emulation_CT { + if (IPA_SP_PORT.checkstate("Connected")) { + IPA_SP_PORT.send(evt); + } #ifdef IPA_EMULATION_RSL if (IPA_RSL_PORT.checkstate("Connected")) { IPA_RSL_PORT.send(evt); @@ -368,6 +371,7 @@ * the TCP connection is established. Other implementations may differ. * We currently ignore it completely - but actually we should make sure that * one ID_ACK is received by the server at some point */ + f_send_IPA_EVT(t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK)); } case (IPAC_MSGT_ID_RESP) { log("IPA ID RESP: ", ccm.u.resp); @@ -635,4 +639,24 @@ } } +/*********************************************************************** + * IPA Event waiter component. Wait for ASP_IPA_EVENT_ID_ACK + ***********************************************************************/ + +type component IPA_EventWaiter_CT { + port IPA_SP_PT IPA_SP_PORT; +} + +function waiter_main(template ASP_IPA_Event wait_for := t_ASP_IPA_EVT_UD(ASP_IPA_EVENT_ID_ACK)) +runs on IPA_EventWaiter_CT { + + alt { + [] IPA_SP_PORT.receive(wait_for) { + setverdict(pass); + } + [] IPA_SP_PORT.receive { repeat; } + } +} + + } -- To view, visit https://gerrit.osmocom.org/9293 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 Gerrit-Change-Number: 9293 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 08:36:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 08:36:35 +0000 Subject: Change in libosmocore[master]: introduce vty_out_rate_ctr_group_fmt() function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9277 ) Change subject: introduce vty_out_rate_ctr_group_fmt() function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Gerrit-Change-Number: 9277 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 08:36:35 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 08:36:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 08:36:43 +0000 Subject: Change in libosmocore[master]: introduce vty_out_rate_ctr_group_fmt() function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9277 ) Change subject: introduce vty_out_rate_ctr_group_fmt() function ...................................................................... introduce vty_out_rate_ctr_group_fmt() function This new function can be used to print a rate counter group according to a format string. The intention is to generalize and replace manual printing of counters as implemented for the 'show statistics' VTY command of osmo-bsc. Related: OS#3245 Related: osmo-bsc commit 71d524c059c5a5c90e7cb77d8a2134c1c68b9cde (g#9217) Change-Id: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd --- M include/osmocom/vty/misc.h M src/vty/utils.c 2 files changed, 138 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/vty/misc.h b/include/osmocom/vty/misc.h index 335558d..2ad9650 100644 --- a/include/osmocom/vty/misc.h +++ b/include/osmocom/vty/misc.h @@ -14,6 +14,8 @@ void vty_out_rate_ctr_group(struct vty *vty, const char *prefix, struct rate_ctr_group *ctrg); +void vty_out_rate_ctr_group_fmt(struct vty *vty, const char *fmt, + struct rate_ctr_group *ctrg); void vty_out_stat_item_group(struct vty *vty, const char *prefix, struct osmo_stat_item_group *statg); diff --git a/src/vty/utils.c b/src/vty/utils.c index 8cd0b35..4d37093 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -84,6 +84,142 @@ rate_ctr_for_each_counter(ctrg, rate_ctr_handler, &vctx); } +static char * +pad_append_str(char *s, const char *a, int minwidth) +{ + s = talloc_asprintf_append(s, "%*s", minwidth, a); + OSMO_ASSERT(s); + return s; +} + +static char * +pad_append_ctr(char *s, uint64_t ctr, int minwidth, void *ctx) +{ + s = talloc_asprintf_append(s, "%*" PRIu64, minwidth, ctr); + OSMO_ASSERT(s); + return s; +} + +static int rate_ctr_handler_fmt( + struct rate_ctr_group *ctrg, struct rate_ctr *ctr, + const struct rate_ctr_desc *desc, void *vctx_) +{ + struct vty_out_context *vctx = vctx_; + struct vty *vty = vctx->vty; + const char *fmt = vctx->prefix; + char *s = talloc_strdup(vty, ""); + OSMO_ASSERT(s); + + while (*fmt) { + int ch, minwidth = 0, sign = 1; + char *p = strchr(fmt, '%'); + + if (p == NULL) { + /* No further % directives in format string. Copy rest verbatim and exit. */ + s = talloc_strdup_append_buffer(s, fmt); + OSMO_ASSERT(s); + break; + } else { + ptrdiff_t len; + + OSMO_ASSERT(p >= fmt); + len = p - fmt; + if (len) { + /* Copy bytes verbatim until next '%' byte. */ + s = talloc_strndup_append_buffer(s, fmt, len); + OSMO_ASSERT(s); + } + fmt = (const char *)(p + 1); /* skip past '%' */ + if (*fmt == '\0') + break; + } + + ch = *fmt++; + if (ch == '-' && isdigit(*fmt)) { + sign = -1; + ch = *fmt++; + } + while (isdigit(ch) && *fmt != '\0') { + minwidth *= 10; + minwidth += (ch - '0'); + ch = *fmt++; + } + minwidth *= sign; + + switch (ch) { + case '%': + s = talloc_asprintf_append(s, "%c", ch); + OSMO_ASSERT(s); + break; + case 'd': + s = pad_append_str(s, desc->description, minwidth); + break; + case 'n': + s = pad_append_str(s, desc->name, minwidth); + break; + case 'c': + s = pad_append_ctr(s, ctr->current, minwidth, vty); + break; + case 'p': + s = pad_append_ctr(s, ctr->previous, minwidth, vty); + break; + case 'S': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth, vty); + break; + case 'M': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth, vty); + break; + case 'H': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth, vty); + break; + case 'D': + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth, vty); + break; + default: + break; + } + } + + vty_out(vty, "%s%s", s, VTY_NEWLINE); + talloc_free(s); + + return 0; +} + +/*! print a rate counter group to given VTY, formatting the line for each counter according to a format string. + * + * The following format string directives are supported: + * - %d: The description of the counter + * - %n: The name of the counter + * - %c: The current value of the counter + * - %p: The previous value of the counter + * - %S: The interval of the counter in seconds + * - %M: The interval of the counter in minutes + * - %H: The interval of the counter in hours + * - %D: The interval of the counter in days + * - %%: Print a literal %. + * + * An optional number between % and the letter in a format directive may be used to set a minimum field width. + * If the expanded format directive is smaller than this width (according to strlen()) the string will be + * left-padded (if the number is positive) or right-padded (if the number is negative) with spaces. + * For example, "%25n" prints the counter name left-padded up to a minimum width of 25 columns. + * + * VTY_NEWLINE will be appended to the format string when it is printed. + * + * \param[in] vty The VTY to which it should be printed + * \param[in] ctrg Rate counter group to be printed + * \param[in] fmt A format which may contain the above directives. + */ +void vty_out_rate_ctr_group_fmt(struct vty *vty, const char *fmt, + struct rate_ctr_group *ctrg) +{ + struct vty_out_context vctx = {vty, fmt}; + + vty_out(vty, "%s:%s", ctrg->desc->group_description, VTY_NEWLINE); + + rate_ctr_for_each_counter(ctrg, rate_ctr_handler_fmt, &vctx); +} + static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *vctx_) { struct vty_out_context *vctx = vctx_; -- To view, visit https://gerrit.osmocom.org/9277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Gerrit-Change-Number: 9277 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 08:36:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 08:36:43 +0000 Subject: Change in libosmocore[master]: Add a 'show rate-counters' VTY command. In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9278 ) Change subject: Add a 'show rate-counters' VTY command. ...................................................................... Add a 'show rate-counters' VTY command. Add a new VTY command which shows all rate counters registered with libosmocore. Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Depends: Idb3ec12494ff6a3a05efcc8818e78d1baa6546bd Related: OS#3245 --- M src/vty/stats_vty.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index faa136d..8d90945 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -527,6 +527,22 @@ return CMD_SUCCESS; } +static int rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_) +{ + struct vty *vty = sctx_; + vty_out_rate_ctr_group_fmt(vty, "%25n: %10c (%S/s %M/m %H/h %D/d) %d", ctrg); + return 0; +} + +DEFUN(show_rate_counters, + show_rate_counters_cmd, + "show rate-counters", + SHOW_STR "Show all rate counters\n") +{ + rate_ctr_for_each_group(rate_ctr_group_handler, vty); + return CMD_SUCCESS; +} + static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_reporter *srep) { if (srep == NULL) @@ -620,4 +636,5 @@ install_element(CFG_STATS_NODE, &cfg_stats_reporter_disable_cmd); install_element_ve(&show_stats_asciidoc_table_cmd); + install_element_ve(&show_rate_counters_cmd); } -- To view, visit https://gerrit.osmocom.org/9278 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id60a5aa2d961ae99cddf1e776358a5517dbc573d Gerrit-Change-Number: 9278 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 09:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 May 2018 09:46:26 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9234 to look at the new patch set (#2). Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... sdp: remove unused alt_codec field from struct mgcp_rtp_end The alt_codec field is not used anywhere in the code - remove unused alt_codec field Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Related: OS#3114 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_sdp.c M tests/mgcp/mgcp_test.c 4 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/9234/2 -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 09:46:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 May 2018 09:46:28 +0000 Subject: Change in osmo-mgw[master]: sdp: remove circular inclusion Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9294 Change subject: sdp: remove circular inclusion ...................................................................... sdp: remove circular inclusion The header file mgcp_sdp.h includes itsself. - remove unnecessary circular inclusion Change-Id: I816c6b922641c0b58053714244ada22a75781956 --- M include/osmocom/mgcp/mgcp_sdp.h 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/94/9294/1 diff --git a/include/osmocom/mgcp/mgcp_sdp.h b/include/osmocom/mgcp/mgcp_sdp.h index da23cba..240f8cf 100644 --- a/include/osmocom/mgcp/mgcp_sdp.h +++ b/include/osmocom/mgcp/mgcp_sdp.h @@ -21,7 +21,6 @@ */ #pragma once -#include int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, -- To view, visit https://gerrit.osmocom.org/9294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I816c6b922641c0b58053714244ada22a75781956 Gerrit-Change-Number: 9294 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 09:51:25 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 25 May 2018 09:51:25 +0000 Subject: Change in osmo-sip-connector[master]: Logging: Log mncc_names in mncc_data() In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9269 ) Change subject: Logging: Log mncc_names in mncc_data() ...................................................................... Patch Set 3: Nope, but I will take a look, I was looking for something like this... Thanks! -- To view, visit https://gerrit.osmocom.org/9269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I161d1b841ac5fe1b7e092b329ae0674cb340f5ac Gerrit-Change-Number: 9269 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 25 May 2018 09:51:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 09:59:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 May 2018 09:59:05 +0000 Subject: Change in osmo-mgw[master]: protocol: Try whole port range on port allocation In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9259 to look at the new patch set (#2). Change subject: protocol: Try whole port range on port allocation ...................................................................... protocol: Try whole port range on port allocation The function allocate_port tryes at least 200 different ports when a new port is allocated. Since after every allocation the port number is incremented the allocation should be able to allocate a port with the first attempt. However, the number 200 is an arbitrary number and it will not cover the whole port range in most cases. - Make sure that in the worst case at each port in the range is tryed once, not only the next 200 Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/9259/2 -- To view, visit https://gerrit.osmocom.org/9259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Gerrit-Change-Number: 9259 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:02:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:02:52 +0000 Subject: Change in osmo-mgw[master]: sdp: remove circular inclusion In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9294 ) Change subject: sdp: remove circular inclusion ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I816c6b922641c0b58053714244ada22a75781956 Gerrit-Change-Number: 9294 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 10:02:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:03:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:03:30 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9234 ) Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 25 May 2018 10:03:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:03:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:03:32 +0000 Subject: Change in osmo-mgw[master]: sdp: remove unused alt_codec field from struct mgcp_rtp_end In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9234 ) Change subject: sdp: remove unused alt_codec field from struct mgcp_rtp_end ...................................................................... sdp: remove unused alt_codec field from struct mgcp_rtp_end The alt_codec field is not used anywhere in the code - remove unused alt_codec field Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Related: OS#3114 --- M include/osmocom/mgcp/mgcp_internal.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_sdp.c M tests/mgcp/mgcp_test.c 4 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h index ff02768..7a00c98 100644 --- a/include/osmocom/mgcp/mgcp_internal.h +++ b/include/osmocom/mgcp/mgcp_internal.h @@ -116,7 +116,6 @@ /* audio codec information */ struct mgcp_rtp_codec codec; - struct mgcp_rtp_codec alt_codec; /* TODO/XXX: make it generic */ /* per endpoint data */ int frames_per_packet; diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 280ee8b..a7cd6cf 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -132,7 +132,6 @@ end->output_enabled = 0; mgcp_rtp_codec_init(&end->codec); - mgcp_rtp_codec_init(&end->alt_codec); conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index); conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR]; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 5c66a83..5cc34ea 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -205,10 +205,10 @@ * \param[in] endp trunk endpoint. * \param[out] conn associated rtp connection. * \param[out] caller provided memory to store the parsing results. - * \returns 1 when codecs are assigned, 0 when no codecs are assigned. + * \returns 1 when a codec is assigned, 0 when no codec is assigned * * Note: In conn (conn->end) the function returns the packet duration, - * rtp port, rtcp port and the assigned codecs (codec and alt_codec). */ + * rtp port, rtcp port and the assigned codec. */ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, struct mgcp_parse_data *p) @@ -218,7 +218,7 @@ char *line; int maxptime = -1; int i; - int codecs_assigned = 0; + bool codec_assigned = false; void *tmp_ctx = talloc_new(NULL); struct mgcp_rtp_end *rtp; @@ -277,6 +277,10 @@ rtp->rtp_port = htons(port); rtp->rtcp_port = htons(port + 1); codecs_used = rc - 1; + + /* So far we have only set the payload type in + * the codec struct. Now we fill up the + * remaining fields of the codec description */ codecs_initialize(tmp_ctx, codecs, codecs_used); } break; @@ -300,11 +304,11 @@ } } - /* Now select the primary and alt_codec */ - for (i = 0; i < codecs_used && codecs_assigned < 2; ++i) { - struct mgcp_rtp_codec *codec = codecs_assigned == 0 ? - &rtp->codec : &rtp->alt_codec; + /* Now select a suitable codec */ + for (i = 0; i < codecs_used; i++) { + /* When no transcoding is available, avoid codecs that would + * require transcoding. */ if (endp->tcfg->no_audio_transcoding && !is_codec_compatible(endp, &codecs[i])) { LOGP(DLMGCP, LOGL_NOTICE, "Skipping codec %s\n", @@ -312,12 +316,14 @@ continue; } - mgcp_set_audio_info(p->cfg, codec, + mgcp_set_audio_info(p->cfg, &rtp->codec, codecs[i].payload_type, codecs[i].map_line); - codecs_assigned += 1; + + codec_assigned = true; + break; } - if (codecs_assigned > 0) { + if (codec_assigned) { /* TODO/XXX: Store this per codec and derive it on use */ if (maxptime >= 0 && maxptime * rtp->codec.frame_duration_den > rtp->codec.frame_duration_num * 1500) { @@ -335,7 +341,10 @@ } talloc_free(tmp_ctx); - return codecs_assigned > 0; + + if (codec_assigned) + return 1; + return 0; } /*! Generate SDP response string. diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 67c5f66..4dce64c 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -1244,7 +1244,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 97); /* Allocate 2 at mgw with three codecs, last one ignored */ last_endpoint = -1; @@ -1260,7 +1259,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 97); /* Allocate 3 at mgw with no codecs, check for PT == -1 */ last_endpoint = -1; @@ -1276,7 +1274,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == -1); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); /* Allocate 4 at mgw with a single codec */ last_endpoint = -1; @@ -1292,7 +1289,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 18); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); /* Allocate 5 at mgw at select GSM.. */ last_endpoint = -1; @@ -1311,7 +1307,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 3); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); inp = create_msg(MDCX_NAT_DUMMY, conn_id); last_endpoint = -1; @@ -1323,7 +1318,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 3); - OSMO_ASSERT(conn->end.alt_codec.payload_type == -1); OSMO_ASSERT(conn->end.rtp_port == htons(16434)); memset(&addr, 0, sizeof(addr)); inet_aton("8.8.8.8", &addr); @@ -1354,7 +1348,6 @@ conn = mgcp_conn_get_rtp(endp, conn_id); OSMO_ASSERT(conn); OSMO_ASSERT(conn->end.codec.payload_type == 255); - OSMO_ASSERT(conn->end.alt_codec.payload_type == 0); talloc_free(cfg); } -- To view, visit https://gerrit.osmocom.org/9234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5ff2899e3e61f33eb86f284b50ad8a94a949ed16 Gerrit-Change-Number: 9234 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:03:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:03:33 +0000 Subject: Change in osmo-mgw[master]: sdp: remove circular inclusion In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9294 ) Change subject: sdp: remove circular inclusion ...................................................................... sdp: remove circular inclusion The header file mgcp_sdp.h includes itsself. - remove unnecessary circular inclusion Change-Id: I816c6b922641c0b58053714244ada22a75781956 --- M include/osmocom/mgcp/mgcp_sdp.h 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp_sdp.h b/include/osmocom/mgcp/mgcp_sdp.h index da23cba..240f8cf 100644 --- a/include/osmocom/mgcp/mgcp_sdp.h +++ b/include/osmocom/mgcp/mgcp_sdp.h @@ -21,7 +21,6 @@ */ #pragma once -#include int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn, -- To view, visit https://gerrit.osmocom.org/9294 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I816c6b922641c0b58053714244ada22a75781956 Gerrit-Change-Number: 9294 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:04:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:04:56 +0000 Subject: Change in osmo-mgw[master]: protocol: Try whole port range on port allocation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9259 ) Change subject: protocol: Try whole port range on port allocation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Gerrit-Change-Number: 9259 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 10:04:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:04:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 10:04:59 +0000 Subject: Change in osmo-mgw[master]: protocol: Try whole port range on port allocation In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9259 ) Change subject: protocol: Try whole port range on port allocation ...................................................................... protocol: Try whole port range on port allocation The function allocate_port tryes at least 200 different ports when a new port is allocated. Since after every allocation the port number is incremented the allocation should be able to allocate a port with the first attempt. However, the number 200 is an arbitrary number and it will not cover the whole port range in most cases. - Make sure that in the worst case at each port in the range is tryed once, not only the next 200 Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Related: OS#2825 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index ea86672..c391fec 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -356,13 +356,15 @@ /* Try to find a free port by attempting to bind on it. Also handle the * counter that points on the next free port. Since we have a pointer - * to the next free port, binding should work on the first attempt, - * nevertheless, try at least the next 200 ports before giving up */ + * to the next free port, binding should in work on the first attempt in + * general. In case of failure the next port is tryed until the whole port + * range is tryed once. */ static int allocate_port(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn) { int i; struct mgcp_rtp_end *end; struct mgcp_port_range *range; + unsigned int tries; OSMO_ASSERT(conn); end = &conn->end; @@ -371,7 +373,8 @@ range = &endp->cfg->net_ports; /* attempt to find a port */ - for (i = 0; i < 200; ++i) { + tries = (range->range_end - range->range_start) / 2; + for (i = 0; i < tries; ++i) { int rc; if (range->last_port >= range->range_end) @@ -387,8 +390,8 @@ } LOGP(DLMGCP, LOGL_ERROR, - "Allocating a RTP/RTCP port failed 200 times 0x%x.\n", - ENDPOINT_NUMBER(endp)); + "Allocating a RTP/RTCP port failed %u times 0x%x.\n", + tries, ENDPOINT_NUMBER(endp)); return -1; } -- To view, visit https://gerrit.osmocom.org/9259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic47f09869eaddd4aea817bb2517362883d65d029 Gerrit-Change-Number: 9259 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:16:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 10:16:31 +0000 Subject: Change in osmo-ci[master]: ansible: Document docker login step Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9295 Change subject: ansible: Document docker login step ...................................................................... ansible: Document docker login step This step requires manual interaction since a password will be asked. Change-Id: I193c721490c115a17c2f6753b3b139d7dc33aa39 --- M ansible/setup-gsm-tester.md 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/95/9295/1 diff --git a/ansible/setup-gsm-tester.md b/ansible/setup-gsm-tester.md index 47c479a..c1df654 100644 --- a/ansible/setup-gsm-tester.md +++ b/ansible/setup-gsm-tester.md @@ -18,4 +18,7 @@ # Steps after the playbook ran The jenkins user needs to know the ssh-keys of all BTS which get accessed via ssh. -E.g. the gsm-tester is connecting to a sysmobts via ssh. + E.g. the gsm-tester is connecting to a sysmobts via ssh. + +The main unit needs to be logged in with docker repo registry.sysmocom.de: + docker login -u "osmo-gsm-tester" registry.sysmocom.de -- To view, visit https://gerrit.osmocom.org/9295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I193c721490c115a17c2f6753b3b139d7dc33aa39 Gerrit-Change-Number: 9295 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:31:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 10:31:39 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9296 Change subject: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface ...................................................................... templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface Change-Id: Ib1c3022a6c531ef8c6a5ba31927762806abc37ac --- M src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/96/9296/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl index 906e7b9..2a1e2d7 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl @@ -12,7 +12,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! - +line vty + bind ${osmo_bts_octphy.addr} +ctrl + bind ${osmo_bts_octphy.addr} +! %for phy in osmo_bts_octphy.phy_list: phy ${loop.index} octphy hw-addr ${phy.hw_addr} diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl index c9dde86..536e5cb 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl @@ -12,6 +12,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! +line vty + bind ${osmo_bts_sysmo.addr} +ctrl + bind ${osmo_bts_sysmo.addr} +! phy 0 instance 0 bts 0 diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index 1931e9b..d95ca6e 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -15,6 +15,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! +line vty + bind ${osmo_bts_trx.addr} +ctrl + bind ${osmo_bts_trx.addr} +! phy 0 osmotrx ip local ${osmo_bts_trx.trx_local_ip} osmotrx ip remote ${osmo_bts_trx.trx_remote_ip} -- To view, visit https://gerrit.osmocom.org/9296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1c3022a6c531ef8c6a5ba31927762806abc37ac Gerrit-Change-Number: 9296 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:31:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 10:31:39 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Add API to mock BSC RSL IP addr Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9297 Change subject: bsc: Add API to mock BSC RSL IP addr ...................................................................... bsc: Add API to mock BSC RSL IP addr Change-Id: I9ca67964e656943b50967a27a88054fd3e484672 --- M src/osmo_gsm_tester/osmo_bsc.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/97/9297/1 diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 2c909bc..323b9ec 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -31,6 +31,7 @@ process = None bts = None encryption = None + rsl_ip = None mgw = None stp = None @@ -92,6 +93,9 @@ encryption_vty = util.encryption2osmovty(values['bsc']['net']['encryption']) config.overlay(values, dict(bsc=dict(net=dict(encryption=encryption_vty)))) + if self.rsl_ip is not None: + config.overlay(values, dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip)))) + self.dbg('BSC CONFIG:\n' + pprint.pformat(values)) with open(self.config_file, 'w') as f: @@ -105,6 +109,12 @@ def set_encryption(self, val): self.encryption = val + def set_rsl_ip(self, ip_addr): + '''Overwrite RSL IPaddr option sent to all BTS during OML config. Useful + for tests only willing to use osmo-bsc to do the OML setup but using + other external entities to test the RSL path, such as TTCN3 tests.''' + self.rsl_ip = ip_addr + def bts_add(self, bts): self.bts.append(bts) bts.set_bsc(self) diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 71b44cf..814cf97 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -52,6 +52,9 @@ channel allocator ascending rach tx integer 9 rach max transmission 7 +% if bsc.net.get('rsl_ip', False): + ip.access rsl-ip ${bsc.net.rsl_ip} +% endif ip.access unit_id ${bts.ipa_unit_id} 0 oml ip.access stream_id ${bts.stream_id} line 0 % if bts.get('sgsn', False): -- To view, visit https://gerrit.osmocom.org/9297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9ca67964e656943b50967a27a88054fd3e484672 Gerrit-Change-Number: 9297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:31:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 10:31:39 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move cleanup log inside cleanup method Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9298 Change subject: process: Move cleanup log inside cleanup method ...................................................................... process: Move cleanup log inside cleanup method Change-Id: I72ad453e9dc8340946d7e7d041643fe8ef97439f --- M src/osmo_gsm_tester/process.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/98/9298/1 diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 8ae6a55..477a096 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -126,6 +126,7 @@ self.cleanup() def cleanup(self): + self.dbg('Cleanup') self.close_output_logs() if self.result == 0: self.log('Terminated: ok', rc=self.result) @@ -149,7 +150,6 @@ self.log('stderr:\n', m, '\n') def close_output_logs(self): - self.dbg('Cleanup') for k, v in self.outputs.items(): path, f = v if f: -- To view, visit https://gerrit.osmocom.org/9298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I72ad453e9dc8340946d7e7d041643fe8ef97439f Gerrit-Change-Number: 9298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 10:31:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 10:31:40 +0000 Subject: Change in osmo-gsm-tester[master]: Add option to expect bts/pcu failures and respawn its processes Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9299 Change subject: Add option to expect bts/pcu failures and respawn its processes ...................................................................... Add option to expect bts/pcu failures and respawn its processes Some tests may want to reproduce some scenarios in which it is expected that a BTS process is stopped, for instance if the BSC link is dropped. Provide a keepalive parameter to start() for bts and pcu objects to inform suite that failures are expected and that it should keep them alive in case that ocurrs by respawning the BTS process. Change-Id: Ia2a7539f9fad457125ac9b60a52a52999e885ba8 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/pcu.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/pcu_sysmo.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/suite.py 10 files changed, 57 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/99/9299/1 diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index f59cff3..ca33eb4 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -139,8 +139,9 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): - 'Starts BTS proccess and sets self.proc_bts with an object of Process interface' + def start(self, keepalive=False): + '''Starts BTS. If keepalive is set, it will expect internal issues and + respawn related processes when detected''' pass @abstractmethod diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index d631f1c..29a8ac5 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -80,7 +80,7 @@ # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.conf.get('ipa_unit_id') is None: raise log.Error('No attribute %s provided in conf!' % attr) self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 21ae135..b9b7fef 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -57,7 +57,7 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): + def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. pass @@ -108,6 +108,6 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): + def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. pass diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 9f76194..b9310f8 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -51,7 +51,7 @@ def launch_trx_enabled(self): return util.str2bool(self.conf.get('launch_trx')) - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -59,7 +59,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc @@ -99,7 +99,7 @@ ################### # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.bsc is None: raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') self.suite_run.poll() @@ -110,7 +110,7 @@ if self.launch_trx_enabled(): self.trx = OsmoTrx(self.suite_run, self.conf, self.trx_remote_ip(), self.remote_addr()) - self.trx.start() + self.trx.start(keepalive) self.log('Waiting for osmo-trx to start up...') MainLoop.wait(self, self.trx.trx_ready) @@ -120,7 +120,7 @@ raise RuntimeError('No lib/ in %r' % self.inst) self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_bts = self.launch_process(OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', + self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), '-i', self.bsc.addr()) self.suite_run.poll() @@ -163,17 +163,17 @@ self.dbg(r) f.write(r) - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(OsmoTrx.BIN_TRX, '-x', + self.proc_trx = self.launch_process(keepalive, OsmoTrx.BIN_TRX, '-x', '-j', self.listen_ip, '-i', self.bts_ip, '-C', os.path.abspath(self.config_file)) - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -181,7 +181,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index d0f6ff3..65c9279 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -54,9 +54,9 @@ log.ctx(proc) raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None): + def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): proc = self._process_remote(name, popen_args, remote_cwd) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc @@ -110,7 +110,7 @@ ################### # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.bsc is None: raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') log.log('Starting sysmoBTS to connect to', self.bsc) @@ -151,6 +151,6 @@ if self._direct_pcu_enabled(): args += ('-M',) - self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir) + self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir, keepalive=keepalive) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py index 97d0b92..0260296 100644 --- a/src/osmo_gsm_tester/pcu.py +++ b/src/osmo_gsm_tester/pcu.py @@ -42,7 +42,7 @@ ################### @abstractmethod - def start(self): + def start(self, keepalive=False): """Start the PCU. Must be implemented by subclass.""" pass @@ -54,7 +54,7 @@ def __init__(self, suite_run, bts, conf): super().__init__(suite_run, bts, conf, 'PcuDummy') - def start(self): + def start(self, keepalive=False): pass # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index 6ab97de..50ae134 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -34,7 +34,7 @@ self.conf = conf self.env = {} - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() @@ -44,12 +44,12 @@ raise RuntimeError('No lib/ in %r' % self.inst) self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.launch_process(OsmoPcu.BIN_PCU, '-r', '1', + self.launch_process(keepalive, OsmoPcu.BIN_PCU, '-r', '1', '-c', os.path.abspath(self.config_file), '-i', self.bts.bsc.addr()) self.suite_run.poll() - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -57,7 +57,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py index 675de50..b97852a 100644 --- a/src/osmo_gsm_tester/pcu_sysmo.py +++ b/src/osmo_gsm_tester/pcu_sysmo.py @@ -43,7 +43,7 @@ self.remote_env = {} self.remote_user = 'root' - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() @@ -75,7 +75,7 @@ ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-c', remote_config_file, '-r', '1', '-i', self.sysmobts.bsc.addr()), - remote_cwd=remote_run_dir) + remote_cwd=remote_run_dir, keepalive=keepalive) def _process_remote(self, name, popen_args, remote_cwd=None): run_dir = self.run_dir.new_dir(name) @@ -90,9 +90,9 @@ log.ctx(proc) raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None): + def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): proc = self._process_remote(name, popen_args, remote_cwd) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() def run_local(self, name, popen_args): diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 477a096..c13ded0 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -79,6 +79,13 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') + def respawn(self): + self.dbg('respawn') + assert not self.is_running() + self.result = None + self.killed = None + self.launch() + def _poll_termination(self, time_to_wait_for_term=5): wait_step = 0.001 waited_time = 0 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 76cd248..618a39b 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -230,19 +230,27 @@ skipped += 1 return (passed, skipped, failed) - def remember_to_stop(self, process): + def remember_to_stop(self, process, respawn=False): + '''Ask suite to monitor and manage lifecycle of the Process object. If a + process managed by suite finishes before cleanup time, the current test + will be marked as FAIL and end immediatelly. If respwan=True, then suite + will respawn() the process instead.''' if self._processes is None: self._processes = [] - self._processes.insert(0, process) + self._processes.insert(0, (process, respawn)) def stop_processes(self): while self._processes: - self._processes.pop().terminate() + process, respawn = self._processes.pop() + process.terminate() def stop_process(self, process): 'Remove process from monitored list and stop it' - self._processes.remove(process) - process.terminate() + for proc_respawn in self._processes: + proc, respawn = proc_respawn + if proc == process: + self._processes.remove(proc_respawn) + proc.terminate() def free_resources(self): if self.reserved_resources is None: @@ -351,12 +359,15 @@ def poll(self): if self._processes: - for process in self._processes: + for process, respawn in self._processes: if process.terminated(): - process.log_stdout_tail() - process.log_stderr_tail() - log.ctx(process) - raise log.Error('Process ended prematurely: %s' % process.name()) + if respawn == True: + process.respawn() + else: + process.log_stdout_tail() + process.log_stderr_tail() + log.ctx(process) + raise log.Error('Process ended prematurely: %s' % process.name()) def prompt(self, *msgs, **msg_details): 'ask for user interaction. Do not use in tests that should run automatically!' -- To view, visit https://gerrit.osmocom.org/9299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2a7539f9fad457125ac9b60a52a52999e885ba8 Gerrit-Change-Number: 9299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:03:01 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 25 May 2018 11:03:01 +0000 Subject: Change in osmo-bsc[master]: assignment: signal assignment failure on chan act nack In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9281 ) Change subject: assignment: signal assignment failure on chan act nack ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9281/1/src/osmo-bsc/osmo_bsc_api.c File src/osmo-bsc/osmo_bsc_api.c: https://gerrit.osmocom.org/#/c/9281/1/src/osmo-bsc/osmo_bsc_api.c at 429 PS1, Line 429: osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_RR_ASS_FAIL, NULL); > rather than having a function that consists of only one other function call (and discarding two thir [?] it's a callback in that struct bsc_api. on another note ... the struct bsc_api existed as an abstraction layer to "plug" old osmo-nitb, plain osmo-bsc or osmo-bsc_nat. It might still make sense with bsc vs. bsc_nat, but since we're ignoring nat in osmo-bsc.git at the moment it feels like the entire bsc_api abstraction is unnecessary, just like the separation of libbsc. But we'll best just keep all that until bsc_nat has "concluded". -- To view, visit https://gerrit.osmocom.org/9281 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib204b4a5272f9b7b60ca5f932cd8a4c857316270 Gerrit-Change-Number: 9281 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 11:03:01 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:21:14 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 25 May 2018 11:21:14 +0000 Subject: Change in osmo-bsc[master]: add bsc_stubs.h to workaround linking hell for utils and tests In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9279 ) Change subject: add bsc_stubs.h to workaround linking hell for utils and tests ...................................................................... Patch Set 1: tldr: yes, utterly temporary. I have often been aching to resolve that madness where libbsc cannot compile without osmo-bsc. The unknown here is osmo-bsc_nat -- how will we resurrect it? Which parts of libbsc will be shared? The knowns are: various tests / utility programs use parts of libbsc. I regularly hit linking spaghetti that make no sense at all, like bs11_config requiring an implementation of bsc_send_handover_required(), and it really would help to sort things into their little realms. But it needs time spent to figure out what code is actually shared. So far my conclusion was that it would be nice but I don't have the luxury to sort it now, yet. The interdependency started with the gscon living in libbsc, but directly calling osmo_bsc_sigtran_open() and osmo_bsc_sigtran_send() implemented in src/osmo-bsc/. Most likely the entire gscon does not apply to osmo-bsc_nat at all, but its allocation is tightly glued to the gsm_subscriber_connection now. So there's like a steel bar built through the open fire door... -- To view, visit https://gerrit.osmocom.org/9279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000be689ed071aced1a085284f924a7e77e5656d Gerrit-Change-Number: 9279 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 11:21:14 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:29:50 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Fri, 25 May 2018 11:29:50 +0000 Subject: Change in osmo-bsc[master]: store subscriber identity on paging In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9289 ) Change subject: store subscriber identity on paging ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9289/1/src/libbsc/paging.c File src/libbsc/paging.c: https://gerrit.osmocom.org/#/c/9289/1/src/libbsc/paging.c at 391 PS1, Line 391: conn->bsub = bsc_subscr_get(bsub); > this looks a bit odd as we're only incrementing the bsup use count in this patch, but we don't add a [?] yes, I thought the same when reviewing my slightly old patch. The put is actually in gscon_cleanup(), i.e. the conn will keep its conn->bsub if one is there. So far there wasn't one. Oh wait, this patch should make sure there wasn't one before. There wouldn't be one, but if there ever was, we would leak reference counts. -- To view, visit https://gerrit.osmocom.org/9289 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0ab7bedfe693bb4e42a04fb0585b94a730ff2d9b Gerrit-Change-Number: 9289 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Fri, 25 May 2018 11:29:50 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:50:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 11:50:03 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9296 ) Change subject: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib1c3022a6c531ef8c6a5ba31927762806abc37ac Gerrit-Change-Number: 9296 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 11:50:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:50:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 11:50:31 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Add API to mock BSC RSL IP addr In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9297 ) Change subject: bsc: Add API to mock BSC RSL IP addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9ca67964e656943b50967a27a88054fd3e484672 Gerrit-Change-Number: 9297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 11:50:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:51:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 11:51:43 +0000 Subject: Change in osmo-ci[master]: ansible: Document docker login step In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9295 ) Change subject: ansible: Document docker login step ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I193c721490c115a17c2f6753b3b139d7dc33aa39 Gerrit-Change-Number: 9295 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 11:51:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 11:52:08 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 11:52:08 +0000 Subject: Change in libosmocore[master]: remove unused argument from pad_append_ctr() helper function Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9300 Change subject: remove unused argument from pad_append_ctr() helper function ...................................................................... remove unused argument from pad_append_ctr() helper function Change-Id: Iff5699be1dc306120cc1752b0a892e4fcbc5a8c0 Fixes: 97d3da2c591984b47839fd1d9a5cba24a7f05fa1 Related: OS#3245 --- M src/vty/utils.c 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/9300/1 diff --git a/src/vty/utils.c b/src/vty/utils.c index 4d37093..0d663c6 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -93,7 +93,7 @@ } static char * -pad_append_ctr(char *s, uint64_t ctr, int minwidth, void *ctx) +pad_append_ctr(char *s, uint64_t ctr, int minwidth) { s = talloc_asprintf_append(s, "%*" PRIu64, minwidth, ctr); OSMO_ASSERT(s); @@ -158,22 +158,22 @@ s = pad_append_str(s, desc->name, minwidth); break; case 'c': - s = pad_append_ctr(s, ctr->current, minwidth, vty); + s = pad_append_ctr(s, ctr->current, minwidth); break; case 'p': - s = pad_append_ctr(s, ctr->previous, minwidth, vty); + s = pad_append_ctr(s, ctr->previous, minwidth); break; case 'S': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth); break; case 'M': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth); break; case 'H': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth); break; case 'D': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth); break; default: break; -- To view, visit https://gerrit.osmocom.org/9300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iff5699be1dc306120cc1752b0a892e4fcbc5a8c0 Gerrit-Change-Number: 9300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 12:16:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 12:16:46 +0000 Subject: Change in osmo-ci[master]: ansible: Document docker login step In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9295 ) Change subject: ansible: Document docker login step ...................................................................... ansible: Document docker login step This step requires manual interaction since a password will be asked. Change-Id: I193c721490c115a17c2f6753b3b139d7dc33aa39 --- M ansible/setup-gsm-tester.md 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ansible/setup-gsm-tester.md b/ansible/setup-gsm-tester.md index 47c479a..c1df654 100644 --- a/ansible/setup-gsm-tester.md +++ b/ansible/setup-gsm-tester.md @@ -18,4 +18,7 @@ # Steps after the playbook ran The jenkins user needs to know the ssh-keys of all BTS which get accessed via ssh. -E.g. the gsm-tester is connecting to a sysmobts via ssh. + E.g. the gsm-tester is connecting to a sysmobts via ssh. + +The main unit needs to be logged in with docker repo registry.sysmocom.de: + docker login -u "osmo-gsm-tester" registry.sysmocom.de -- To view, visit https://gerrit.osmocom.org/9295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I193c721490c115a17c2f6753b3b139d7dc33aa39 Gerrit-Change-Number: 9295 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 12:18:36 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 12:18:36 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9301 Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... fix a one-byte stack buffer overrun in osmo-pcu Address sanitizer uncovered a one-byte stack overrun due to an off-by-one in the size of the 'data' buffer in pcu_l1if_tx_pch(). Fix the problem and add an assertion which triggers before the overrun can occur. Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Related: OS#3289 --- M src/pcu_l1_if.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/9301/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4b54707..02d1323 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -217,7 +217,7 @@ void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi) { - uint8_t data[23+3]; /* prefix PLEN */ + uint8_t data[23+3+1]; /* prefix PLEN */ /* paging group */ if (!imsi || strlen(imsi) < 3) @@ -227,6 +227,7 @@ data[1] = imsi[1]; data[2] = imsi[2]; + OSMO_ASSERT(block->data_len <= sizeof(data) - (3+1)); bitvec_pack(block, data + 3+1); data[3] = (plen << 2) | 0x01; pcu_tx_data_req(0, 0, PCU_IF_SAPI_PCH, 0, 0, 0, data, 23+3); -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 12:24:39 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 12:24:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/8020 ) Change subject: make PCU tests send PS paging requests on BVCI zero ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/8020/2/library/BSSGP_Emulation.ttcn File library/BSSGP_Emulation.ttcn: https://gerrit.osmocom.org/#/c/8020/2/library/BSSGP_Emulation.ttcn at 539 PS2, Line 539: [] BSSGP_SP_SIG.receive(tr_BSSGP_PS_PAGING(0)) -> value bs_pdu sender vc_conn { > Just use BSSGP_PDU:? Here like in the case below. The port (BSSGP_SP. vs BSSGP_SP_SIG. [?] Indeed, that works just fine. Thanks! I had to take a small detour due to OS#3289 while confirming that paging is still triggered as intended with this change. -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-Change-Number: 8020 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 12:24:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 12:28:20 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 12:28:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/8020 to look at the new patch set (#3). Change subject: make PCU tests send PS paging requests on BVCI zero ...................................................................... make PCU tests send PS paging requests on BVCI zero osmo-pcu discards PAGING-PS messages unless received on the signalling BVCI 0. The BVCI value must be set to zero both in the NS header and the BSSGP header. Create new ports between the PCU_Test components which the TC_paging test case can use to ensure that both layers send frames with BVCI value of zero. This does not make PCU_Tests.tc_paging work yet, however the PS paging request is now processed by osmo-pcu rather than discarded. Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Related: OS#2404 --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/20/8020/3 -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-Change-Number: 8020 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 12:29:15 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 12:29:15 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9301 ) Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9301/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/#/c/9301/1/src/pcu_l1_if.cpp at 220 PS1, Line 220: uint8_t data[23+3+1]; /* prefix PLEN */ It would be nice to have some defines instead of using all this raw values. Maybe even a struct with fields. At least, it probably makes more sense to have the size defined as: 3+1+23. -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 25 May 2018 12:29:15 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:00:22 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 13:00:22 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9301 ) Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9301/1/src/pcu_l1_if.cpp File src/pcu_l1_if.cpp: https://gerrit.osmocom.org/#/c/9301/1/src/pcu_l1_if.cpp at 220 PS1, Line 220: uint8_t data[23+3+1]; /* prefix PLEN */ > It would be nice to have some defines instead of using all this raw values. [?] Indeed, this code could use a lot of macros. I want to just fix the crash for now. Converting magic numbers to macros in osmo-pcu can be done in a separate step and it looks like it would be a huge long-term task anyway if done correctly and consistently. -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 13:00:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:15:58 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 13:15:58 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9302 Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... read monotonic clock with clock_gettime() instead of gettimeofday() There have been test failures on the osmo-pcu Jenkins builders due to apparent clock drift. Switch relevant code from gettimeofday() to clock_gettime() with CLOCK_MONOTONIC to prevent time from going backwards and causing negative time deltas in calculations. Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/9302/1 diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index 41a7531..4f4f853 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -71,22 +71,22 @@ /* RSSI values received from MS */ int gprs_rlcmac_rssi(struct gprs_rlcmac_tbf *tbf, int8_t rssi) { - struct timeval now_tv, *rssi_tv = &tbf->meas.rssi_tv; + struct timespec now_tv, *rssi_tv = &tbf->meas.rssi_tv; uint32_t elapsed; tbf->meas.rssi_sum += rssi; tbf->meas.rssi_num++; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7) - + ((now_tv.tv_usec - rssi_tv->tv_usec) << 7) / 1000000; + + ((now_tv.tv_nsec/1000 - rssi_tv->tv_nsec/1000) << 7) / 1000000; if (elapsed < 128) return 0; gprs_rlcmac_rssi_rep(tbf); /* reset rssi values and timestamp */ - memcpy(rssi_tv, &now_tv, sizeof(struct timeval)); + memcpy(rssi_tv, &now_tv, sizeof(*rssi_tv)); tbf->meas.rssi_sum = 0; tbf->meas.rssi_num = 0; @@ -115,7 +115,7 @@ int gprs_rlcmac_received_lost(struct gprs_rlcmac_dl_tbf *tbf, uint16_t received, uint16_t lost) { - struct timeval now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; + struct timespec now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; uint32_t elapsed; uint16_t sum = received + lost; @@ -129,16 +129,16 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7) - + ((now_tv.tv_usec - loss_tv->tv_usec) << 7) / 1000000; + + ((now_tv.tv_nsec/1000 - loss_tv->tv_nsec/1000) << 7) / 1000000; if (elapsed < 128) return 0; gprs_rlcmac_lost_rep(tbf); /* reset lost values and timestamp */ - memcpy(loss_tv, &now_tv, sizeof(struct timeval)); + memcpy(loss_tv, &now_tv, sizeof(*loss_tv)); tbf->m_bw.dl_loss_received = 0; tbf->m_bw.dl_loss_lost = 0; @@ -168,14 +168,14 @@ int gprs_rlcmac_dl_bw(struct gprs_rlcmac_dl_tbf *tbf, uint16_t octets) { - struct timeval now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; + struct timespec now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; uint32_t elapsed; tbf->m_bw.dl_bw_octets += octets; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7) - + ((now_tv.tv_usec - bw_tv->tv_usec) << 7) / 1000000; + + ((now_tv.tv_nsec/1000 - bw_tv->tv_nsec/1000) << 7) / 1000000; if (elapsed < 128) return 0; @@ -186,7 +186,7 @@ tbf->m_bw.dl_bw_octets / elapsed); /* reset bandwidth values timestamp */ - memcpy(bw_tv, &now_tv, sizeof(struct timeval)); + memcpy(bw_tv, &now_tv, sizeof(*bw_tv)); tbf->m_bw.dl_bw_octets = 0; return 0; diff --git a/src/tbf.cpp b/src/tbf.cpp index 14c1ee2..cd81731 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -182,7 +182,7 @@ rssi_sum(0), rssi_num(0) { - timerclear(&rssi_tv); + memset(&rssi_tv, 0, sizeof(rssi_tv)); } gprs_rlcmac_tbf::gprs_rlcmac_tbf(BTS *bts_, gprs_rlcmac_tbf_direction dir) : @@ -913,7 +913,7 @@ } /* set timestamp */ - gettimeofday(&tbf->meas.rssi_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->meas.rssi_tv); tbf->set_ms(ms); @@ -1024,8 +1024,8 @@ dl_loss_lost(0), dl_loss_received(0) { - timerclear(&dl_bw_tv); - timerclear(&dl_loss_tv); + memset(&dl_bw_tv, 0, sizeof(dl_bw_tv)); + memset(&dl_loss_tv, 0, sizeof(dl_loss_tv)); } gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) : @@ -1114,8 +1114,8 @@ tbf->m_last_dl_poll_fn = -1; tbf->m_last_dl_drained_fn = -1; - gettimeofday(&tbf->m_bw.dl_bw_tv, NULL); - gettimeofday(&tbf->m_bw.dl_loss_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_bw_tv); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_loss_tv); return tbf; } diff --git a/src/tbf.h b/src/tbf.h index 803b294..dc0b050 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -318,7 +318,7 @@ unsigned int num_fT_exp; /* number of consecutive fT expirations */ struct Meas { - struct timeval rssi_tv; /* timestamp for rssi calculation */ + struct timespec rssi_tv; /* timestamp for rssi calculation */ int32_t rssi_sum; /* sum of rssi values */ int rssi_num; /* number of rssi values added since rssi_tv */ @@ -665,11 +665,11 @@ int32_t m_last_dl_drained_fn; struct BandWidth { - struct timeval dl_bw_tv; /* timestamp for dl bw calculation */ + struct timespec dl_bw_tv; /* timestamp for dl bw calculation */ uint32_t dl_bw_octets; /* number of octets since bw_tv */ uint32_t dl_throughput; /* throughput to be displayed in stats */ - struct timeval dl_loss_tv; /* timestamp for loss calculation */ + struct timespec dl_loss_tv; /* timestamp for loss calculation */ uint16_t dl_loss_lost; /* sum of lost packets */ uint16_t dl_loss_received; /* sum of received packets */ -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:20:03 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 13:20:03 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9301 to look at the new patch set (#2). Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... fix a one-byte stack buffer overrun in osmo-pcu Address sanitizer uncovered a one-byte stack overrun due to an off-by-one in the size of the 'data' buffer in pcu_l1if_tx_pch(). Fix the problem and add an assertion which triggers before the overrun can occur. Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Related: OS#3289 --- M src/pcu_l1_if.cpp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/9301/2 -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:30:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 13:30:18 +0000 Subject: Change in osmo-bsc[master]: add bsc_stubs.h to workaround linking hell for utils and tests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9279 ) Change subject: add bsc_stubs.h to workaround linking hell for utils and tests ...................................................................... Patch Set 1: > tldr: yes, utterly temporary. > > I have often been aching to resolve that madness where libbsc > cannot compile without osmo-bsc. The unknown here is osmo-bsc_nat > -- how will we resurrect it? unclear at this point. For the time being, we can keep the sccplite-only bsc_nat as-is in openbsc.git > Which parts of libbsc will be shared? Almost none. I just tried to compile osmo-bsc_nat without libbsc.a and there are very few symbols needed from libbsc, only some simple parsers. I am all for removing bsc_api callback function structure and merging libbsc/* into osmo-bsc. So if you feel like now is a good time, feel free to do it. -- To view, visit https://gerrit.osmocom.org/9279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I000be689ed071aced1a085284f924a7e77e5656d Gerrit-Change-Number: 9279 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte Gerrit-Comment-Date: Fri, 25 May 2018 13:30:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:33:59 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 25 May 2018 13:33:59 +0000 Subject: Change in libosmocore[master]: Add gsm48_cause_coding Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/9303 Change subject: Add gsm48_cause_coding ...................................................................... Add gsm48_cause_coding Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/9303/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 68ba650..c54aa4f 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1399,6 +1399,13 @@ GSM48_CAUSE_LOC_NET_BEYOND = 0x0a, }; +enum gsm48_cause_coding { + GSM48_CAUSE_CODING_CCITT_Q931 = 0x00, + GSM48_CAUSE_CODING_RESERVED = 0x01, + GSM48_CAUSE_CODING_NATIONAL = 0x02, + GSM48_CAUSE_CODING_GSMPLMNS = 0x03, +}; + /* Section 10.5.2.31 RR Cause / Table 10.5.70 */ enum gsm48_rr_cause { GSM48_RR_CAUSE_NORMAL = 0x00, -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:34:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 13:34:49 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9302 ) Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/#/c/9302/1/src/gprs_rlcmac_meas.cpp File src/gprs_rlcmac_meas.cpp: https://gerrit.osmocom.org/#/c/9302/1/src/gprs_rlcmac_meas.cpp at 82 PS1, Line 82: + ((now_tv.tv_nsec/1000 - rssi_tv->tv_nsec/1000) << 7) / 1000000; Probably more exact to divide /1000 after the substraction? https://gerrit.osmocom.org/#/c/9302/1/src/gprs_rlcmac_meas.cpp at 134 PS1, Line 134: + ((now_tv.tv_nsec/1000 - loss_tv->tv_nsec/1000) << 7) / 1000000; same https://gerrit.osmocom.org/#/c/9302/1/src/gprs_rlcmac_meas.cpp at 178 PS1, Line 178: + ((now_tv.tv_nsec/1000 - bw_tv->tv_nsec/1000) << 7) / 1000000; same https://gerrit.osmocom.org/#/c/9302/1/src/tbf.cpp File src/tbf.cpp: https://gerrit.osmocom.org/#/c/9302/1/src/tbf.cpp at 185 PS1, Line 185: memset(&rssi_tv, 0, sizeof(rssi_tv)); Use timespecclear from include/osmocom/core/timer_compat.h https://gerrit.osmocom.org/#/c/9302/1/src/tbf.cpp at 1027 PS1, Line 1027: memset(&dl_bw_tv, 0, sizeof(dl_bw_tv)); Same here -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Fri, 25 May 2018 13:34:49 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 13:35:27 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 13:35:27 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9301 ) Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 13:35:27 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 14:11:31 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 25 May 2018 14:11:31 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9261 to look at the new patch set (#3). Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... rtp: make port range configurable, assign correct port numbers The current implementation does not allow the user to specify a port range in which the BTS is allowed to allocate a local RTP port. Also the ports the BTS picks do not match the policy described in RFC3550. An RTP Port must be at an even port number and the matching RTCP port must be at the following (odd) port number. The BTS currently picks random port numbers for both. - Add a VTY command to specify a port range in which the BTS may assign local ports. - Pick ports as described in RFC3550. Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Related: OS#2825 OS#2635 --- M include/osmo-bts/gsm_data_shared.h M src/common/bts.c M src/common/rsl.c M src/common/vty.c 4 files changed, 72 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/9261/3 -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 15:17:25 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Fri, 25 May 2018 15:17:25 +0000 Subject: Change in libosmocore[master]: Add gsm48_cause_coding In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9303 to look at the new patch set (#2). Change subject: Add gsm48_cause_coding ...................................................................... Add gsm48_cause_coding Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/9303/2 -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri May 25 16:10:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 May 2018 16:10:39 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3604?= Message-ID: <1970780148.160.1527264639748.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 881.26 KB...] void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC RANAP_PositioningDataSet.lo CC RANAP_PositioningMethodAndUsage.lo CC RANAP_PositioningPriority.lo CC RANAP_PositionData.lo CC RANAP_PositionDataSpecificToGERANIuMode.lo CC RANAP_Pre-emptionCapability.lo CC RANAP_Pre-emptionVulnerability.lo CC RANAP_PriorityLevel.lo CC RANAP_Priority-Class-Indicator.lo CC RANAP_ProvidedData.lo CC RANAP_P-TMSI.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from ../../include/osmocom/ranap/RANAP_ProvidedData.h:14, from RANAP_ProvidedData.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: 'struct MemberA' declared inside parameter list A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: 'struct MemberM' declared inside parameter list A_SEQUENCE_OF(struct MemberM { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC RANAP_QueuingAllowed.lo CC RANAP_RAB-AsymmetryIndicator.lo CC RANAP_RABased.lo CC RANAP_RAI-List.lo CC RANAP_RABDataVolumeReport.lo CC RANAP_RAB-ID.lo CC RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:14, from RANAP_RABDataVolumeReport.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ CC RANAP_RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RAB-Parameter-MaxBitrateList.lo CC RANAP_RAB-Parameters.lo CC RANAP_RABParametersList.lo CC RANAP_RAB-SubflowCombinationBitRate.lo CC RANAP_RAB-TrCH-Mapping.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from RANAP_RABParametersList.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: 'struct MemberB' declared inside parameter list A_SEQUENCE_OF(struct MemberB { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberB { ^ CC RANAP_RAB-TrCH-MappingItem.lo CC RANAP_RAC.lo CC RANAP_RAI.lo CC RANAP_RAListofIdleModeUEs.lo CC RANAP_NotEmptyRAListofIdleModeUEs.lo CC RANAP_RAofIdleModeUEs.lo CC RANAP_LAListofIdleModeUEs.lo CC RANAP_RAT-Type.lo CC RANAP_RateControlAllowed.lo CC RANAP_RedirectAttemptFlag.lo CC RANAP_RedirectionCompleted.lo CC RANAP_RejectCauseValue.lo CC RANAP_RelocationRequirement.lo CC RANAP_RelocationType.lo CC RANAP_RepetitionNumber0.lo CC RANAP_RepetitionNumber1.lo CC RANAP_ReportArea.lo CC RANAP_ReportInterval.lo CC RANAP_ReportAmount.lo CC RANAP_RequestedGPSAssistanceData.lo CC RANAP_RequestedGANSSAssistanceData.lo CC RANAP_RequestedLocationRelatedDataType.lo CC RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.lo CC RANAP_MBMSIPMulticastAddressandAPNlist.lo CC RANAP_RequestedMulticastServiceList.lo CC RANAP_Requested-RAB-Parameter-Values.lo CC RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.lo CC RANAP_Requested-RAB-Parameter-MaxBitrateList.lo CC RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.lo CC RANAP_RequestType.lo CC RANAP_ResidualBitErrorRatio.lo CC RANAP_ResponseTime.lo CC RANAP_RIMInformation.lo CC RANAP_RIM-Transfer.lo CC RANAP_RIMRoutingAddress.lo CC RANAP_RNC-ID.lo CC RANAP_RNCTraceInformation.lo CC RANAP_RNSAPRelocationParameters.lo CC RANAP_RRC-Container.lo CC RANAP_RTLoadValue.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_RABParametersList.h:14, from ../../include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h:14, from RANAP_RNSAPRelocationParameters.c:7: ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: 'struct MemberN' declared inside parameter list A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberN { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberN { ^ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: 'struct MemberB' declared inside parameter list A_SEQUENCE_OF(struct MemberB { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberB { ^ CC RANAP_RSRVCC-HO-Indication.lo CC RANAP_RSRVCC-Information.lo CC RANAP_RSRVCC-Operation-Possible.lo CC RANAP_SAC.lo CC RANAP_SAI.lo CC RANAP_SAPI.lo CC RANAP_SessionUpdateID.lo CC RANAP_Shared-Network-Information.lo CC RANAP_Session-Re-establishment-Indicator.lo CC RANAP_SignallingIndication.lo CC RANAP_SDU-ErrorRatio.lo In file included from /build/deps/install/stow/libasn1c/include/asn1c/asn_SEQUENCE_OF.h:8:0, from ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:14, from ../../include/osmocom/ranap/RANAP_Shared-Network-Information.h:14, from RANAP_Shared-Network-Information.c:7: ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: 'struct MemberA' declared inside parameter list A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: its scope is only this definition or declaration, which is probably not what you want A_SEQUENCE_OF(struct MemberA { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberA { ^ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: 'struct MemberM' declared inside parameter list A_SEQUENCE_OF(struct MemberM { ^ /build/deps/install/stow/libasn1c/include/asn1c/asn_SET_OF.h:17:16: note: in definition of macro 'A_SET_OF' void (*free)(type *); \ ^ ../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro 'A_SEQUENCE_OF' A_SEQUENCE_OF(struct MemberM { ^ CC RANAP_SDU-FormatInformationParameters.lo CC RANAP_SDU-FormatInformationParameterItem.lo CC RANAP_SDU-Parameters.lo CC RANAP_SDU-ParameterItem.lo /bin/bash: line 1: 22053 Segmentation fault (core dumped) /bin/bash ../../libtool --silent --tag=CC --mode=compile gcc -DPACKAGE_NAME=\"osmo-iuh\" -DPACKAGE_TARNAME=\"osmo-iuh\" -DPACKAGE_VERSION=\"0.3.0\" -DPACKAGE_STRING=\"osmo-iuh\ 0.3.0\" -DPACKAGE_BUGREPORT=\"openbsc at 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-iuh\" -DVERSION=\"0.3.0\" -DSTDC_HEADERS=1 -I. -Wall -I../../include -I/build/deps/install/stow/libasn1c/include/ -I/build/deps/install/stow/libasn1c/include/asn1c -I/build/deps/install/stow/libosmocore/include/ -g -O2 -Wall -MT RANAP_SDU-ParameterItem.lo -MD -MP -MF .deps/RANAP_SDU-ParameterItem.Tpo -c -o RANAP_SDU-ParameterItem.lo RANAP_SDU-ParameterItem.c Makefile:2494: recipe for target 'RANAP_SDU-ParameterItem.lo' failed make[4]: *** [RANAP_SDU-ParameterItem.lo] Error 139 make[4]: *** Waiting for unfinished jobs.... make[4]: Leaving directory '/build/deps/osmo-iuh/src/ranap' Makefile:630: recipe for target 'install-recursive' failed make[3]: *** [install-recursive] Error 1 make[3]: Leaving directory '/build/deps/osmo-iuh/src' Makefile:789: recipe for target 'install' failed make[2]: *** [install] Error 2 make[2]: Leaving directory '/build/deps/osmo-iuh/src' Makefile:442: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/osmo-iuh' make[1]: *** [install-recursive] Error 1 Makefile:741: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Fri May 25 16:16:15 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 May 2018 16:16:15 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3605?= In-Reply-To: <1970780148.160.1527264639748.JavaMail.jenkins@jenkins.osmocom.org> References: <1970780148.160.1527264639748.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2025715407.161.1527264975933.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Fri May 25 16:48:12 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 16:48:12 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9302 to look at the new patch set (#2). Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... read monotonic clock with clock_gettime() instead of gettimeofday() There have been test failures on the osmo-pcu Jenkins builders due to apparent clock drift. Switch relevant code from gettimeofday() to clock_gettime() with CLOCK_MONOTONIC to prevent time from going backwards and causing negative time deltas in calculations. Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/02/9302/2 -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 16:48:48 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Fri, 25 May 2018 16:48:48 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Stefan Sperling has posted comments on this change. ( https://gerrit.osmocom.org/9302 ) Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... Patch Set 2: Thanks for the review! Patch set 2 should address your comments. -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 16:48:48 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:05:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Fri, 25 May 2018 17:05:39 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9302 ) Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 17:05:39 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:15 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix check for MSC-side FSM allocation failure Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9316 Change subject: bsc: Fix check for MSC-side FSM allocation failure ...................................................................... bsc: Fix check for MSC-side FSM allocation failure In gscon_fsm_wait_mdcx_bts() we try to allocate conn->user_plane.fi_msc but then check whether conn->user_plane.fi_bts is set, possibly due to a copy+paste error. Let's fix that. Change-Id: I1f515910f67492257866791588f32b350fadf815 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/9316/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 7f53f1b..d741f00 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -661,7 +661,7 @@ conn->user_plane.fi_msc = mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer); - if (!conn->user_plane.fi_bts) { + if (!conn->user_plane.fi_msc) { resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); sigtran_send(conn, resp, fi); osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); -- To view, visit https://gerrit.osmocom.org/9316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1f515910f67492257866791588f32b350fadf815 Gerrit-Change-Number: 9316 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:15 +0000 Subject: Change in osmo-bsc[master]: vty: Permit selection of other ASP protocol than M3UA Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9317 Change subject: vty: Permit selection of other ASP protocol than M3UA ...................................................................... vty: Permit selection of other ASP protocol than M3UA We used to have hard-coded M3UA. Let's allow the user to configure this per MSC using a new "asp-protocol (m3ua|sua|ipa)" VTY command. For SUA this should just work 1:1 without any trouble. For IPA, this of course only changes the underlying transport without reflecting the various differences in terms of BSSMAP ASSIGNMENT, MGCP handling, etc. Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 Related: OS#2544 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/9317/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index bedf412..ce6512e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -110,6 +110,9 @@ struct osmo_sccp_instance *sccp; struct osmo_sccp_user *sccp_user; + /* IPA or M3UA or SUA? */ + enum osmo_ss7_asp_protocol asp_proto; + /* Holds a copy of the our local MSC address, * this will be the sccp-address that is associated * with the A interface of this particular BSC, diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e9309ea..612a00b 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -98,6 +98,7 @@ msc_data->nr = nr; msc_data->allow_emerg = 1; + msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA; /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 1a31a7c..6778201 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -447,7 +447,7 @@ default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); msc->a.sccp = osmo_sccp_simple_client_on_ss7_id(msc, msc->a.cs7_instance, msc_name, default_pc, - OSMO_SS7_ASP_PROT_M3UA, 0, NULL, 0, NULL); + msc->a.asp_proto, 0, NULL, 0, NULL); if (!msc->a.sccp) return -EINVAL; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 36c3223..bda89c1 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -181,6 +181,7 @@ vty_out(vty, " msc-addr %s%s", msc->a.msc_addr_name, VTY_NEWLINE); } + vty_out(vty, " asp-protocol %s%s", osmo_ss7_asp_protocol_name(msc->a.asp_proto), VTY_NEWLINE); /* write MGW configuration */ mgcp_client_config_write(vty, " "); @@ -672,6 +673,20 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_cs7_asp_proto, + cfg_msc_cs7_asp_proto_cmd, + "asp-protocol (m3ua|sua|ipa)", + "A interface protocol to use for this MSC)\n" + "MTP3 User Adaptation\n" + "SCCP User Adaptation\n" + "IPA Multiplex (SCCP Lite)\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + + msc->a.asp_proto = get_string_value(osmo_ss7_asp_protocol_vals, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -951,6 +966,7 @@ install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd); install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd); install_element(MSC_NODE, &cfg_msc_cs7_msc_addr_cmd); + install_element(MSC_NODE, &cfg_msc_cs7_asp_proto_cmd); /* Deprecated: ping time config, kept to support legacy config files. */ install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd); -- To view, visit https://gerrit.osmocom.org/9317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 Gerrit-Change-Number: 9317 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9318 Change subject: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port ...................................................................... bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port Also: Move mgcp_timeslot_to_port() next to it, as they are more or less the inverse transformation of each other. Change-Id: Ica908e2bb8fc4e59e0d146b428c93a9efc385688 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/osmo_bsc_bssap.c 2 files changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/9318/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index ce6512e..fef674e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -28,6 +28,7 @@ #define _OSMO_MSC_DATA_H #include "bsc_msc.h" +#include "debug.h" #include #include @@ -42,6 +43,7 @@ #include #include +#include struct osmo_bsc_rf; struct gsm_network; @@ -162,5 +164,25 @@ struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int); struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int); +/* Helper function to calculate the port number for a given + * timeslot/multiplex. This functionality is needed to support + * the sccp-lite scenario where the MGW is handled externally */ +static inline int mgcp_timeslot_to_port(int multiplex, int timeslot, int base) +{ + if (timeslot == 0) { + LOGP(DLMGCP, LOGL_ERROR, "Timeslot should not be 0\n"); + timeslot = 255; + } + + return base + (timeslot + (32 * multiplex)) * 2; +} + +static inline int mgcp_port_to_cic(uint16_t port, uint16_t base) +{ + if (port < base) + return -EINVAL; + return (port - base) / 2; +} + #endif diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3f7e4f8..1dfd5b4 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -634,19 +634,6 @@ return -1; } -/* Helper function to calculate the port number for a given - * timeslot/multiplex. This functionality is needed to support - * the sccp-lite scenario where the MGW is handled externally */ -static inline int mgcp_timeslot_to_port(int multiplex, int timeslot, int base) -{ - if (timeslot == 0) { - LOGP(DLMGCP, LOGL_ERROR, "Timeslot should not be 0\n"); - timeslot = 255; - } - - return base + (timeslot + (32 * multiplex)) * 2; -} - /* * Handle the assignment request message. * -- To view, visit https://gerrit.osmocom.org/9318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ica908e2bb8fc4e59e0d146b428c93a9efc385688 Gerrit-Change-Number: 9318 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Use correct MGCP endpoint name for IPA/SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9319 Change subject: bsc: Use correct MGCP endpoint name for IPA/SCCPlite ...................................................................... bsc: Use correct MGCP endpoint name for IPA/SCCPlite In IPA/SCCPlite, we have to use the CIC to construct the MGCP endpoint name instead of the usual dynamic endpoint allocation. Change-Id: I03e2cdbc8e40169e52df3720c40b66734e880525 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/9319/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index d741f00..0598535 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -386,6 +386,25 @@ } } +static const char *get_mgw_ep_name(struct gsm_subscriber_connection *conn) +{ + static char ep_name[256]; + struct bsc_msc_data *msc = conn->sccp.msc; + + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* derive endpoint name from CIC on A interface side */ + snprintf(ep_name, sizeof(ep_name), "%x at mgw", + mgcp_port_to_cic(conn->user_plane.rtp_port, msc->rtp_base)); + break; + default: + /* use dynamic RTPBRIDGE endpoint allocation in MGW */ + osmo_strlcpy(ep_name, ENDPOINT_ID, sizeof(ep_name)); + break; + } + return ep_name; +} + /* We're on an active subscriber connection, passing DTAP back and forth */ static void gscon_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -416,7 +435,7 @@ * mgcp-ass-mgcp state-chain (see FIXME above) */ memset(&conn_peer, 0, sizeof(conn_peer)); conn_peer.call_id = conn->sccp.conn_id; - osmo_strlcpy(conn_peer.endpoint, ENDPOINT_ID, sizeof(conn_peer.endpoint)); + osmo_strlcpy(conn_peer.endpoint, get_mgw_ep_name(conn), sizeof(conn_peer.endpoint)); /* (Pre)Change state and create the connection */ osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_BTS, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR); -- To view, visit https://gerrit.osmocom.org/9319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I03e2cdbc8e40169e52df3720c40b66734e880525 Gerrit-Change-Number: 9319 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9320 Change subject: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case ...................................................................... bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case Change-Id: If362a0084de452727cd063063dfb645eca2f9beb --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/9320/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 1dfd5b4..d9fe103 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -710,23 +710,11 @@ aoip = true; } else { LOGP(DMSC, LOGL_ERROR, "AoIP transport address and CIC missing. " - "Audio will not work.\n"); + "Audio would not work; rejecting\n"); cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING; goto reject; } - /* FIXME: At the moment osmo-bsc does not support any other - * A-Interface other than AoIP. So we must reject all - * assignment requests that are not AoIP compliant. However, - * might support other A-Interface dialects lateron again, - * thats why we preserve the logic around the AoIP detection - * here. */ - if (!aoip) { - LOGP(DMSC, LOGL_ERROR, "Requested A-Interface type is not supported! (AoIP only!)\n"); - cause = GSM0808_CAUSE_REQ_A_IF_TYPE_NOT_SUPP; - goto reject; - } - /* Decode speech codec list (AoIP) */ conn->codec_list_present = false; if (aoip) { -- To view, visit https://gerrit.osmocom.org/9320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If362a0084de452727cd063063dfb645eca2f9beb Gerrit-Change-Number: 9320 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9321 Change subject: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite ...................................................................... bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/9321/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 0598535..73e9224 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -242,14 +242,20 @@ /* Generate voice related fields */ if (voice) { - OSMO_ASSERT(lchan->abis_ip.ass_compl.valid); perm_spch = bssap_speech_from_lchan(lchan); - addr_local = &conn->user_plane.aoip_rtp_addr_local; + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* don't add any AoIP specific fields. CIC allocated by MSC */ + break; + default: + OSMO_ASSERT(lchan->abis_ip.ass_compl.valid); + addr_local = &conn->user_plane.aoip_rtp_addr_local; - /* Extrapolate speech codec from speech mode */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ - + /* Extrapolate speech codec from speech mode */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ + break; + } /* FIXME: AMR codec configuration must be derived from lchan1! */ } -- To view, visit https://gerrit.osmocom.org/9321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 Gerrit-Change-Number: 9321 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:25:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:25:18 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9322 Change subject: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case ...................................................................... bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case In IPA/SCCPlite, the MSC is handling MGCP to the BSC-MGW directly and the BSC only takes care of the BTS-side MGCP connection. We achieve this by transitioning directly from WAIT_MDCX_BTS into ACTIVE in this case. Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Related: OS#2544 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/9322/1 diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 73e9224..ed3c8f3 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -681,16 +681,26 @@ * BTS connection. */ osmo_strlcpy(conn_peer.endpoint, conn->user_plane.mgw_endpoint, sizeof(conn_peer.endpoint)); - /* (Pre)Change state and create the connection */ - osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR); - conn->user_plane.fi_msc = - mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC, - &conn_peer); - if (!conn->user_plane.fi_msc) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* Send assignment complete message to the MSC */ + send_ass_compl(conn->lchan, fi, true); osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); - return; + break; + default: + /* (Pre)Change state and create the connection */ + osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT, + MGCP_MGW_TIMEOUT_TIMER_NR); + conn->user_plane.fi_msc = mgcp_conn_create(conn->network->mgw.client, fi, + GSCON_EV_MGW_FAIL_MSC, + GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer); + if (!conn->user_plane.fi_msc) { + resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); + sigtran_send(conn, resp, fi); + osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + return; + } + break; } break; -- To view, visit https://gerrit.osmocom.org/9322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Gerrit-Change-Number: 9322 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:29:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:29:01 +0000 Subject: Change in libosmocore[master]: remove unused argument from pad_append_ctr() helper function In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9300 ) Change subject: remove unused argument from pad_append_ctr() helper function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iff5699be1dc306120cc1752b0a892e4fcbc5a8c0 Gerrit-Change-Number: 9300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 17:29:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:29:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:29:02 +0000 Subject: Change in libosmocore[master]: remove unused argument from pad_append_ctr() helper function In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9300 ) Change subject: remove unused argument from pad_append_ctr() helper function ...................................................................... remove unused argument from pad_append_ctr() helper function Change-Id: Iff5699be1dc306120cc1752b0a892e4fcbc5a8c0 Fixes: 97d3da2c591984b47839fd1d9a5cba24a7f05fa1 Related: OS#3245 --- M src/vty/utils.c 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/vty/utils.c b/src/vty/utils.c index 4d37093..0d663c6 100644 --- a/src/vty/utils.c +++ b/src/vty/utils.c @@ -93,7 +93,7 @@ } static char * -pad_append_ctr(char *s, uint64_t ctr, int minwidth, void *ctx) +pad_append_ctr(char *s, uint64_t ctr, int minwidth) { s = talloc_asprintf_append(s, "%*" PRIu64, minwidth, ctr); OSMO_ASSERT(s); @@ -158,22 +158,22 @@ s = pad_append_str(s, desc->name, minwidth); break; case 'c': - s = pad_append_ctr(s, ctr->current, minwidth, vty); + s = pad_append_ctr(s, ctr->current, minwidth); break; case 'p': - s = pad_append_ctr(s, ctr->previous, minwidth, vty); + s = pad_append_ctr(s, ctr->previous, minwidth); break; case 'S': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_SEC].rate, minwidth); break; case 'M': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_MIN].rate, minwidth); break; case 'H': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_HOUR].rate, minwidth); break; case 'D': - s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth, vty); + s = pad_append_ctr(s, ctr->intv[RATE_CTR_INTV_DAY].rate, minwidth); break; default: break; -- To view, visit https://gerrit.osmocom.org/9300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iff5699be1dc306120cc1752b0a892e4fcbc5a8c0 Gerrit-Change-Number: 9300 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:29:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:29:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/8020 ) Change subject: make PCU tests send PS paging requests on BVCI zero ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-Change-Number: 8020 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 17:29:30 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:29:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:29:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: make PCU tests send PS paging requests on BVCI zero In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/8020 ) Change subject: make PCU tests send PS paging requests on BVCI zero ...................................................................... make PCU tests send PS paging requests on BVCI zero osmo-pcu discards PAGING-PS messages unless received on the signalling BVCI 0. The BVCI value must be set to zero both in the NS header and the BSSGP header. Create new ports between the PCU_Test components which the TC_paging test case can use to ensure that both layers send frames with BVCI value of zero. This does not make PCU_Tests.tc_paging work yet, however the PS paging request is now processed by osmo-pcu rather than discarded. Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Related: OS#2404 --- M library/BSSGP_Emulation.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 11 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c7766dc..321c344 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -80,6 +80,7 @@ type component BSSGP_Client_CT { port BSSGP_PT BSSGP; + port BSSGP_PT BSSGP_SIG; port BSSGP_PROC_PT BSSGP_PROC; }; @@ -99,10 +100,11 @@ } type component BSSGP_CT { - /* UDP port towards the bottom (IUT) */ + /* UDP ports towards the bottom (IUT) */ port NS_PT BSCP; /* NS-User SAP towards the user */ port BSSGP_SP_PT BSSGP_SP; + port BSSGP_SP_PT BSSGP_SP_SIG; port BSSGP_PROC_PT BSSGP_PROC; var BssgpConfig g_cfg; @@ -534,6 +536,10 @@ } } + [] BSSGP_SP_SIG.receive(PDU_BSSGP:?)-> value bs_pdu sender vc_conn { + BSCP.send(f_BnsUdReq(bs_pdu, 0)); + } + /* pass virtually any PDU from user to NS-UNITDATA PDU on network */ [] BSSGP_SP.receive(PDU_BSSGP:?) -> value bs_pdu sender vc_conn { BSCP.send(f_BnsUdReq(bs_pdu, g_cfg.bvci)); diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 12b63d6..6e36f68 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -60,6 +60,7 @@ bssgp_component := BSSGP_CT.create; /* connect our BSSGP port to the BSSGP Emulation */ connect(self:BSSGP, bssgp_component:BSSGP_SP); + connect(self:BSSGP_SIG, bssgp_component:BSSGP_SP_SIG); connect(self:BSSGP_PROC, bssgp_component:BSSGP_PROC); /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); @@ -200,8 +201,9 @@ g_mmctx.tlli := f_random_tlli(); f_init(); - BSSGP.send(ts_BSSGP_PS_PAGING_IMSI(mp_gb_cfg.bvci, g_mmctx.imsi)); - BSSGP.send(ts_BSSGP_PS_PAGING_PTMSI(mp_gb_cfg.bvci, g_mmctx.imsi, tmsi)); + /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); while (true) { var BssgpDecoded bd; -- To view, visit https://gerrit.osmocom.org/8020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0437123b04b7320a4f690f0646578c57abf6bc87 Gerrit-Change-Number: 8020 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:30:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:30:02 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9301 ) Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 17:30:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:30:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:30:06 +0000 Subject: Change in osmo-pcu[master]: fix a one-byte stack buffer overrun in osmo-pcu In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9301 ) Change subject: fix a one-byte stack buffer overrun in osmo-pcu ...................................................................... fix a one-byte stack buffer overrun in osmo-pcu Address sanitizer uncovered a one-byte stack overrun due to an off-by-one in the size of the 'data' buffer in pcu_l1if_tx_pch(). Fix the problem and add an assertion which triggers before the overrun can occur. Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Related: OS#3289 --- M src/pcu_l1_if.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4b54707..27e86dd 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -217,7 +217,7 @@ void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi) { - uint8_t data[23+3]; /* prefix PLEN */ + uint8_t data[3+1+23]; /* prefix PLEN */ /* paging group */ if (!imsi || strlen(imsi) < 3) @@ -227,6 +227,7 @@ data[1] = imsi[1]; data[2] = imsi[2]; + OSMO_ASSERT(block->data_len <= sizeof(data) - (3+1)); bitvec_pack(block, data + 3+1); data[3] = (plen << 2) | 0x01; pcu_tx_data_req(0, 0, PCU_IF_SAPI_PCH, 0, 0, 0, data, 23+3); -- To view, visit https://gerrit.osmocom.org/9301 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08a879d72fcb916f78f175612fd90467d7bdd57c Gerrit-Change-Number: 9301 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:31:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:31:17 +0000 Subject: Change in libosmocore[master]: Add gsm48_cause_coding In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9303 ) Change subject: Add gsm48_cause_coding ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9303/2/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/9303/2/include/osmocom/gsm/protocol/gsm_04_08.h at 1395 PS2, Line 1395: GSM48_CAUSE_CODING_GSMPLMNS = 0x03, maybe just GSM48_CAUSE_CODING_GSM ? I think that's easier to understand... And it's not like there's different GSM specific values in this enum (and hence requiring further clarification)? -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 17:31:17 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:32:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:32:18 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9261 ) Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 17:32:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:33:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:33:05 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9302 ) Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Fri, 25 May 2018 17:33:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:33:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:33:07 +0000 Subject: Change in osmo-pcu[master]: read monotonic clock with clock_gettime() instead of gettimeofday() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9302 ) Change subject: read monotonic clock with clock_gettime() instead of gettimeofday() ...................................................................... read monotonic clock with clock_gettime() instead of gettimeofday() There have been test failures on the osmo-pcu Jenkins builders due to apparent clock drift. Switch relevant code from gettimeofday() to clock_gettime() with CLOCK_MONOTONIC to prevent time from going backwards and causing negative time deltas in calculations. Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 22 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index 41a7531..ac01f2a 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -71,22 +71,22 @@ /* RSSI values received from MS */ int gprs_rlcmac_rssi(struct gprs_rlcmac_tbf *tbf, int8_t rssi) { - struct timeval now_tv, *rssi_tv = &tbf->meas.rssi_tv; + struct timespec now_tv, *rssi_tv = &tbf->meas.rssi_tv; uint32_t elapsed; tbf->meas.rssi_sum += rssi; tbf->meas.rssi_num++; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7) - + ((now_tv.tv_usec - rssi_tv->tv_usec) << 7) / 1000000; + + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) return 0; gprs_rlcmac_rssi_rep(tbf); /* reset rssi values and timestamp */ - memcpy(rssi_tv, &now_tv, sizeof(struct timeval)); + memcpy(rssi_tv, &now_tv, sizeof(*rssi_tv)); tbf->meas.rssi_sum = 0; tbf->meas.rssi_num = 0; @@ -115,7 +115,7 @@ int gprs_rlcmac_received_lost(struct gprs_rlcmac_dl_tbf *tbf, uint16_t received, uint16_t lost) { - struct timeval now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; + struct timespec now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; uint32_t elapsed; uint16_t sum = received + lost; @@ -129,16 +129,16 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7) - + ((now_tv.tv_usec - loss_tv->tv_usec) << 7) / 1000000; + + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) return 0; gprs_rlcmac_lost_rep(tbf); /* reset lost values and timestamp */ - memcpy(loss_tv, &now_tv, sizeof(struct timeval)); + memcpy(loss_tv, &now_tv, sizeof(*loss_tv)); tbf->m_bw.dl_loss_received = 0; tbf->m_bw.dl_loss_lost = 0; @@ -168,14 +168,14 @@ int gprs_rlcmac_dl_bw(struct gprs_rlcmac_dl_tbf *tbf, uint16_t octets) { - struct timeval now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; + struct timespec now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; uint32_t elapsed; tbf->m_bw.dl_bw_octets += octets; - gettimeofday(&now_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7) - + ((now_tv.tv_usec - bw_tv->tv_usec) << 7) / 1000000; + + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) return 0; @@ -186,7 +186,7 @@ tbf->m_bw.dl_bw_octets / elapsed); /* reset bandwidth values timestamp */ - memcpy(bw_tv, &now_tv, sizeof(struct timeval)); + memcpy(bw_tv, &now_tv, sizeof(*bw_tv)); tbf->m_bw.dl_bw_octets = 0; return 0; diff --git a/src/tbf.cpp b/src/tbf.cpp index 14c1ee2..76137df 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -182,7 +183,7 @@ rssi_sum(0), rssi_num(0) { - timerclear(&rssi_tv); + timespecclear(&rssi_tv); } gprs_rlcmac_tbf::gprs_rlcmac_tbf(BTS *bts_, gprs_rlcmac_tbf_direction dir) : @@ -913,7 +914,7 @@ } /* set timestamp */ - gettimeofday(&tbf->meas.rssi_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->meas.rssi_tv); tbf->set_ms(ms); @@ -1024,8 +1025,8 @@ dl_loss_lost(0), dl_loss_received(0) { - timerclear(&dl_bw_tv); - timerclear(&dl_loss_tv); + timespecclear(&dl_bw_tv); + timespecclear(&dl_loss_tv); } gprs_rlcmac_dl_tbf::gprs_rlcmac_dl_tbf(BTS *bts_) : @@ -1114,8 +1115,8 @@ tbf->m_last_dl_poll_fn = -1; tbf->m_last_dl_drained_fn = -1; - gettimeofday(&tbf->m_bw.dl_bw_tv, NULL); - gettimeofday(&tbf->m_bw.dl_loss_tv, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_bw_tv); + osmo_clock_gettime(CLOCK_MONOTONIC, &tbf->m_bw.dl_loss_tv); return tbf; } diff --git a/src/tbf.h b/src/tbf.h index 803b294..dc0b050 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -318,7 +318,7 @@ unsigned int num_fT_exp; /* number of consecutive fT expirations */ struct Meas { - struct timeval rssi_tv; /* timestamp for rssi calculation */ + struct timespec rssi_tv; /* timestamp for rssi calculation */ int32_t rssi_sum; /* sum of rssi values */ int rssi_num; /* number of rssi values added since rssi_tv */ @@ -665,11 +665,11 @@ int32_t m_last_dl_drained_fn; struct BandWidth { - struct timeval dl_bw_tv; /* timestamp for dl bw calculation */ + struct timespec dl_bw_tv; /* timestamp for dl bw calculation */ uint32_t dl_bw_octets; /* number of octets since bw_tv */ uint32_t dl_throughput; /* throughput to be displayed in stats */ - struct timeval dl_loss_tv; /* timestamp for loss calculation */ + struct timespec dl_loss_tv; /* timestamp for loss calculation */ uint16_t dl_loss_lost; /* sum of lost packets */ uint16_t dl_loss_received; /* sum of received packets */ -- To view, visit https://gerrit.osmocom.org/9302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I775d85d0d3ac740330879e588bdab6fce7f0b46c Gerrit-Change-Number: 9302 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:33:12 +0000 Subject: Change in osmo-bts[master]: rtp: make port range configurable, assign correct port numbers In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9261 ) Change subject: rtp: make port range configurable, assign correct port numbers ...................................................................... rtp: make port range configurable, assign correct port numbers The current implementation does not allow the user to specify a port range in which the BTS is allowed to allocate a local RTP port. Also the ports the BTS picks do not match the policy described in RFC3550. An RTP Port must be at an even port number and the matching RTCP port must be at the following (odd) port number. The BTS currently picks random port numbers for both. - Add a VTY command to specify a port range in which the BTS may assign local ports. - Pick ports as described in RFC3550. Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Related: OS#2825 OS#2635 --- M include/osmo-bts/gsm_data_shared.h M src/common/bts.c M src/common/rsl.c M src/common/vty.c 4 files changed, 72 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 81cac3e..f4fb766 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -688,6 +688,11 @@ struct llist_head oml_queue; unsigned int rtp_jitter_buf_ms; bool rtp_jitter_adaptive; + + uint16_t rtp_port_range_start; + uint16_t rtp_port_range_end; + uint16_t rtp_port_range_next; + struct { uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ } support; diff --git a/src/common/bts.c b/src/common/bts.c index 74630cc..54e5480 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -135,6 +135,9 @@ bts->paging_state = paging_init(bts, 200, 0); bts->ul_power_target = -75; /* dBm default */ bts->rtp_jitter_adaptive = false; + bts->rtp_port_range_start = 16384; + bts->rtp_port_range_end = 17407; + bts->rtp_port_range_next = bts->rtp_port_range_start; /* configurable via OML */ bts->load.ccch.load_ind_period = 112; diff --git a/src/common/rsl.c b/src/common/rsl.c index 5dd2c59..b5d0c2b 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1787,6 +1787,29 @@ return hostbuf; } +static int bind_rtp(struct gsm_bts *bts, struct osmo_rtp_socket *rs, const char *ip) +{ + int rc; + unsigned int i; + unsigned int tries; + + tries = (bts->rtp_port_range_end - bts->rtp_port_range_start) / 2; + for (i = 0; i < tries; i++) { + + if (bts->rtp_port_range_next >= bts->rtp_port_range_end) + bts->rtp_port_range_next = bts->rtp_port_range_start; + + rc = osmo_rtp_socket_bind(rs, ip, bts->rtp_port_range_next); + + bts->rtp_port_range_next += 2; + + if (rc == 0) + return 0; + } + + return -1; +} + static int rsl_rx_ipac_XXcx(struct msgb *msg) { struct abis_rsl_dchan_hdr *dch = msgb_l2(msg); @@ -1907,8 +1930,7 @@ * back to the BSC in the CRCX_ACK */ ipstr = get_rsl_local_ip(lchan->ts->trx); } - rc = osmo_rtp_socket_bind(lchan->abis_ip.rtp_socket, - ipstr, -1); + rc = bind_rtp(bts, lchan->abis_ip.rtp_socket, ipstr); if (rc < 0) { LOGP(DRTP, LOGL_ERROR, "%s IPAC Failed to bind RTP/RTCP sockets\n", diff --git a/src/common/vty.c b/src/common/vty.c index 2716a7a..6061335 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -262,6 +262,8 @@ if (bts->rtp_jitter_adaptive) vty_out(vty, " adaptive"); vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " rtp port-range %u %u%s", bts->rtp_port_range_start, + bts->rtp_port_range_end, VTY_NEWLINE); vty_out(vty, " paging queue-size %u%s", paging_get_queue_max(bts->paging_state), VTY_NEWLINE); vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state), @@ -486,6 +488,43 @@ return CMD_SUCCESS; } +DEFUN(cfg_bts_rtp_port_range, + cfg_bts_rtp_port_range_cmd, + "rtp port-range <1-65534> <1-65534>", + RTP_STR "Range of local ports to use for RTP/RTCP traffic\n") +{ + struct gsm_bts *bts = vty->index; + unsigned int start; + unsigned int end; + + start = atoi(argv[0]); + end = atoi(argv[1]); + + if (end < start) { + vty_out(vty, "range end port (%u) must be greater than the range start port (%u)!%s", + end, start, VTY_NEWLINE); + return CMD_WARNING; + } + + if (start & 1) { + vty_out(vty, "range must begin at an even port number! (%u not even)%s", + start, VTY_NEWLINE); + return CMD_WARNING; + } + + if ((end & 1) == 0) { + vty_out(vty, "range must end at an odd port number! (%u not odd)%s", + end, VTY_NEWLINE); + return CMD_WARNING; + } + + bts->rtp_port_range_start = start; + bts->rtp_port_range_end = end; + bts->rtp_port_range_next = bts->rtp_port_range_start; + + return CMD_SUCCESS; +} + #define PAG_STR "Paging related parameters\n" DEFUN(cfg_bts_paging_queue_size, @@ -1554,6 +1593,7 @@ install_element(BTS_NODE, &cfg_bts_oml_ip_cmd); install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd); install_element(BTS_NODE, &cfg_bts_rtp_jitbuf_cmd); + install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd); install_element(BTS_NODE, &cfg_bts_band_cmd); install_element(BTS_NODE, &cfg_description_cmd); install_element(BTS_NODE, &cfg_no_description_cmd); -- To view, visit https://gerrit.osmocom.org/9261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id75f1dfaf898ed8750d28b1c4840e188f4cfdc87 Gerrit-Change-Number: 9261 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:33:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:33:41 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix check for MSC-side FSM allocation failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9316 ) Change subject: bsc: Fix check for MSC-side FSM allocation failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1f515910f67492257866791588f32b350fadf815 Gerrit-Change-Number: 9316 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 25 May 2018 17:33:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 17:33:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 17:33:43 +0000 Subject: Change in osmo-bsc[master]: bsc: Fix check for MSC-side FSM allocation failure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9316 ) Change subject: bsc: Fix check for MSC-side FSM allocation failure ...................................................................... bsc: Fix check for MSC-side FSM allocation failure In gscon_fsm_wait_mdcx_bts() we try to allocate conn->user_plane.fi_msc but then check whether conn->user_plane.fi_bts is set, possibly due to a copy+paste error. Let's fix that. Change-Id: I1f515910f67492257866791588f32b350fadf815 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 176bfbf..5feca69 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -658,7 +658,7 @@ conn->user_plane.fi_msc = mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer); - if (!conn->user_plane.fi_bts) { + if (!conn->user_plane.fi_msc) { resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); sigtran_send(conn, resp, fi); osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); -- To view, visit https://gerrit.osmocom.org/9316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1f515910f67492257866791588f32b350fadf815 Gerrit-Change-Number: 9316 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:13:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:13:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9323 Change subject: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite ...................................................................... bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite When sending BSSMAP Assignment Request, we need to decide if we want to fill in the AoIP TransportIdentifier or the CIC. The former is needed in AoIP, the latter is needed for SCCPlite and classic SCCP. Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 --- M bsc/BSC_Tests.ttcn 1 file changed, 39 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/9323/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 762b5a2..95b7625 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -558,6 +558,32 @@ } } +/* generate an assignment request for either AoIP or SCCPlite */ +private function f_gen_ass_req() return PDU_BSSAP { + var PDU_BSSAP ass_cmd; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + } else { + var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); + ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit)); + } + return ass_cmd; +} + +/* generate an assignment complete template for either AoIP or SCCPlite */ +private function f_gen_exp_compl() return template PDU_BSSAP { + var template PDU_BSSAP exp_compl; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + } else { + /* CIC is optional "*" as the MSC allocated it */ + exp_compl := tr_BSSMAP_AssignmentComplete(*, omit); + } + return exp_compl; +} + /* Run everything required up to sending a caller-specified assignment command and expect response */ function f_assignment_exp(PDU_BSSAP ass_cmd, template PDU_BSSAP exp, charstring fail_text) runs on test_CT { @@ -590,8 +616,7 @@ } testcase TC_assignment_csd() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); @@ -599,8 +624,7 @@ testcase TC_assignment_ctm() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCTM); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); @@ -1436,9 +1460,8 @@ /* Establish signalling channel (non-assignment case) followed by cipher mode */ private function f_tc_ciph_mode_a5(charstring id) runs on MSC_ConnHdlr { - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) @@ -1479,9 +1502,8 @@ /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); @@ -1523,8 +1545,7 @@ private function f_tc_assignment_fr_a5_1_codec_missing(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -1542,9 +1563,8 @@ private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; const OCT16 kc128 := kc & kc; @@ -1713,9 +1733,8 @@ type record of CodecListTest CodecListTests private function f_TC_assignment_codec(charstring id) runs on MSC_ConnHdlr { - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; @@ -1970,9 +1989,8 @@ /* intra-BSC hand-over between BTS0 and BTS1 */ private function f_tc_ho_int(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); -- To view, visit https://gerrit.osmocom.org/9323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 Gerrit-Change-Number: 9323 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:13:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:13:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Don't expect codec list in IPA/SCCPlite case Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9324 Change subject: bsc: Don't expect codec list in IPA/SCCPlite case ...................................................................... bsc: Don't expect codec list in IPA/SCCPlite case In classic non-AoIP-cases, OsmoBSC should simply return the chosen speech version, but not any codec list in the BSSMAP ASSIGNMENT COMPLETE message. Let's adjust the expectations accordingly. Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/9324/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 95b7625..2534cf6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1737,11 +1737,13 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ - ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; + exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] := + g_pars.ass_codec_list.codecElements[0]; + } ass_cmd.pdu.bssmap.assignmentRequest.channelType := f_BSSMAP_chtype_from_codec(g_pars.ass_codec_list.codecElements[0]); - exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] := - g_pars.ass_codec_list.codecElements[0]; log("expecting ASS COMPL like this: ", exp_compl); f_establish_fully(ass_cmd, exp_compl); -- To view, visit https://gerrit.osmocom.org/9324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 Gerrit-Change-Number: 9324 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9323 to look at the new patch set (#2). Change subject: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite ...................................................................... bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite When sending BSSMAP Assignment Request, we need to decide if we want to fill in the AoIP TransportIdentifier or the CIC. The former is needed in AoIP, the latter is needed for SCCPlite and classic SCCP. Related: OS#2544 Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 --- M bsc/BSC_Tests.ttcn 1 file changed, 39 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/9323/2 -- To view, visit https://gerrit.osmocom.org/9323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 Gerrit-Change-Number: 9323 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:11 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Don't expect codec list in IPA/SCCPlite case In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9324 to look at the new patch set (#2). Change subject: bsc: Don't expect codec list in IPA/SCCPlite case ...................................................................... bsc: Don't expect codec list in IPA/SCCPlite case In classic non-AoIP-cases, OsmoBSC should simply return the chosen speech version, but not any codec list in the BSSMAP ASSIGNMENT COMPLETE message. Let's adjust the expectations accordingly. Related: OS#2544 Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/9324/2 -- To view, visit https://gerrit.osmocom.org/9324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 Gerrit-Change-Number: 9324 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_cic_only for IPA/SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9325 Change subject: bsc: TC_assignment_cic_only for IPA/SCCPlite ...................................................................... bsc: TC_assignment_cic_only for IPA/SCCPlite Of course a "CIC only" assignment will succeed in AoIP, so let's invert the logic: Test "AoIP only" assignment in that case, and expect it to fail. Related: OS#2544 Change-Id: I3b8e5e6ec001f3cab6a00072ef0a7b97c13c278d --- M bsc/BSC_Tests.ttcn 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/9325/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2534cf6..cdc64b8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -544,8 +544,15 @@ f_init(1); dt := f_est_dchan('23'O, 23, '00000000'O); - /* send assignment without AoIP IEs */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + /* send assignment without AoIP IEs */ + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); + } else { + /* Send assignmetn without CIC in IPA case */ + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(omit, tla))); + } alt { [] BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_AssignmentComplete)) { setverdict(fail, "AoIP BSC cannot accept ASSIGNMENT without AoIP Transport IE"); -- To view, visit https://gerrit.osmocom.org/9325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3b8e5e6ec001f3cab6a00072ef0a7b97c13c278d Gerrit-Change-Number: 9325 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9326 Change subject: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite ...................................................................... bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite In SCCPlite, the codec list is always missing, and that's the successful situation, not a failure case. Let's run this test only in AoIP scenarios. Related: OS#2544 Change-Id: I01db7628c2b1c58419d544fc6fa311b9d9b59fb9 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/9326/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cdc64b8..936544b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2460,7 +2460,9 @@ execute( TC_assignment_sign() ); execute( TC_assignment_fr_a5_0() ); execute( TC_assignment_fr_a5_1() ); - execute( TC_assignment_fr_a5_1_codec_missing() ); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + execute( TC_assignment_fr_a5_1_codec_missing() ); + } execute( TC_assignment_fr_a5_3() ); execute( TC_assignment_fr_a5_4() ); execute( TC_ciph_mode_a5_0() ); -- To view, visit https://gerrit.osmocom.org/9326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I01db7628c2b1c58419d544fc6fa311b9d9b59fb9 Gerrit-Change-Number: 9326 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9323 ) Change subject: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 Gerrit-Change-Number: 9323 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:57:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:36 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Don't expect codec list in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9324 ) Change subject: bsc: Don't expect codec list in IPA/SCCPlite case ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 Gerrit-Change-Number: 9324 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:57:36 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_cic_only for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9325 ) Change subject: bsc: TC_assignment_cic_only for IPA/SCCPlite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3b8e5e6ec001f3cab6a00072ef0a7b97c13c278d Gerrit-Change-Number: 9325 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:57:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9326 ) Change subject: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I01db7628c2b1c58419d544fc6fa311b9d9b59fb9 Gerrit-Change-Number: 9326 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:57:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9323 ) Change subject: bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite ...................................................................... bsc: Alter Assignment Req + Complete depending on AoIP or SCCPlite When sending BSSMAP Assignment Request, we need to decide if we want to fill in the AoIP TransportIdentifier or the CIC. The former is needed in AoIP, the latter is needed for SCCPlite and classic SCCP. Related: OS#2544 Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 --- M bsc/BSC_Tests.ttcn 1 file changed, 39 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 762b5a2..95b7625 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -558,6 +558,32 @@ } } +/* generate an assignment request for either AoIP or SCCPlite */ +private function f_gen_ass_req() return PDU_BSSAP { + var PDU_BSSAP ass_cmd; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + } else { + var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); + ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit)); + } + return ass_cmd; +} + +/* generate an assignment complete template for either AoIP or SCCPlite */ +private function f_gen_exp_compl() return template PDU_BSSAP { + var template PDU_BSSAP exp_compl; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + } else { + /* CIC is optional "*" as the MSC allocated it */ + exp_compl := tr_BSSMAP_AssignmentComplete(*, omit); + } + return exp_compl; +} + /* Run everything required up to sending a caller-specified assignment command and expect response */ function f_assignment_exp(PDU_BSSAP ass_cmd, template PDU_BSSAP exp, charstring fail_text) runs on test_CT { @@ -590,8 +616,7 @@ } testcase TC_assignment_csd() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCSD); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for CSD"); @@ -599,8 +624,7 @@ testcase TC_assignment_ctm() runs on test_CT { var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeCTM); //exp_fail.pdu.bssmap.assignmentFailure.cause.causeValue := int2bit(enum2int(GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_UNAVAIL), 7); f_assignment_exp(ass_cmd, exp_fail, "BSC accepted Assignment for Speech+CTM"); @@ -1436,9 +1460,8 @@ /* Establish signalling channel (non-assignment case) followed by cipher mode */ private function f_tc_ciph_mode_a5(charstring id) runs on MSC_ConnHdlr { - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var template PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) @@ -1479,9 +1502,8 @@ /* establish initial channel, enable ciphering followed by assignment to ciphered channel */ private function f_tc_assignment_fr_a5(charstring id) runs on MSC_ConnHdlr { - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); @@ -1523,8 +1545,7 @@ private function f_tc_assignment_fr_a5_1_codec_missing(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); var template PDU_BSSAP exp_fail := tr_BSSMAP_AssignmentFail; - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); @@ -1542,9 +1563,8 @@ private function f_tc_assignment_fr_a5_4(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; const OCT16 kc128 := kc & kc; @@ -1713,9 +1733,8 @@ type record of CodecListTest CodecListTests private function f_TC_assignment_codec(charstring id) runs on MSC_ConnHdlr { - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; @@ -1970,9 +1989,8 @@ /* intra-BSC hand-over between BTS0 and BTS1 */ private function f_tc_ho_int(charstring id) runs on MSC_ConnHdlr { g_pars := valueof(t_def_TestHdlrPars); - var template PDU_BSSAP exp_compl := tr_BSSMAP_AssignmentComplete(omit, ?); - var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); - var PDU_BSSAP ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); + var template PDU_BSSAP exp_compl := f_gen_exp_compl(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(); const OCT8 kc := '0001020304050607'O; ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); -- To view, visit https://gerrit.osmocom.org/9323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8aa0cf2189101de49a6da81625226bdcbbaff027 Gerrit-Change-Number: 9323 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Don't expect codec list in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9324 ) Change subject: bsc: Don't expect codec list in IPA/SCCPlite case ...................................................................... bsc: Don't expect codec list in IPA/SCCPlite case In classic non-AoIP-cases, OsmoBSC should simply return the chosen speech version, but not any codec list in the BSSMAP ASSIGNMENT COMPLETE message. Let's adjust the expectations accordingly. Related: OS#2544 Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 95b7625..2534cf6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1737,11 +1737,13 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); /* puzzle together the ASSIGNMENT REQ for given codec[s] */ - ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; + exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] := + g_pars.ass_codec_list.codecElements[0]; + } ass_cmd.pdu.bssmap.assignmentRequest.channelType := f_BSSMAP_chtype_from_codec(g_pars.ass_codec_list.codecElements[0]); - exp_compl.pdu.bssmap.assignmentComplete.speechCodec.codecElements[0] := - g_pars.ass_codec_list.codecElements[0]; log("expecting ASS COMPL like this: ", exp_compl); f_establish_fully(ass_cmd, exp_compl); -- To view, visit https://gerrit.osmocom.org/9324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id8e2a749bce91cfadd316bc2d56d1289412b9026 Gerrit-Change-Number: 9324 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_assignment_cic_only for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9325 ) Change subject: bsc: TC_assignment_cic_only for IPA/SCCPlite ...................................................................... bsc: TC_assignment_cic_only for IPA/SCCPlite Of course a "CIC only" assignment will succeed in AoIP, so let's invert the logic: Test "AoIP only" assignment in that case, and expect it to fail. Related: OS#2544 Change-Id: I3b8e5e6ec001f3cab6a00072ef0a7b97c13c278d --- M bsc/BSC_Tests.ttcn 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 2534cf6..cdc64b8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -544,8 +544,15 @@ f_init(1); dt := f_est_dchan('23'O, 23, '00000000'O); - /* send assignment without AoIP IEs */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + /* send assignment without AoIP IEs */ + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); + } else { + /* Send assignmetn without CIC in IPA case */ + var BSSMAP_IE_AoIP_TransportLayerAddress tla := + valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(omit, tla))); + } alt { [] BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_AssignmentComplete)) { setverdict(fail, "AoIP BSC cannot accept ASSIGNMENT without AoIP Transport IE"); -- To view, visit https://gerrit.osmocom.org/9325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3b8e5e6ec001f3cab6a00072ef0a7b97c13c278d Gerrit-Change-Number: 9325 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:57:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:57:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9326 ) Change subject: bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite ...................................................................... bsc: Disable TC_assignment_fr_a5_1_codec_missing for SCCPlite In SCCPlite, the codec list is always missing, and that's the successful situation, not a failure case. Let's run this test only in AoIP scenarios. Related: OS#2544 Change-Id: I01db7628c2b1c58419d544fc6fa311b9d9b59fb9 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cdc64b8..936544b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2460,7 +2460,9 @@ execute( TC_assignment_sign() ); execute( TC_assignment_fr_a5_0() ); execute( TC_assignment_fr_a5_1() ); - execute( TC_assignment_fr_a5_1_codec_missing() ); + if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) { + execute( TC_assignment_fr_a5_1_codec_missing() ); + } execute( TC_assignment_fr_a5_3() ); execute( TC_assignment_fr_a5_4() ); execute( TC_ciph_mode_a5_0() ); -- To view, visit https://gerrit.osmocom.org/9326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I01db7628c2b1c58419d544fc6fa311b9d9b59fb9 Gerrit-Change-Number: 9326 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:04 +0000 Subject: Change in osmo-bsc[master]: vty: Permit selection of other ASP protocol than M3UA In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9317 ) Change subject: vty: Permit selection of other ASP protocol than M3UA ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 Gerrit-Change-Number: 9317 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:58:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:06 +0000 Subject: Change in osmo-bsc[master]: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9318 ) Change subject: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ica908e2bb8fc4e59e0d146b428c93a9efc385688 Gerrit-Change-Number: 9318 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:58:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:08 +0000 Subject: Change in osmo-bsc[master]: bsc: Use correct MGCP endpoint name for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9319 ) Change subject: bsc: Use correct MGCP endpoint name for IPA/SCCPlite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I03e2cdbc8e40169e52df3720c40b66734e880525 Gerrit-Change-Number: 9319 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:58:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:10 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9320 ) Change subject: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If362a0084de452727cd063063dfb645eca2f9beb Gerrit-Change-Number: 9320 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:58:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:13 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9321 ) Change subject: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 Gerrit-Change-Number: 9321 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 18:58:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:17 +0000 Subject: Change in osmo-bsc[master]: vty: Permit selection of other ASP protocol than M3UA In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9317 ) Change subject: vty: Permit selection of other ASP protocol than M3UA ...................................................................... vty: Permit selection of other ASP protocol than M3UA We used to have hard-coded M3UA. Let's allow the user to configure this per MSC using a new "asp-protocol (m3ua|sua|ipa)" VTY command. For SUA this should just work 1:1 without any trouble. For IPA, this of course only changes the underlying transport without reflecting the various differences in terms of BSSMAP ASSIGNMENT, MGCP handling, etc. Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 Related: OS#2544 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 4 files changed, 21 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 345724d..c69a9ca 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -110,6 +110,9 @@ struct osmo_sccp_instance *sccp; struct osmo_sccp_user *sccp_user; + /* IPA or M3UA or SUA? */ + enum osmo_ss7_asp_protocol asp_proto; + /* Holds a copy of the our local MSC address, * this will be the sccp-address that is associated * with the A interface of this particular BSC, diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e9309ea..612a00b 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -98,6 +98,7 @@ msc_data->nr = nr; msc_data->allow_emerg = 1; + msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA; /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index e3d4829..2c3507d 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -447,7 +447,7 @@ default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC); msc->a.sccp = osmo_sccp_simple_client_on_ss7_id(msc, msc->a.cs7_instance, msc_name, default_pc, - OSMO_SS7_ASP_PROT_M3UA, 0, NULL, 0, NULL); + msc->a.asp_proto, 0, NULL, 0, NULL); if (!msc->a.sccp) return -EINVAL; diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 36c3223..bda89c1 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -181,6 +181,7 @@ vty_out(vty, " msc-addr %s%s", msc->a.msc_addr_name, VTY_NEWLINE); } + vty_out(vty, " asp-protocol %s%s", osmo_ss7_asp_protocol_name(msc->a.asp_proto), VTY_NEWLINE); /* write MGW configuration */ mgcp_client_config_write(vty, " "); @@ -672,6 +673,20 @@ return CMD_SUCCESS; } +DEFUN(cfg_msc_cs7_asp_proto, + cfg_msc_cs7_asp_proto_cmd, + "asp-protocol (m3ua|sua|ipa)", + "A interface protocol to use for this MSC)\n" + "MTP3 User Adaptation\n" + "SCCP User Adaptation\n" + "IPA Multiplex (SCCP Lite)\n") +{ + struct bsc_msc_data *msc = bsc_msc_data(vty); + + msc->a.asp_proto = get_string_value(osmo_ss7_asp_protocol_vals, argv[0]); + return CMD_SUCCESS; +} + DEFUN(cfg_net_bsc_mid_call_text, cfg_net_bsc_mid_call_text_cmd, "mid-call-text .TEXT", @@ -951,6 +966,7 @@ install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd); install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd); install_element(MSC_NODE, &cfg_msc_cs7_msc_addr_cmd); + install_element(MSC_NODE, &cfg_msc_cs7_asp_proto_cmd); /* Deprecated: ping time config, kept to support legacy config files. */ install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd); -- To view, visit https://gerrit.osmocom.org/9317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 Gerrit-Change-Number: 9317 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9318 ) Change subject: bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port ...................................................................... bsc: Add mgcp_port_to_cic() to determine CIC from RTP Port Also: Move mgcp_timeslot_to_port() next to it, as they are more or less the inverse transformation of each other. Change-Id: Ica908e2bb8fc4e59e0d146b428c93a9efc385688 --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/osmo_bsc_bssap.c 2 files changed, 22 insertions(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index c69a9ca..2ace178 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -28,6 +28,7 @@ #define _OSMO_MSC_DATA_H #include "bsc_msc.h" +#include "debug.h" #include #include @@ -42,6 +43,7 @@ #include #include +#include struct osmo_bsc_rf; struct gsm_network; @@ -164,5 +166,25 @@ struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int); struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int); +/* Helper function to calculate the port number for a given + * timeslot/multiplex. This functionality is needed to support + * the sccp-lite scenario where the MGW is handled externally */ +static inline int mgcp_timeslot_to_port(int multiplex, int timeslot, int base) +{ + if (timeslot == 0) { + LOGP(DLMGCP, LOGL_ERROR, "Timeslot should not be 0\n"); + timeslot = 255; + } + + return base + (timeslot + (32 * multiplex)) * 2; +} + +static inline int mgcp_port_to_cic(uint16_t port, uint16_t base) +{ + if (port < base) + return -EINVAL; + return (port - base) / 2; +} + #endif diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 24dbc95..2adbb3f 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -634,19 +634,6 @@ return -1; } -/* Helper function to calculate the port number for a given - * timeslot/multiplex. This functionality is needed to support - * the sccp-lite scenario where the MGW is handled externally */ -static inline int mgcp_timeslot_to_port(int multiplex, int timeslot, int base) -{ - if (timeslot == 0) { - LOGP(DLMGCP, LOGL_ERROR, "Timeslot should not be 0\n"); - timeslot = 255; - } - - return base + (timeslot + (32 * multiplex)) * 2; -} - /* * Handle the assignment request message. * -- To view, visit https://gerrit.osmocom.org/9318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ica908e2bb8fc4e59e0d146b428c93a9efc385688 Gerrit-Change-Number: 9318 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:17 +0000 Subject: Change in osmo-bsc[master]: bsc: Use correct MGCP endpoint name for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9319 ) Change subject: bsc: Use correct MGCP endpoint name for IPA/SCCPlite ...................................................................... bsc: Use correct MGCP endpoint name for IPA/SCCPlite In IPA/SCCPlite, we have to use the CIC to construct the MGCP endpoint name instead of the usual dynamic endpoint allocation. Change-Id: I03e2cdbc8e40169e52df3720c40b66734e880525 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 5feca69..63d99a9 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -383,6 +383,25 @@ } } +static const char *get_mgw_ep_name(struct gsm_subscriber_connection *conn) +{ + static char ep_name[256]; + struct bsc_msc_data *msc = conn->sccp.msc; + + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* derive endpoint name from CIC on A interface side */ + snprintf(ep_name, sizeof(ep_name), "%x at mgw", + mgcp_port_to_cic(conn->user_plane.rtp_port, msc->rtp_base)); + break; + default: + /* use dynamic RTPBRIDGE endpoint allocation in MGW */ + osmo_strlcpy(ep_name, ENDPOINT_ID, sizeof(ep_name)); + break; + } + return ep_name; +} + /* We're on an active subscriber connection, passing DTAP back and forth */ static void gscon_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data) { @@ -413,7 +432,7 @@ * mgcp-ass-mgcp state-chain (see FIXME above) */ memset(&conn_peer, 0, sizeof(conn_peer)); conn_peer.call_id = conn->sccp.conn_id; - osmo_strlcpy(conn_peer.endpoint, ENDPOINT_ID, sizeof(conn_peer.endpoint)); + osmo_strlcpy(conn_peer.endpoint, get_mgw_ep_name(conn), sizeof(conn_peer.endpoint)); /* (Pre)Change state and create the connection */ osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_BTS, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR); -- To view, visit https://gerrit.osmocom.org/9319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I03e2cdbc8e40169e52df3720c40b66734e880525 Gerrit-Change-Number: 9319 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:18 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9320 ) Change subject: bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case ...................................................................... bsc: Don't reject ASSIGNMENT for Audio in IPA/SCCPlite case Change-Id: If362a0084de452727cd063063dfb645eca2f9beb --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 1 insertion(+), 13 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 2adbb3f..f7f99fa 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -710,23 +710,11 @@ aoip = true; } else { LOGP(DMSC, LOGL_ERROR, "AoIP transport address and CIC missing. " - "Audio will not work.\n"); + "Audio would not work; rejecting\n"); cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING; goto reject; } - /* FIXME: At the moment osmo-bsc does not support any other - * A-Interface other than AoIP. So we must reject all - * assignment requests that are not AoIP compliant. However, - * might support other A-Interface dialects lateron again, - * thats why we preserve the logic around the AoIP detection - * here. */ - if (!aoip) { - LOGP(DMSC, LOGL_ERROR, "Requested A-Interface type is not supported! (AoIP only!)\n"); - cause = GSM0808_CAUSE_REQ_A_IF_TYPE_NOT_SUPP; - goto reject; - } - /* Decode speech codec list (AoIP) */ conn->codec_list_present = false; if (aoip) { -- To view, visit https://gerrit.osmocom.org/9320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If362a0084de452727cd063063dfb645eca2f9beb Gerrit-Change-Number: 9320 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 18:58:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 18:58:18 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9321 ) Change subject: bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite ...................................................................... bsc: Don't include AoIP IEs in ASSIGNMENT COMPLETE over SCCPlite Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 12 insertions(+), 6 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 63d99a9..66d1ab9 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -239,14 +239,20 @@ /* Generate voice related fields */ if (voice) { - OSMO_ASSERT(lchan->abis_ip.ass_compl.valid); perm_spch = bssap_speech_from_lchan(lchan); - addr_local = &conn->user_plane.aoip_rtp_addr_local; + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* don't add any AoIP specific fields. CIC allocated by MSC */ + break; + default: + OSMO_ASSERT(lchan->abis_ip.ass_compl.valid); + addr_local = &conn->user_plane.aoip_rtp_addr_local; - /* Extrapolate speech codec from speech mode */ - gsm0808_speech_codec_from_chan_type(&sc, perm_spch); - sc_ptr = ≻ - + /* Extrapolate speech codec from speech mode */ + gsm0808_speech_codec_from_chan_type(&sc, perm_spch); + sc_ptr = ≻ + break; + } /* FIXME: AMR codec configuration must be derived from lchan1! */ } -- To view, visit https://gerrit.osmocom.org/9321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6ace15f368b5ba6e5c8845ea21d17dd3a7a15be7 Gerrit-Change-Number: 9321 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 19:34:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 19:34:25 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9322 ) Change subject: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Gerrit-Change-Number: 9322 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 25 May 2018 19:34:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri May 25 19:34:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Fri, 25 May 2018 19:34:28 +0000 Subject: Change in osmo-bsc[master]: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9322 ) Change subject: bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case ...................................................................... bsc: Don't create MSC-side MGCP connection in IPA/SCCPlite case In IPA/SCCPlite, the MSC is handling MGCP to the BSC-MGW directly and the BSC only takes care of the BTS-side MGCP connection. We achieve this by transitioning directly from WAIT_MDCX_BTS into ACTIVE in this case. Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Related: OS#2544 --- M src/libbsc/bsc_subscr_conn_fsm.c 1 file changed, 19 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 66d1ab9..54224f7 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -678,16 +678,26 @@ * BTS connection. */ osmo_strlcpy(conn_peer.endpoint, conn->user_plane.mgw_endpoint, sizeof(conn_peer.endpoint)); - /* (Pre)Change state and create the connection */ - osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT, MGCP_MGW_TIMEOUT_TIMER_NR); - conn->user_plane.fi_msc = - mgcp_conn_create(conn->network->mgw.client, fi, GSCON_EV_MGW_FAIL_MSC, GSCON_EV_MGW_CRCX_RESP_MSC, - &conn_peer); - if (!conn->user_plane.fi_msc) { - resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); - sigtran_send(conn, resp, fi); + switch (conn->sccp.msc->a.asp_proto) { + case OSMO_SS7_ASP_PROT_IPA: + /* Send assignment complete message to the MSC */ + send_ass_compl(conn->lchan, fi, true); osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); - return; + break; + default: + /* (Pre)Change state and create the connection */ + osmo_fsm_inst_state_chg(fi, ST_WAIT_CRCX_MSC, MGCP_MGW_TIMEOUT, + MGCP_MGW_TIMEOUT_TIMER_NR); + conn->user_plane.fi_msc = mgcp_conn_create(conn->network->mgw.client, fi, + GSCON_EV_MGW_FAIL_MSC, + GSCON_EV_MGW_CRCX_RESP_MSC, &conn_peer); + if (!conn->user_plane.fi_msc) { + resp = gsm0808_create_assignment_failure(GSM0808_CAUSE_EQUIPMENT_FAILURE, NULL); + sigtran_send(conn, resp, fi); + osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0); + return; + } + break; } break; -- To view, visit https://gerrit.osmocom.org/9322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I96179b4324b976bded36023a8ccbdc007b6b3e05 Gerrit-Change-Number: 9322 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Fri May 25 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Fri, 25 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#47?= In-Reply-To: <1128581355.152.1527201681037.JavaMail.jenkins@jenkins.osmocom.org> References: <1128581355.152.1527201681037.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1885845228.163.1527288081285.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1226/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-1226/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-1226/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-1226/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-1226/ libtool: install: (cd /tmp/am-dc-1226/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-1226/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-1226/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-1226/ libtool: install: chmod 644 /tmp/am-dc-1226/ libtool: install: ranlib /tmp/am-dc-1226/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-1226/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-1226/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-1226/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-1226/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-1226/ /bin/mkdir -p '/tmp/am-dc-1226/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-1226/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-1226/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-1226/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-1226/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-1226/ libtool: uninstall: rm -f /tmp/am-dc-1226/ /tmp/am-dc-1226/ /tmp/am-dc-1226/ /tmp/am-dc-1226/ /tmp/am-dc-1226/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-1226/ && rm -f html.tar ) ( cd '/tmp/am-dc-1226/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-1226/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Sat May 26 07:34:17 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 May 2018 07:34:17 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#500?= Message-ID: <2083395282.174.1527320057925.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 115.66 KB...] CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.5-f0f7d] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.5-f0f7d/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-26 07:34:16.409765189 +0000 +++ 2018-05-26 07:34:16.453765180 +0000 @@ -6562,6 +6562,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=1 .. V(R)=59) +../../../src/gprs_rlcmac_meas.cpp:82:49: runtime error: left shift of negative value -999310 max_cs_ul cannot be derived (current UL CS: UNKNOWN) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) restarting timer T3169 [acked (data)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Got MCS-4 RLC data block: CV=10, BSN=60, SPB=0, PI=0, E=1, TI=0, bitoffs=33 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat May 26 09:09:11 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Sat, 26 May 2018 09:09:11 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9303 to look at the new patch set (#3). Change subject: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 ...................................................................... Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/9303/3 -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 09:37:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 09:37:12 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: Register 5000 as default port for IPA/SCCPlite Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9327 Change subject: osmo_ss7: Register 5000 as default port for IPA/SCCPlite ...................................................................... osmo_ss7: Register 5000 as default port for IPA/SCCPlite Makes sure that in absence of a user-specified port number, osmo_ss7_asp_protocol_port() will return 5000 as default port number. Change-Id: I628ee095603742a652fd971887e02cc17d1f71b8 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/27/9327/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 30677b9..275469e 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -307,6 +307,7 @@ [OSMO_SS7_ASP_PROT_NONE] = 0, [OSMO_SS7_ASP_PROT_SUA] = SUA_PORT, [OSMO_SS7_ASP_PROT_M3UA] = M3UA_PORT, + [OSMO_SS7_ASP_PROT_IPA] = 5000, }; int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot) -- To view, visit https://gerrit.osmocom.org/9327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I628ee095603742a652fd971887e02cc17d1f71b8 Gerrit-Change-Number: 9327 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 09:44:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 09:44:17 +0000 Subject: Change in libosmocore[master]: cosmetic: Whitespace fixes in control_if.c Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9328 Change subject: cosmetic: Whitespace fixes in control_if.c ...................................................................... cosmetic: Whitespace fixes in control_if.c Change-Id: I24666d0b90a355e9fdefd280d48900b8cac1de64 --- M src/ctrl/control_if.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/9328/1 diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 0ba2512..269b7b9 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -230,7 +230,7 @@ if (!request) goto err; - for (i=0;i -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:08 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9303 ) Change subject: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 10:22:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:10 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9303 ) Change subject: Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 ...................................................................... Add enum gsm48_cause_coding from GSM 04.08 Section 10.5.4.11 Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 68ba650..0bb2dce 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1387,6 +1387,14 @@ GSM48_SIGNAL_ALERT_OFF = 0x4f, }; +/* Section 10.5.4.11 / Table 10.5.122 */ +enum gsm48_cause_coding { + GSM48_CAUSE_CODING_CCITT_Q931 = 0x00, + GSM48_CAUSE_CODING_RESERVED = 0x01, + GSM48_CAUSE_CODING_NATIONAL = 0x02, + GSM48_CAUSE_CODING_GSM = 0x03, +}; + enum gsm48_cause_loc { GSM48_CAUSE_LOC_USER = 0x00, GSM48_CAUSE_LOC_PRN_S_LU = 0x01, -- To view, visit https://gerrit.osmocom.org/9303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3d9c8e117ad19f70a3273650d7c0f8280d7bdb9a Gerrit-Change-Number: 9303 Gerrit-PatchSet: 4 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:15 +0000 Subject: Change in libosmocore[master]: cosmetic: Whitespace fixes in control_if.c In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9328 ) Change subject: cosmetic: Whitespace fixes in control_if.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I24666d0b90a355e9fdefd280d48900b8cac1de64 Gerrit-Change-Number: 9328 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 10:22:15 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:22 +0000 Subject: Change in libosmocore[master]: cosmetic: Whitespace fixes in control_if.c In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9328 ) Change subject: cosmetic: Whitespace fixes in control_if.c ...................................................................... cosmetic: Whitespace fixes in control_if.c Change-Id: I24666d0b90a355e9fdefd280d48900b8cac1de64 --- M src/ctrl/control_if.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 0ba2512..269b7b9 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -230,7 +230,7 @@ if (!request) goto err; - for (i=0;i Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:37 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: Register 5000 as default port for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9327 ) Change subject: osmo_ss7: Register 5000 as default port for IPA/SCCPlite ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I628ee095603742a652fd971887e02cc17d1f71b8 Gerrit-Change-Number: 9327 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 10:22:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 10:22:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 10:22:38 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7: Register 5000 as default port for IPA/SCCPlite In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9327 ) Change subject: osmo_ss7: Register 5000 as default port for IPA/SCCPlite ...................................................................... osmo_ss7: Register 5000 as default port for IPA/SCCPlite Makes sure that in absence of a user-specified port number, osmo_ss7_asp_protocol_port() will return 5000 as default port number. Change-Id: I628ee095603742a652fd971887e02cc17d1f71b8 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 30677b9..275469e 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -307,6 +307,7 @@ [OSMO_SS7_ASP_PROT_NONE] = 0, [OSMO_SS7_ASP_PROT_SUA] = SUA_PORT, [OSMO_SS7_ASP_PROT_M3UA] = M3UA_PORT, + [OSMO_SS7_ASP_PROT_IPA] = 5000, }; int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot) -- To view, visit https://gerrit.osmocom.org/9327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I628ee095603742a652fd971887e02cc17d1f71b8 Gerrit-Change-Number: 9327 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat May 26 10:44:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 May 2018 10:44:13 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#501?= In-Reply-To: <2083395282.174.1527320057925.JavaMail.jenkins@jenkins.osmocom.org> References: <2083395282.174.1527320057925.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <169899038.176.1527331453701.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Sat May 26 12:35:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:35:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add Titan.ProtocolModules.ROSE Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9329 Change subject: deps: Add Titan.ProtocolModules.ROSE ...................................................................... deps: Add Titan.ProtocolModules.ROSE ROSE is used by MAP and SS Change-Id: I9c2c7b1989e261cc970d3846511f232ddc104fbd --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/9329/1 diff --git a/deps/Makefile b/deps/Makefile index 37e48e2..dc4d9fc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -25,6 +25,7 @@ ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ + titan.ProtocolModules.ROSE \ titan.ProtocolModules.SCTP \ titan.ProtocolModules.SUA \ titan.ProtocolModules.SDP \ @@ -70,6 +71,7 @@ titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 -- To view, visit https://gerrit.osmocom.org/9329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9c2c7b1989e261cc970d3846511f232ddc104fbd Gerrit-Change-Number: 9329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 12:35:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:35:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add titan.ProtocolModules.MAP Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9330 Change subject: deps: Add titan.ProtocolModules.MAP ...................................................................... deps: Add titan.ProtocolModules.MAP Change-Id: I228800c4ef103b55da4831aff59bd4370cf25969 --- M deps/Makefile 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/9330/1 diff --git a/deps/Makefile b/deps/Makefile index dc4d9fc..cf0bf4d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -2,6 +2,7 @@ ECLIPSEGIT:=https://github.com/eclipse ECLIPSEGIT2:=git://git.eclipse.org/gitroot/titan OSMOGITHUB:=https://github.com/osmocom +OSMOGIT:=git://git.osmocom.org ECLIPSEGIT_REPOS= titan.Libraries.TCCUsefulFunctions \ titan.ProtocolModules.ICMP \ @@ -46,7 +47,9 @@ titan.TestPorts.MTP3asp \ titan.ProtocolEmulations.M3UA -ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) +OSMOGIT_REPOS= titan.ProtocolModules.MAP + +ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. # In order to keep local changes in the repository of a dependency, set its commit to the @@ -66,6 +69,7 @@ titan.ProtocolModules.ISUP_Q.762_commit= R.8.A titan.ProtocolModules.L2TP_commit= R.2.A titan.ProtocolModules.LLC_v7.1.0_commit= R.2.A +titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A titan.ProtocolModules.M3UA_commit= R.2.A titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A @@ -142,3 +146,6 @@ $(foreach dir,$(OSMOGITHUB_REPOS), \ $(eval $(call GIT_template,$(dir),$(OSMOGITHUB)))) + +$(foreach dir,$(OSMOGIT_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGIT)))) -- To view, visit https://gerrit.osmocom.org/9330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I228800c4ef103b55da4831aff59bd4370cf25969 Gerrit-Change-Number: 9330 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 12:36:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:36:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add titan.ProtocolModules.MAP In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9330 ) Change subject: deps: Add titan.ProtocolModules.MAP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I228800c4ef103b55da4831aff59bd4370cf25969 Gerrit-Change-Number: 9330 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 12:36:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 12:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:36:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add Titan.ProtocolModules.ROSE In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9329 ) Change subject: deps: Add Titan.ProtocolModules.ROSE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c2c7b1989e261cc970d3846511f232ddc104fbd Gerrit-Change-Number: 9329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 12:36:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 12:36:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:36:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add Titan.ProtocolModules.ROSE In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9329 ) Change subject: deps: Add Titan.ProtocolModules.ROSE ...................................................................... deps: Add Titan.ProtocolModules.ROSE ROSE is used by MAP and SS Change-Id: I9c2c7b1989e261cc970d3846511f232ddc104fbd --- M deps/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index 37e48e2..dc4d9fc 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -25,6 +25,7 @@ ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \ titan.ProtocolModules.M2PA \ + titan.ProtocolModules.ROSE \ titan.ProtocolModules.SCTP \ titan.ProtocolModules.SUA \ titan.ProtocolModules.SDP \ @@ -70,6 +71,7 @@ titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A titan.ProtocolModules.NS_v7.3.0_commit= R.2.A titan.ProtocolModules.RTP_commit= R.5.A +titan.ProtocolModules.ROSE_commit= R.1.C titan.ProtocolModules.SCTP_commit= R.2.A titan.ProtocolModules.SDP_commit= R.14.A titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69 -- To view, visit https://gerrit.osmocom.org/9329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9c2c7b1989e261cc970d3846511f232ddc104fbd Gerrit-Change-Number: 9329 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 12:36:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 12:36:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: deps: Add titan.ProtocolModules.MAP In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9330 ) Change subject: deps: Add titan.ProtocolModules.MAP ...................................................................... deps: Add titan.ProtocolModules.MAP Change-Id: I228800c4ef103b55da4831aff59bd4370cf25969 --- M deps/Makefile 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/deps/Makefile b/deps/Makefile index dc4d9fc..cf0bf4d 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -2,6 +2,7 @@ ECLIPSEGIT:=https://github.com/eclipse ECLIPSEGIT2:=git://git.eclipse.org/gitroot/titan OSMOGITHUB:=https://github.com/osmocom +OSMOGIT:=git://git.osmocom.org ECLIPSEGIT_REPOS= titan.Libraries.TCCUsefulFunctions \ titan.ProtocolModules.ICMP \ @@ -46,7 +47,9 @@ titan.TestPorts.MTP3asp \ titan.ProtocolEmulations.M3UA -ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) +OSMOGIT_REPOS= titan.ProtocolModules.MAP + +ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. # In order to keep local changes in the repository of a dependency, set its commit to the @@ -66,6 +69,7 @@ titan.ProtocolModules.ISUP_Q.762_commit= R.8.A titan.ProtocolModules.L2TP_commit= R.2.A titan.ProtocolModules.LLC_v7.1.0_commit= R.2.A +titan.ProtocolModules.MAP_commit= R.2.A-1-g79c6a3d titan.ProtocolModules.M2PA_commit= R.2.A titan.ProtocolModules.M3UA_commit= R.2.A titan.ProtocolModules.MobileL3_v13.4.0_commit= R.2.A @@ -142,3 +146,6 @@ $(foreach dir,$(OSMOGITHUB_REPOS), \ $(eval $(call GIT_template,$(dir),$(OSMOGITHUB)))) + +$(foreach dir,$(OSMOGIT_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGIT)))) -- To view, visit https://gerrit.osmocom.org/9330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I228800c4ef103b55da4831aff59bd4370cf25969 Gerrit-Change-Number: 9330 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:08:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9247 to look at the new patch set (#2). Change subject: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT ...................................................................... L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 --- M library/L3_Templates.ttcn 1 file changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/9247/2 -- To view, visit https://gerrit.osmocom.org/9247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 Gerrit-Change-Number: 9247 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:08:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9248 to look at the new patch set (#2). Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... SGSN: add TC_hlr_location_cancel_request MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack MS <- SGSN: Detach Request SGSN-> MS: Detach Complete Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a --- M sgsn/SGSN_Tests.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/9248/2 -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:08:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw... In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9250 to look at the new patch set (#2). Change subject: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} ...................................................................... SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} Cancel Location using an unknown IMSI. HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Error Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/9250/2 -- To view, visit https://gerrit.osmocom.org/9250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 Gerrit-Change-Number: 9250 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:08:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9251 to look at the new patch set (#2). Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... SGSN: add TC_hlr_location_cancel_request_update MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/9251/2 -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat May 26 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 May 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#135?= Message-ID: <1373482728.178.1527347407311.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 2.08 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sat May 26 15:12:51 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:12:51 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9248 to look at the new patch set (#3). Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... SGSN: add TC_hlr_location_cancel_request MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack MS <- SGSN: Detach Request SGSN-> MS: Detach Complete Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a --- M sgsn/SGSN_Tests.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/9248/3 -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:17:11 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Sat, 26 May 2018 15:17:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9248 to look at the new patch set (#4). Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... SGSN: add TC_hlr_location_cancel_request MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack MS <- SGSN: Detach Request SGSN-> MS: Detach Complete Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a --- M sgsn/SGSN_Tests.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/9248/4 -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:27:39 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 15:27:39 +0000 Subject: Change in libosmocore[master]: ctrl: Introduce libosmoctrl.map to avoid unintended exports Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9331 Change subject: ctrl: Introduce libosmoctrl.map to avoid unintended exports ...................................................................... ctrl: Introduce libosmoctrl.map to avoid unintended exports There are some symbols for use between control_cmd.c and control_if.c, which are not supposed to be exported publicly. Let's make sure we keep those symbols local. Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 --- M configure.ac M src/ctrl/Makefile.am A src/ctrl/libosmoctrl.map 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/9331/1 diff --git a/configure.ac b/configure.ac index 6b9c66f..79ef9d4 100644 --- a/configure.ac +++ b/configure.ac @@ -47,11 +47,13 @@ LTLDFLAGS_OSMOGB='-Wl,--version-script=$(srcdir)/libosmogb.map' LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map' LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map' + LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map' ;; esac AC_SUBST(LTLDFLAGS_OSMOGB) AC_SUBST(LTLDFLAGS_OSMOGSM) AC_SUBST(LTLDFLAGS_OSMOCODING) +AC_SUBST(LTLDFLAGS_OSMOCTRL) dnl checks for header files AC_HEADER_STDC diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 71cc9a3..a51ae05 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -20,4 +20,6 @@ libosmoctrl_la_SOURCES += control_vty.c endif +EXTRA_DIST = libosmoctrl.map + endif diff --git a/src/ctrl/libosmoctrl.map b/src/ctrl/libosmoctrl.map new file mode 100644 index 0000000..bc988bd --- /dev/null +++ b/src/ctrl/libosmoctrl.map @@ -0,0 +1,34 @@ +LIBOSMOCTRL_1.0 { +global: + +ctrl_cmd_cpy; +ctrl_cmd_create; +ctrl_cmd_def_is_zombie; +ctrl_cmd_def_make; +ctrl_cmd_def_send; +#ctrl_cmd_exec; +ctrl_cmd_exec_from_string; +#ctrl_cmd_handle; +ctrl_cmd_install; +#ctrl_cmd_make; +ctrl_cmd_parse; +ctrl_cmd_parse2; +ctrl_cmd_send; +ctrl_cmd_send_to_all; +ctrl_cmd_send_trap; +ctrl_cmd_trap; +ctrl_handle_alloc; /* could be removed? */ +ctrl_handle_alloc2; /* could be removed? */ +ctrl_handle_msg; /* only used in unit test */ +ctrl_interface_setup; +ctrl_interface_setup_dynip; +ctrl_interface_setup_dynip2; +ctrl_lookup_register; +ctrl_parse_get_num; +ctrl_type_vals; +ctrl_vty_get_bind_addr; +ctrl_vty_init; +osmo_ctrl_conn_alloc; + +local: *; +}; -- To view, visit https://gerrit.osmocom.org/9331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 Gerrit-Change-Number: 9331 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 15:27:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 15:27:40 +0000 Subject: Change in libosmocore[master]: ctrl: Add doxygen API documentation; generate html from it Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9332 Change subject: ctrl: Add doxygen API documentation; generate html from it ...................................................................... ctrl: Add doxygen API documentation; generate html from it Closes: OS#3293 Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f --- A Doxyfile.ctrl.in M Makefile.am M configure.ac M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_cmd.c M src/ctrl/control_if.c 6 files changed, 1,813 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/9332/1 diff --git a/Doxyfile.ctrl.in b/Doxyfile.ctrl.in new file mode 100644 index 0000000..eb363bb --- /dev/null +++ b/Doxyfile.ctrl.in @@ -0,0 +1,1716 @@ +# Doxyfile 1.7.4 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = libosmoctrl + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Osmocom CTRL library" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc/ctrl + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit command for a brief description.) + +QT_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = @srcdir@/include/osmocom/ctrl @srcdir@/src/ctrl + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +# IMAGE_PATH = images/ + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is adviced to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW! + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 1 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = YES + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the +# mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# pointed to by INCLUDE_PATH will be searched when a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that +# overrules the definition found in the source code. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = doc/libosmocore.tag=../../core/html + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = doc/libosmoctrl.tag + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called Helvetica to the output +# directory and reference it in all dot files that doxygen generates. +# When you want a differently looking font you can specify the font name +# using DOT_FONTNAME. You need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will generate a graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = /usr/bin/dot + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/Makefile.am b/Makefile.am index 60ec1f8..de5eb35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ $(top_builddir)/doc/vty/html/index.html \ $(top_builddir)/doc/codec/html/index.html \ $(top_builddir)/doc/coding/html/index.html \ + $(top_builddir)/doc/ctrl/html/index.html \ $(top_builddir)/doc/gb/html/index.html cd $(top_builddir)/doc && tar cf html.tar */html @@ -62,6 +63,11 @@ mkdir -p doc/coding $(DOXYGEN) Doxyfile.coding +$(top_builddir)/doc/ctrl/html/index.html: $(SOURCES) Doxyfile.ctrl + @rm -rf doc/ctrl + mkdir -p doc/ctrl + $(DOXYGEN) Doxyfile.ctrl + $(top_builddir)/doc/gb/html/index.html: $(SOURCES) Doxyfile.gb @rm -rf doc/gb mkdir -p doc/gb @@ -71,9 +77,9 @@ cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar uninstall-hook: - cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec,coding,gb} + cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec,coding,ctrl,gb} -DX_CLEAN = doc/{core,gsm,vty,codec,coding,gb}/html/search/* doc/{core,gsm,vty,codec,coding,gb}/{html,latex}/* doc/html.tar doc/{core,gsm,vty,codec,coding,gb}/doxygen_sqlite3.db doc/*.tag +DX_CLEAN = doc/{core,gsm,vty,codec,coding,ctrl,gb}/html/search/* doc/{core,gsm,vty,codec,coding,ctrl,gb}/{html,latex}/* doc/html.tar doc/{core,gsm,vty,codec,coding,ctrl,gb}/doxygen_sqlite3.db doc/*.tag endif MOSTLYCLEANFILES = $(DX_CLEAN) diff --git a/configure.ac b/configure.ac index 79ef9d4..cb580a3 100644 --- a/configure.ac +++ b/configure.ac @@ -371,4 +371,5 @@ Doxyfile.codec Doxyfile.coding Doxyfile.gb + Doxyfile.ctrl Makefile) diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index a5df753..50065c1 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -15,6 +15,7 @@ struct ctrl_handle; +/*! The class of node at which a ctrl command is registered to */ enum ctrl_node_type { CTRL_NODE_ROOT, /* Root elements */ CTRL_NODE_BTS, /* BTS specific (net.btsN.) */ @@ -25,6 +26,7 @@ _LAST_CTRL_NODE }; +/*! Ctrl command types (GET, SET, ...) */ enum ctrl_type { CTRL_TYPE_UNKNOWN, CTRL_TYPE_GET, @@ -37,35 +39,44 @@ extern const struct value_string ctrl_type_vals[]; +/*! Represents a single ctrl connection */ struct ctrl_connection { struct llist_head list_entry; - /* The queue for sending data back */ + /*! The queue for sending data back */ struct osmo_wqueue write_queue; - /* Buffer for partial input data */ + /*! Buffer for partial input data */ struct msgb *pending_msg; - /* Callback if the connection was closed */ + /*! Callback if the connection was closed */ void (*closed_cb)(struct ctrl_connection *conn); - /* Pending commands for this connection */ + /*! Pending commands for this connection */ struct llist_head cmds; - /* Pending deferred commands for this connection */ + /*! Pending deferred command responses for this connection */ struct llist_head def_cmds; }; struct ctrl_cmd_def; +/*! Represents a single ctrl command after parsing */ struct ctrl_cmd { + /*! connection through which the command was received */ struct ctrl_connection *ccon; + /*! command type */ enum ctrl_type type; char *id; + /*! node of the specified variable */ void *node; + /*! name of the variable */ char *variable; + /*! value of the specified CTRL variable */ char *value; + /*! respnse message string */ char *reply; + /*! state representing deferred (async) response, if any */ struct ctrl_cmd_def *defer; }; @@ -77,11 +88,16 @@ char **command; }; +/*! Implementation of a given CTRL command */ struct ctrl_cmd_element { + /*! textual name/id of the CTRL command */ const char *name; struct ctrl_cmd_struct strcmd; + /*! call-back function implementing the SET operation */ int (*set)(struct ctrl_cmd *cmd, void *data); + /*! call-back function implementing the GET operation */ int (*get)(struct ctrl_cmd *cmd, void *data); + /*! call-back function to validate a value; called before SET */ int (*verify)(struct ctrl_cmd *cmd, const char *value, void *data); }; diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index fb0cd2b..bff4d17 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -89,6 +89,12 @@ return NULL; } +/*! Execute a given received command + * \param[in] vline vector representing the available/registered commands + * \param[inout] command parsed received command to be executed + * \param[in] node CTRL interface node + * \param[in] data opaque data passed to verify(), get() and set() call-backs + * \returns CTRL_CMD_HANDLED or CTRL_CMD_REPLY; CTRL_CMD_ERROR on error */ int ctrl_cmd_exec(vector vline, struct ctrl_cmd *command, vector node, void *data) { int ret = CTRL_CMD_ERROR; @@ -200,6 +206,10 @@ talloc_free(cmd->command); } +/*! Install a given command definition at a given CTRL node. + * \param[in] node CTRL node at whihc \a cmd is to be installed + * \param[in] cmd command definition to be installed + * \returns 0 on success; negative on error */ int ctrl_cmd_install(enum ctrl_node_type node, struct ctrl_cmd_element *cmd) { vector cmds_vec; @@ -221,6 +231,10 @@ return 0; } +/*! Allocate a control command of given \a type. + * \param[in] ctx talloc context from which to allocate + * \param[in] type command type to set after allocation + * \returns callee-allocated \ref ctrl_cmd. Caller must talloc_free() it. */ struct ctrl_cmd *ctrl_cmd_create(void *ctx, enum ctrl_type type) { struct ctrl_cmd *cmd; @@ -233,6 +247,10 @@ return cmd; } +/*! Perform a deepl copy of the given \a cmd, allocating memory from \a ctx. + * \param[in] ctx talloc context from which to allocate + * \param[in cmd CTRL command to be copied + * \returns deep copy of \a cmd on success; NULL on error */ struct ctrl_cmd *ctrl_cmd_cpy(void *ctx, struct ctrl_cmd *cmd) { struct ctrl_cmd *cmd2; @@ -269,7 +287,10 @@ return NULL; } -/*! Parse CTRL command struct from msgb, return NULL on any error. +/*! Parse/Decode CTRL from \ref msgb into command struct. + * \param[in] ctx talloc context from which to allocate + * \param[in] msg message buffer containing command to be decoded + * \returns callee-allocated decoded CTRL command; NULL on allocation or other failure * The caller is responsible to talloc_free() the returned struct pointer. */ struct ctrl_cmd *ctrl_cmd_parse(void *ctx, struct msgb *msg) { @@ -290,8 +311,11 @@ return true; } -/*! Parse CTRL command struct from msgb, return ctrl->type == CTRL_TYPE_ERROR and an error message in - * ctrl->reply on any error. +/*! Parse/Decode CTRL from \ref msgb into command struct. + * \param[in] ctx talloc context from which to allocate + * \param[in] msg message buffer containing command to be decoded + * \returns callee-allocated decoded CTRL command; NULL on allocation failure, + * ctrl->type == CTRL_TYPE_ERROR and an error message in ctrl->reply on any error. * The caller is responsible to talloc_free() the returned struct pointer. */ struct ctrl_cmd *ctrl_cmd_parse2(void *ctx, struct msgb *msg) { @@ -466,6 +490,9 @@ return cmd; } +/*! Encode a given CTRL command from its parsed form into a message buffer. + * \param[in] cmd decoded/parsed form of to-be-encoded command + * \returns callee-allocated message buffer containing the encoded \a cmd; NULL on error */ struct msgb *ctrl_cmd_make(struct ctrl_cmd *cmd) { struct msgb *msg; @@ -556,6 +583,15 @@ return NULL; } +/*! Build a deferred control command state and keep it the per-connection list of deferred commands. + * This function is typically called by a ctrl command handler that wishes to defer returning a + * response. The reutnred state can later be used to check if the deferred command is still alive, + * and to respond to the specific command. This only works to defer the response to GET and SET. + * \param[in] ctx talloc context from whihc to allocate the ctrl_cmd_def + * \param[in] cmd the control command whose response is deferred + * \param[in] data opaque, user-defined pointer + * \param[in] secs number of seconds until the command times out + * \returns callee-allocated ctrl_cmd_def */ struct ctrl_cmd_def * ctrl_cmd_def_make(const void *ctx, struct ctrl_cmd *cmd, void *data, unsigned int secs) { @@ -576,6 +612,9 @@ return cd; } +/*! Determine if the given deferred control command is still alive or a zombie. + * \param[in] cd deferred ctrl command state + * \returns 0 is \a cd is still alive; 1 if it's a zombie */ int ctrl_cmd_def_is_zombie(struct ctrl_cmd_def *cd) { /* luckily we're still alive */ @@ -589,6 +628,10 @@ return 1; } +/*! Send the response to a deferred ctrl command. + * The command can only be a resply to a SET or a GET operation. + * \param[in] cd deferred ctrl command state + * \returns 0 if command sent successfully; negative on error */ int ctrl_cmd_def_send(struct ctrl_cmd_def *cd) { struct ctrl_cmd *cmd = cd->cmd; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 269b7b9..d3e6fac 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -75,6 +75,11 @@ }; static LLIST_HEAD(ctrl_lookup_helpers); +/*! Parse ascii-encoded decimal number at vline[i] + * \param[in] vline vector containing a tokenized line + * \param[in] i index into the vector \a vline + * \param[out] num parsed decimal integer number at vline[i] + * \returns 1 on success; 0 in case of error */ int ctrl_parse_get_num(vector vline, int i, long *num) { char *token, *tmp; @@ -94,7 +99,10 @@ return 1; } -/* Send command to all */ +/*! Send a CTRL command to all connections. + * \param[in] ctrl global control handle + * \param[in] cmd command to send to all connections in \ctrl + * \returns number of times the command has been sent */ int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd) { struct ctrl_connection *ccon; @@ -109,6 +117,10 @@ return ret; } +/*! Encode a CTRL command and append it to the given write queue + * \param[inout] queue write queue to which encoded \a cmd shall be appended + * \param[in] cmd decoded command representation + * \returns 0 in case of success; negative on error */ int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd) { int ret; @@ -152,6 +164,9 @@ return r; } +/*! Copy given \a cmd and convert copy to CTRL_TYPE_TRAP. + * \param[in] cmd command to be copied + * \returns pointer to newly-allocated copy of type TRAP. Allocated as sibling of \a cmd */ struct ctrl_cmd *ctrl_cmd_trap(struct ctrl_cmd *cmd) { struct ctrl_cmd *trap; @@ -361,6 +376,11 @@ return -EBADF; } +/*! Handle a received CTRL command contained in a \ref msgb. + * \param[in] ctrl CTRL interface handle + * \param[in] ccon CTRL connection through which the command was received + * \param[in] msg message buffer containing CTRL command including IPA+IPA_EXT headers + * \returns 0 on success; negative on error */ int ctrl_handle_msg(struct ctrl_handle *ctrl, struct ctrl_connection *ccon, struct msgb *msg) { struct ctrl_cmd *cmd; -- To view, visit https://gerrit.osmocom.org/9332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f Gerrit-Change-Number: 9332 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 18:15:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 18:15:12 +0000 Subject: Change in libosmocore[master]: ctrl: Add doxygen API documentation; generate html from it In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9332 to look at the new patch set (#2). Change subject: ctrl: Add doxygen API documentation; generate html from it ...................................................................... ctrl: Add doxygen API documentation; generate html from it Closes: OS#3293 Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f --- A Doxyfile.ctrl.in M Makefile.am M configure.ac M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_cmd.c M src/ctrl/control_if.c 6 files changed, 1,869 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/32/9332/2 -- To view, visit https://gerrit.osmocom.org/9332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f Gerrit-Change-Number: 9332 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 19:58:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 19:58:27 +0000 Subject: Change in libosmocore[master]: ctrl: Introduce libosmoctrl.map to avoid unintended exports In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9331 to look at the new patch set (#2). Change subject: ctrl: Introduce libosmoctrl.map to avoid unintended exports ...................................................................... ctrl: Introduce libosmoctrl.map to avoid unintended exports There are some symbols for use between control_cmd.c and control_if.c, which are not supposed to be exported publicly. Let's make sure we keep those symbols local. Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 --- M configure.ac M src/ctrl/Makefile.am A src/ctrl/libosmoctrl.map 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/9331/2 -- To view, visit https://gerrit.osmocom.org/9331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 Gerrit-Change-Number: 9331 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 20:59:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 20:59:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9247 ) Change subject: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 Gerrit-Change-Number: 9247 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 20:59:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:00:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:00:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9248 ) Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 21:00:00 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:00:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:00:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw... In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9250 ) Change subject: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 Gerrit-Change-Number: 9250 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 21:00:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9251 ) Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9251/4/sgsn/SGSN_Tests.ttcn File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/9251/4/sgsn/SGSN_Tests.ttcn at 1269 PS4, Line 1269: [] BSSGP.receive(tr_BD_L3_MT(*)) { this only installs a receive handler for downlink layer3 messages. What about user-data or paging or other messages? I think there should be a BSSGP.receive { } clause with either repeat or setverdict(fail), to catch any other BSSGP messages. It's a question of policy. I would typically "repeat" (and hence ignore) any unexpected message, unless we know that no such messages are permitted in this state. -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 21:03:52 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add values for c_GMM_DTT_MT_* In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9246 ) Change subject: L3_Templates: add values for c_GMM_DTT_MT_* ...................................................................... L3_Templates: add values for c_GMM_DTT_MT_* GMM detach type values Change-Id: I4903fa4c915add3062ab6b82a1d39d60426b5681 --- M library/L3_Templates.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 5acd2bf..2fb6416 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1790,6 +1790,10 @@ const BIT3 c_GMM_DTT_MO_IMSI := '010'B; const BIT3 c_GMM_DTT_MO_GPRS_IMSI_COMBINED := '011'B; +const BIT3 c_GMM_DTT_MT_REATTACH_REQUIRED := '001'B; +const BIT3 c_GMM_DTT_MT_REATTACH_NOT_REQUIRED := '010'B; +const BIT3 c_GMM_DTT_MT_IMSI_DETACH := '011'B; + template (value) DetachTypeV ts_GMM_DetType(BIT3 dtt, boolean power_off := false) := { detachType := dtt, powerOffFlag := bool2bit(power_off) -- To view, visit https://gerrit.osmocom.org/9246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4903fa4c915add3062ab6b82a1d39d60426b5681 Gerrit-Change-Number: 9246 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9247 ) Change subject: L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT ...................................................................... L3_Templates: add template tr_GMM_DET_REQ_MT/ts_GMM_DET_ACCEPT_MT Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 --- M library/L3_Templates.ttcn 1 file changed, 24 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 2fb6416..824dbf2 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1863,7 +1863,10 @@ } } -template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT(template BIT3 dtt := ?, template boolean power_off := ?) := { +template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT( + template BIT3 dtt := *, + template BIT3 forceToStandby := ?, + template OCT1 cause := omit) := { discriminator := '1000'B, tiOrSkip := { skipIndicator := '0000'B @@ -1872,9 +1875,26 @@ gprs_mm := { detachRequest_SGSN_MS := { messageType := '00000101'B, - detachType := { dtt, bool2bit_tmpl(power_off) }, - forceToStandby := ?, - gmmCause := * + detachType := { dtt, ? }, + forceToStandby := { forceToStandby, '0'B }, + gmmCause := { + elementIdentifier := '25'O, + causeValue := { cause } + } + } + } + } +} + +template PDU_L3_MS_SGSN ts_GMM_DET_ACCEPT_MO := { + discriminator := '0000'B, /* overwritten */ + tiOrSkip := { + skipIndicator := '0000'B + }, + msgs := { + gprs_mm := { + detachAccept_MS_SGSN := { + messageType := '00000000'B } } } -- To view, visit https://gerrit.osmocom.org/9247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ifea650994408c4dd83f46f6256565d38968bf843 Gerrit-Change-Number: 9247 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9248 ) Change subject: SGSN: add TC_hlr_location_cancel_request ...................................................................... SGSN: add TC_hlr_location_cancel_request MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack MS <- SGSN: Detach Request SGSN-> MS: Detach Complete Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a --- M sgsn/SGSN_Tests.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index e1d35c5..1a68014 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1249,6 +1249,37 @@ } +private function f_TC_hlr_location_cancel_request_withdraw(charstring id) runs on BSSGP_ConnHdlr { + /* MS: perform regular attach */ + f_TC_attach(id); + + /* HLR: cancel the location request */ + GSUP.send(ts_GSUP_CL_REQ(g_pars.imsi, OSMO_GSUP_CANCEL_TYPE_WITHDRAW)); + GSUP.receive(tr_GSUP_CL_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + /* MS: receive a Detach Request */ + BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(c_GMM_DTT_MT_IMSI_DETACH, ?, ?))); + BSSGP.send(ts_GMM_DET_ACCEPT_MO); + + setverdict(pass); +} + +testcase TC_hlr_location_cancel_request_withdraw() runs on test_CT { + /* MS <-> SGSN: GMM Attach + * HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Ack + * MS <- SGSN: Detach Request + * SGSN-> MS: Detach Complete + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_withdraw), testcasename(), g_gb[0], 29); + vc_conn.done; +} + + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1262,6 +1293,7 @@ execute( TC_attach_combined() ); execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); + execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_detach_unknown_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/9248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id5d6b018a5a4389eefa8f5d950324aab91709f5a Gerrit-Change-Number: 9248 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9249 ) Change subject: GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors ...................................................................... GSUP_Types.ttcn: allow other TLV appear in Cancel Location Errors Change-Id: I21ee02556f0734dad871a6294b21ca6f2864dea0 --- M library/GSUP_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 57c0a39..4c2aac0 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -341,7 +341,7 @@ template GSUP_PDU tr_GSUP_CL_ERR(template hexstring imsi, template integer cause := ?) := tr_GSUP(OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR, { - tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause) }); + tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause), * }); template (value) GSUP_PDU ts_GSUP_PURGE_MS_REQ(hexstring imsi, GSUP_CnDomain dom) := ts_GSUP(OSMO_GSUP_MSGT_PURGE_MS_REQUEST, { -- To view, visit https://gerrit.osmocom.org/9249 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I21ee02556f0734dad871a6294b21ca6f2864dea0 Gerrit-Change-Number: 9249 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:03:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:03:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw... In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9250 ) Change subject: SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} ...................................................................... SGSN: add TC_hlr_location_cancel_request_unknown_subscriber_{withdraw,update} Cancel Location using an unknown IMSI. HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Error Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 49 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1a68014..0685e30 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1280,6 +1280,53 @@ } +private function f_hlr_location_cancel_request_unknown_subscriber( + charstring id, + GSUP_CancelType canceltype) runs on BSSGP_ConnHdlr { + + /* HLR: cancel the location request */ + GSUP.send(ts_GSUP_CL_REQ(g_pars.imsi, canceltype)); + + /* cause 2 = IMSI_UNKNOWN */ + GSUP.receive(tr_GSUP_CL_ERR(g_pars.imsi, 2)); + + setverdict(pass); +} + +private function f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw(charstring id) runs on BSSGP_ConnHdlr { + f_hlr_location_cancel_request_unknown_subscriber(id, OSMO_GSUP_CANCEL_TYPE_WITHDRAW); +} + +testcase TC_hlr_location_cancel_request_unknown_subscriber_withdraw() runs on test_CT { + /* HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Error + */ + + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_withdraw), testcasename(), g_gb[0], 30); + vc_conn.done; +} + +private function f_TC_hlr_location_cancel_request_unknown_subscriber_update(charstring id) runs on BSSGP_ConnHdlr { + f_hlr_location_cancel_request_unknown_subscriber(id, OSMO_GSUP_CANCEL_TYPE_WITHDRAW); +} + +testcase TC_hlr_location_cancel_request_unknown_subscriber_update() runs on test_CT { + /* HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Error + */ + + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_unknown_subscriber_update), testcasename(), g_gb[0], 30); + vc_conn.done; +} + + + control { execute( TC_attach() ); execute( TC_attach_mnc3() ); @@ -1294,6 +1341,8 @@ execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 5.0 ); + execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 5.0 ); execute( TC_rau_unknown() ); execute( TC_attach_rau() ); execute( TC_detach_unknown_nopoweroff() ); -- To view, visit https://gerrit.osmocom.org/9250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iad90c3cc25d72b9ab40e358fe60aa6f62163f146 Gerrit-Change-Number: 9250 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:04:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sat, 26 May 2018 21:04:43 +0000 Subject: Change in libosmocore[master]: ctrl: Add doxygen API documentation; generate html from it In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9332 ) Change subject: ctrl: Add doxygen API documentation; generate html from it ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f Gerrit-Change-Number: 9332 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sat, 26 May 2018 21:04:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:14:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 26 May 2018 21:14:24 +0000 Subject: Change in libosmocore[master]: add gsm0808_cell_id_to_list() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9333 Change subject: add gsm0808_cell_id_to_list() ...................................................................... add gsm0808_cell_id_to_list() The idea is to be able to add a gsm0808_cell_id to a gsm0808_cell_id_list2: first convert it to a list, then re-use gsm0808_cell_id_list_add(). It will be used by osmo-bsc to manage neighbor-BSS cell identifiers from VTY. Change-Id: Ibf746ac60b1b1e920baf494b396658a5ceabd788 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/9333/1 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 24c139a..6555734 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -98,6 +98,7 @@ const uint8_t *elem, uint8_t len) OSMO_DEPRECATED("use gsm0808_dec_cell_id_list2 instead"); int gsm0808_cell_id_list_add(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id_list2 *src); +void gsm0808_cell_id_to_list(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id *src); uint8_t gsm0808_enc_cell_id(struct msgb *msg, const struct gsm0808_cell_id *ci); int gsm0808_dec_cell_id(struct gsm0808_cell_id *ci, const uint8_t *elem, uint8_t len); int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2c659bb..080fc95 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -988,6 +988,37 @@ return added; } +/*! Convert a single Cell Identifier to a Cell Identifier List with one entry. + * \param dst[out] Overwrite this list. + * \param src[in] Set \a dst to contain exactly this item. + */ +void gsm0808_cell_id_to_list(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id *src) +{ + if (!dst) + return; + if (!src) { + *dst = (struct gsm0808_cell_id_list2){ + .id_discr = CELL_IDENT_NO_CELL, + }; + return; + } + + *dst = (struct gsm0808_cell_id_list2){ + .id_discr = src->id_discr, + .id_list = { src->id }, + .id_list_len = 1, + }; + + switch (src->id_discr) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + dst->id_list_len = 0; + break; + default: + break; + } +} + /*! Encode Cell Identifier IE (3GPP TS 48.008 3.2.2.17). * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ci Cell ID to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index c4b1b75..5a57429 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -177,6 +177,7 @@ gsm0808_dec_cell_id_list; gsm0808_dec_cell_id_list2; gsm0808_cell_id_list_add; +gsm0808_cell_id_to_list; gsm0808_enc_cell_id; gsm0808_dec_cell_id; gsm0808_cell_id_name; -- To view, visit https://gerrit.osmocom.org/9333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf746ac60b1b1e920baf494b396658a5ceabd788 Gerrit-Change-Number: 9333 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:14:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 26 May 2018 21:14:25 +0000 Subject: Change in libosmocore[master]: add support for gsm0808 HANDOVER REQUIRED message Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9334 Change subject: add support for gsm0808 HANDOVER REQUIRED message ...................................................................... add support for gsm0808 HANDOVER REQUIRED message Related: OS#2283 (inter-BSC Handover, BSC side, MO) Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 4 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/9334/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 369d713..c7fb660 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -25,6 +25,7 @@ #include "tlv.h" #include +#include #include struct sockaddr_storage; @@ -80,6 +81,42 @@ const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); +/*! 3GPP TS 48.008 ?3.2.2.5.8 Old BSS to New BSS information */ +struct gsm0808_old_bss_to_new_bss_info { + bool extra_information_present; + struct { + bool prec; + bool lcs; + bool ue_prob; + } extra_information; + + bool current_channel_type_2_present; + struct { + uint8_t mode; + uint8_t field; + } current_channel_type_2; + + /* more items are defined in the spec and may be added later */ +}; + +/*! 3GPP TS 48.008 ?3.2.1.9 HANDOVER REQUIRED */ +struct gsm0808_handover_required { + uint16_t cause; + struct gsm0808_cell_id_list2 cil; + + bool current_channel_type_1_present; + uint8_t current_channel_type_1; + + bool speech_version_used_present; + uint8_t speech_version_used; + + bool old_bss_to_new_bss_info_present; + struct gsm0808_old_bss_to_new_bss_info old_bss_to_new_bss_info; + + /* more items are defined in the spec and may be added later */ +}; +struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index b699080..60b9681 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -295,6 +295,28 @@ GSM0808_IE_LAST_USED_EUTRAN_PLMN_ID = 0x95, }; +/* 3GPP TS 48.008 3.2.3 Signalling Field Element Coding */ +enum GSM0808_SIGNALLING_FIELD_ELEMENT_CODING { + GSM0808_FE_IE_EXTRA_INFORMATION = 0x01, /*< 3.2.3.1 */ + GSM0808_FE_IE_CURRENT_CHANNEL_TYPE_2 = 0x02, /*< 3.2.3.2 */ + GSM0808_FE_IE_TARGET_CELL_RADIO_INFORMATION = 0x03, /*< 3.2.3.3 */ + GSM0808_FE_IE_GPRS_SUSPEND_INFORMATION = 0x04, /*< 3.2.3.4 */ + GSM0808_FE_IE_MULTIRATE_CONFIGURATION_INFORMATION = 0x05, /*< 3.2.3.5 */ + GSM0808_FE_IE_DUAL_TRANSFER_MODE_INFORMATION = 0x06, /*< 3.2.3.6 */ + GSM0808_FE_IE_INTER_RAT_HANDOVER_INFO = 0x07, /*< 3.2.3.7 */ + GSM0808_FE_IE_CDMA2000_CAPABILITY_INFORMATION = 0x08, /*< 3.2.3.8 */ + GSM0808_FE_IE_DOWNLINK_CELL_LOAD_INFORMATION = 0x09, /*< 3.2.3.9 */ + GSM0808_FE_IE_UPLINK_CELL_LOAD_INFORMATION = 0x0a, /*< 3.2.3.10 */ + GSM0808_FE_IE_CELL_LOAD_INFORMATION_GROUP = 0x0b, /*< 3.2.3.11 */ + GSM0808_FE_IE_CELL_LOAD_INFORMATION = 0x0c, /*< 3.2.3.12 */ + GSM0808_FE_IE_PS_INDICATION = 0x0d, /*< 3.2.3.13 */ + GSM0808_FE_IE_DTM_HANDOVER_COMMAND_INDICATION = 0x0e, /*< 3.2.3.14 */ + GSM0808_FE_IE_D_RNTI = 0xfe, /*< 3.2.3.15 */ + GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION = 0x0f, /*< 3.2.3.16 */ + GSM0808_FE_IE_SOURCE_CELL_ID = 0x10, /*< 3.2.3.17 */ + GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION_EXTENDED_E_ARFCNS = 0x11, /*< 3.2.3.18 */ +}; + /* GSM 08.08 3.2.2.5 Cause */ enum gsm0808_cause { GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE = 0, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 4743175..80f5e6c 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -609,6 +609,76 @@ return gsm0808_create_paging2(imsi, tmsi, &cil2, chan_needed); } +static uint8_t put_old_bss_to_new_bss_information(struct msgb *msg, + const struct gsm0808_old_bss_to_new_bss_info *i) +{ + uint8_t *old_tail; + uint8_t *tlv_len; + + msgb_put_u8(msg, GSM0808_IE_OLD_BSS_TO_NEW_BSS_INFORMATION); + tlv_len = msgb_put(msg, 1); + old_tail = msg->tail; + + if (i->extra_information_present) { + uint8_t val = 0; + if (i->extra_information.prec) + val |= 1 << 0; + if (i->extra_information.lcs) + val |= 1 << 1; + if (i->extra_information.ue_prob) + val |= 1 << 2; + msgb_tlv_put(msg, GSM0808_FE_IE_EXTRA_INFORMATION, 1, &val); + } + + if (i->current_channel_type_2_present) { + uint8_t val[2] = { + i->current_channel_type_2.mode, + i->current_channel_type_2.field, + }; + msgb_tlv_put(msg, GSM0808_FE_IE_CURRENT_CHANNEL_TYPE_2, 2, val); + } + + *tlv_len = (uint8_t) (msg->tail - old_tail); + return *tlv_len + 2; +} + +/*! Create BSSMAP HANDOVER REQUIRED message. + * \param[in] params All information to be encoded. + * \returns newly allocated msgb with BSSMAP REQUIRED message. */ +struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params) +{ + struct msgb *msg; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-REQUIRED"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_REQUIRED); + + /* Cause, 3.2.2.5 */ + msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + + /* Cell Identifier List, 3.2.2.27 */ + gsm0808_enc_cell_id_list2(msg, ¶ms->cil); + + /* Current Channel Type 1, 3.2.2.49 */ + if (params->current_channel_type_1_present) + msgb_tv_fixed_put(msg, GSM0808_IE_CURRENT_CHANNEL_TYPE_1, 1, ¶ms->current_channel_type_1); + + /* Speech Version (Used), 3.2.2.51 */ + if (params->speech_version_used_present) + msgb_tv_fixed_put(msg, GSM0808_IE_SPEECH_VERSION, 1, ¶ms->speech_version_used); + + if (params->old_bss_to_new_bss_info_present) + put_old_bss_to_new_bss_information(msg, ¶ms->old_bss_to_new_bss_info); + + /* pre-pend the header */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 5a57429..58a5bfe 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -161,6 +161,7 @@ gsm0808_create_reset; gsm0808_create_reset_ack; gsm0808_create_sapi_reject; +gsm0808_create_handover_required; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/9334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 Gerrit-Change-Number: 9334 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat May 26 21:14:25 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sat, 26 May 2018 21:14:25 +0000 Subject: Change in libosmocore[master]: add gsm0808_create_handover_request_ack() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9335 Change subject: add gsm0808_create_handover_request_ack() ...................................................................... add gsm0808_create_handover_request_ack() Related: OS#2283 (inter-BSC Handover, BSC side, MT) Change-Id: I692292a06c7d66004404560dc4ed933ca9107f9b --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/9335/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index c7fb660..0b0199a 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -117,6 +117,10 @@ }; struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params); +struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len, + uint8_t chosen_channel, uint8_t chosen_encr_alg, + uint8_t chosen_speech_version); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 80f5e6c..5af53ee 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -679,6 +679,31 @@ return msg; } +/*! Create BSSMAP HANDOVER REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 3.2.1.10. */ +struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len, + uint8_t chosen_channel, uint8_t chosen_encr_alg, + uint8_t chosen_speech_version) +{ + struct msgb *msg; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-ACCEPT-ACK"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE); + + /* Layer 3 Information, 3.2.2.24 */ + msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, l3_info_len, l3_info); + + msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, chosen_channel); + msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, chosen_encr_alg); + if (chosen_speech_version != 0) + msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, chosen_speech_version); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 58a5bfe..3b9fbfd 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,6 +162,7 @@ gsm0808_create_reset_ack; gsm0808_create_sapi_reject; gsm0808_create_handover_required; +gsm0808_create_handover_request_ack; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/9335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I692292a06c7d66004404560dc4ed933ca9107f9b Gerrit-Change-Number: 9335 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sat May 26 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sat, 26 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#48?= In-Reply-To: <1885845228.163.1527288081285.JavaMail.jenkins@jenkins.osmocom.org> References: <1885845228.163.1527288081285.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <328783667.182.1527374480689.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-4731/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-4731/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-4731/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-4731/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-4731/ libtool: install: (cd /tmp/am-dc-4731/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-4731/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-4731/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-4731/ libtool: install: chmod 644 /tmp/am-dc-4731/ libtool: install: ranlib /tmp/am-dc-4731/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-4731/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-4731/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-4731/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-4731/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-4731/ /bin/mkdir -p '/tmp/am-dc-4731/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-4731/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-4731/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-4731/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-4731/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-4731/ libtool: uninstall: rm -f /tmp/am-dc-4731/ /tmp/am-dc-4731/ /tmp/am-dc-4731/ /tmp/am-dc-4731/ /tmp/am-dc-4731/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-4731/ && rm -f html.tar ) ( cd '/tmp/am-dc-4731/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-4731/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Sun May 27 10:46:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 10:46:22 +0000 Subject: Change in libosmocore[master]: ctrl: Introduce libosmoctrl.map to avoid unintended exports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9331 ) Change subject: ctrl: Introduce libosmoctrl.map to avoid unintended exports ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 Gerrit-Change-Number: 9331 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 10:46:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 10:46:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 10:46:25 +0000 Subject: Change in libosmocore[master]: ctrl: Introduce libosmoctrl.map to avoid unintended exports In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9331 ) Change subject: ctrl: Introduce libosmoctrl.map to avoid unintended exports ...................................................................... ctrl: Introduce libosmoctrl.map to avoid unintended exports There are some symbols for use between control_cmd.c and control_if.c, which are not supposed to be exported publicly. Let's make sure we keep those symbols local. Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 --- M configure.ac M src/ctrl/Makefile.am A src/ctrl/libosmoctrl.map 3 files changed, 38 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 6b9c66f..79ef9d4 100644 --- a/configure.ac +++ b/configure.ac @@ -47,11 +47,13 @@ LTLDFLAGS_OSMOGB='-Wl,--version-script=$(srcdir)/libosmogb.map' LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map' LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map' + LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map' ;; esac AC_SUBST(LTLDFLAGS_OSMOGB) AC_SUBST(LTLDFLAGS_OSMOGSM) AC_SUBST(LTLDFLAGS_OSMOCODING) +AC_SUBST(LTLDFLAGS_OSMOCTRL) dnl checks for header files AC_HEADER_STDC diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index 71cc9a3..a51ae05 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -20,4 +20,6 @@ libosmoctrl_la_SOURCES += control_vty.c endif +EXTRA_DIST = libosmoctrl.map + endif diff --git a/src/ctrl/libosmoctrl.map b/src/ctrl/libosmoctrl.map new file mode 100644 index 0000000..5b888a2 --- /dev/null +++ b/src/ctrl/libosmoctrl.map @@ -0,0 +1,34 @@ +LIBOSMOCTRL_1.0 { +global: + +ctrl_cmd_cpy; +ctrl_cmd_create; +ctrl_cmd_def_is_zombie; +ctrl_cmd_def_make; +ctrl_cmd_def_send; +#ctrl_cmd_exec; +ctrl_cmd_exec_from_string; +ctrl_cmd_handle; +ctrl_cmd_install; +ctrl_cmd_make; +ctrl_cmd_parse; +ctrl_cmd_parse2; +ctrl_cmd_send; +ctrl_cmd_send_to_all; +ctrl_cmd_send_trap; +ctrl_cmd_trap; +ctrl_handle_alloc; /* could be removed? */ +ctrl_handle_alloc2; /* could be removed? */ +ctrl_handle_msg; /* only used in unit test */ +ctrl_interface_setup; +ctrl_interface_setup_dynip; +ctrl_interface_setup_dynip2; +ctrl_lookup_register; +ctrl_parse_get_num; +ctrl_type_vals; +ctrl_vty_get_bind_addr; +ctrl_vty_init; +osmo_ctrl_conn_alloc; + +local: *; +}; -- To view, visit https://gerrit.osmocom.org/9331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia85f36a9c4b2ebf4003718e0a230959638370320 Gerrit-Change-Number: 9331 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 10:46:26 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 10:46:26 +0000 Subject: Change in libosmocore[master]: ctrl: Add doxygen API documentation; generate html from it In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9332 ) Change subject: ctrl: Add doxygen API documentation; generate html from it ...................................................................... ctrl: Add doxygen API documentation; generate html from it Closes: OS#3293 Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f --- A Doxyfile.ctrl.in M Makefile.am M configure.ac M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_cmd.c M src/ctrl/control_if.c 6 files changed, 1,869 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Doxyfile.ctrl.in b/Doxyfile.ctrl.in new file mode 100644 index 0000000..eb363bb --- /dev/null +++ b/Doxyfile.ctrl.in @@ -0,0 +1,1716 @@ +# Doxyfile 1.7.4 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = libosmoctrl + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Osmocom CTRL library" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc/ctrl + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit command for a brief description.) + +QT_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = @srcdir@/include/osmocom/ctrl @srcdir@/src/ctrl + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +# IMAGE_PATH = images/ + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is adviced to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW! + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 1 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = YES + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the +# mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# pointed to by INCLUDE_PATH will be searched when a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that +# overrules the definition found in the source code. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = doc/libosmocore.tag=../../core/html + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = doc/libosmoctrl.tag + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called Helvetica to the output +# directory and reference it in all dot files that doxygen generates. +# When you want a differently looking font you can specify the font name +# using DOT_FONTNAME. You need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will generate a graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are svg, png, jpg, or gif. +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = /usr/bin/dot + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/Makefile.am b/Makefile.am index 60ec1f8..de5eb35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ $(top_builddir)/doc/vty/html/index.html \ $(top_builddir)/doc/codec/html/index.html \ $(top_builddir)/doc/coding/html/index.html \ + $(top_builddir)/doc/ctrl/html/index.html \ $(top_builddir)/doc/gb/html/index.html cd $(top_builddir)/doc && tar cf html.tar */html @@ -62,6 +63,11 @@ mkdir -p doc/coding $(DOXYGEN) Doxyfile.coding +$(top_builddir)/doc/ctrl/html/index.html: $(SOURCES) Doxyfile.ctrl + @rm -rf doc/ctrl + mkdir -p doc/ctrl + $(DOXYGEN) Doxyfile.ctrl + $(top_builddir)/doc/gb/html/index.html: $(SOURCES) Doxyfile.gb @rm -rf doc/gb mkdir -p doc/gb @@ -71,9 +77,9 @@ cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar uninstall-hook: - cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec,coding,gb} + cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec,coding,ctrl,gb} -DX_CLEAN = doc/{core,gsm,vty,codec,coding,gb}/html/search/* doc/{core,gsm,vty,codec,coding,gb}/{html,latex}/* doc/html.tar doc/{core,gsm,vty,codec,coding,gb}/doxygen_sqlite3.db doc/*.tag +DX_CLEAN = doc/{core,gsm,vty,codec,coding,ctrl,gb}/html/search/* doc/{core,gsm,vty,codec,coding,ctrl,gb}/{html,latex}/* doc/html.tar doc/{core,gsm,vty,codec,coding,ctrl,gb}/doxygen_sqlite3.db doc/*.tag endif MOSTLYCLEANFILES = $(DX_CLEAN) diff --git a/configure.ac b/configure.ac index 79ef9d4..cb580a3 100644 --- a/configure.ac +++ b/configure.ac @@ -371,4 +371,5 @@ Doxyfile.codec Doxyfile.coding Doxyfile.gb + Doxyfile.ctrl Makefile) diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index a5df753..08376f3 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -15,6 +15,7 @@ struct ctrl_handle; +/*! The class of node at which a ctrl command is registered to */ enum ctrl_node_type { CTRL_NODE_ROOT, /* Root elements */ CTRL_NODE_BTS, /* BTS specific (net.btsN.) */ @@ -25,6 +26,7 @@ _LAST_CTRL_NODE }; +/*! Ctrl command types (GET, SET, ...) */ enum ctrl_type { CTRL_TYPE_UNKNOWN, CTRL_TYPE_GET, @@ -35,37 +37,47 @@ CTRL_TYPE_ERROR }; +/*! human-readable string names for \ref ctrl_type */ extern const struct value_string ctrl_type_vals[]; +/*! Represents a single ctrl connection */ struct ctrl_connection { struct llist_head list_entry; - /* The queue for sending data back */ + /*! The queue for sending data back */ struct osmo_wqueue write_queue; - /* Buffer for partial input data */ + /*! Buffer for partial input data */ struct msgb *pending_msg; - /* Callback if the connection was closed */ + /*! Callback if the connection was closed */ void (*closed_cb)(struct ctrl_connection *conn); - /* Pending commands for this connection */ + /*! Pending commands for this connection */ struct llist_head cmds; - /* Pending deferred commands for this connection */ + /*! Pending deferred command responses for this connection */ struct llist_head def_cmds; }; struct ctrl_cmd_def; +/*! Represents a single ctrl command after parsing */ struct ctrl_cmd { + /*! connection through which the command was received */ struct ctrl_connection *ccon; + /*! command type */ enum ctrl_type type; char *id; + /*! node of the specified variable */ void *node; + /*! name of the variable */ char *variable; + /*! value of the specified CTRL variable */ char *value; + /*! respnse message string */ char *reply; + /*! state representing deferred (async) response, if any */ struct ctrl_cmd_def *defer; }; @@ -77,11 +89,17 @@ char **command; }; +/*! Implementation of a given CTRL command. This is what a program registers + * using \r ctrl_cmd_install in order to implement a given control variable. */ struct ctrl_cmd_element { + /*! textual name/id of the CTRL command */ const char *name; struct ctrl_cmd_struct strcmd; + /*! call-back function implementing the SET operation */ int (*set)(struct ctrl_cmd *cmd, void *data); + /*! call-back function implementing the GET operation */ int (*get)(struct ctrl_cmd *cmd, void *data); + /*! call-back function to validate a value; called before SET */ int (*verify)(struct ctrl_cmd *cmd, const char *value, void *data); }; @@ -113,6 +131,10 @@ struct ctrl_cmd *ctrl_cmd_create(void *ctx, enum ctrl_type); struct ctrl_cmd *ctrl_cmd_trap(struct ctrl_cmd *cmd); +/*! Helper to generate static struct ctrl_cmd_element + * \param[in] cmdname symbol name of the command related functions/structures + * \param[in] cmdstr string name exposed on CTRL + * \param[in] verify_name full symbol name of verification function */ #define CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_name) \ static struct ctrl_cmd_element cmd_##cmdname = { \ .name = cmdstr, \ @@ -121,6 +143,10 @@ .verify = verify_name, \ } +/*! Helper to generate static GET function for integer + * \param[in] cmdname symbol name of the command related function + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype */ #define CTRL_HELPER_GET_INT(cmdname, dtype, element) \ static int get_##cmdname(struct ctrl_cmd *cmd, void *_data) \ { \ @@ -132,6 +158,11 @@ } \ return CTRL_CMD_REPLY; \ } + +/*! Helper to generate static SET function for integer + * \param[in] cmdname symbol name of the command related function + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype */ #define CTRL_HELPER_SET_INT(cmdname, dtype, element) \ static int set_##cmdname(struct ctrl_cmd *cmd, void *_data) \ { \ @@ -140,6 +171,11 @@ node->element = tmp; \ return get_##cmdname(cmd, _data); \ } + +/*! Helper to generate static VERIFY unction validating a numeric range + * \param[in] cmdname symbol name of the command related function + * \param[in] min minimum permitted integer value + * \param[in] max maximum permitted integer value */ #define CTRL_HELPER_VERIFY_RANGE(cmdname, min, max) \ static int verify_##cmdname(struct ctrl_cmd *cmd, const char *value, void *_data) \ { \ @@ -151,12 +187,23 @@ return -1; \ } +/*! Helper to generate GET, SET, VERIFY + ctrl_cmd_element for integer + * \param[in] cmdname symbol name of the command related function + * \param[in] cmdstr string name exposed on CTRL + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype + * \param[in] min minimum permitted integer value + * \param[in] max maximum permitted integer value */ #define CTRL_CMD_DEFINE_RANGE(cmdname, cmdstr, dtype, element, min, max) \ CTRL_HELPER_GET_INT(cmdname, dtype, element) \ CTRL_HELPER_SET_INT(cmdname, dtype, element) \ CTRL_HELPER_VERIFY_RANGE(cmdname, min, max) \ CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname) +/*! Helper to generate static GET function for string + * \param[in] cmdname symbol name of the command related function + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype */ #define CTRL_HELPER_GET_STRING(cmdname, dtype, element) \ static int get_##cmdname(struct ctrl_cmd *cmd, void *_data) \ { \ @@ -168,6 +215,11 @@ } \ return CTRL_CMD_REPLY; \ } + +/*! Helper to generate static SET function for string + * \param[in] cmdname symbol name of the command related function + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype */ #define CTRL_HELPER_SET_STRING(cmdname, dtype, element) \ static int set_##cmdname(struct ctrl_cmd *cmd, void *_data) \ { \ @@ -175,17 +227,31 @@ osmo_talloc_replace_string(cmd->node, &data->element, cmd->value); \ return get_##cmdname(cmd, _data); \ } + +/*! Helper to generate GET, SET, VERIFY + ctrl_cmd_element for string + * \param[in] cmdname symbol name of the command related function + * \param[in] cmdstr string name exposed on CTRL + * \param[in] dtype name of outer struct of user data + * \param[in] element name of field within \a dtype + * \param[in] min minimum permitted integer value + * \param[in] max maximum permitted integer value */ #define CTRL_CMD_DEFINE_STRING(cmdname, cmdstr, dtype, element) \ CTRL_HELPER_GET_STRING(cmdname, dtype, element) \ CTRL_HELPER_SET_STRING(cmdname, dtype, element) \ CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, NULL) +/*! Declare a read-write attribute. Declares get, set, verify. + * \param[in] cmdname symbol name of the command related functions/structures + * \param[in] cmdstr string name exposed on CTRL */ #define CTRL_CMD_DEFINE(cmdname, cmdstr) \ static int get_##cmdname(struct ctrl_cmd *cmd, void *data); \ static int set_##cmdname(struct ctrl_cmd *cmd, void *data); \ static int verify_##cmdname(struct ctrl_cmd *cmd, const char *value, void *data); \ CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname) +/*! Define a read-only attribute. Declares get, implements set+verify + * \param[in] cmdname symbol name of the command related functions/structures + * \param[in] cmdstr string name exposed on CTRL */ #define CTRL_CMD_DEFINE_RO(cmdname, cmdstr) \ static int get_##cmdname(struct ctrl_cmd *cmd, void *data); \ static int set_##cmdname(struct ctrl_cmd *cmd, void *data) \ @@ -200,6 +266,9 @@ } \ CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname) +/*! Define a write-only attribute. Declares set+verify, implements read call-back + * \param[in] cmdname symbol name of the command related functions/structures + * \param[in] cmdstr string name exposed on CTRL */ #define CTRL_CMD_DEFINE_WO(cmdname, cmdstr) \ static int set_##cmdname(struct ctrl_cmd *cmd, void *data); \ static int get_##cmdname(struct ctrl_cmd *cmd, void *data) \ @@ -210,7 +279,9 @@ static int verify_##cmdname(struct ctrl_cmd *cmd, const char *val, void *data); \ CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname) - +/*! Define a write-only attribute without verify. Declares set, implements read+verify + * \param[in] cmdname symbol name of the command related functions/structures + * \param[in] cmdstr string name exposed on CTRL */ #define CTRL_CMD_DEFINE_WO_NOVRF(cmdname, cmdstr) \ static int set_##cmdname(struct ctrl_cmd *cmd, void *data); \ static int get_##cmdname(struct ctrl_cmd *cmd, void *data) \ diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index fb0cd2b..bff4d17 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -89,6 +89,12 @@ return NULL; } +/*! Execute a given received command + * \param[in] vline vector representing the available/registered commands + * \param[inout] command parsed received command to be executed + * \param[in] node CTRL interface node + * \param[in] data opaque data passed to verify(), get() and set() call-backs + * \returns CTRL_CMD_HANDLED or CTRL_CMD_REPLY; CTRL_CMD_ERROR on error */ int ctrl_cmd_exec(vector vline, struct ctrl_cmd *command, vector node, void *data) { int ret = CTRL_CMD_ERROR; @@ -200,6 +206,10 @@ talloc_free(cmd->command); } +/*! Install a given command definition at a given CTRL node. + * \param[in] node CTRL node at whihc \a cmd is to be installed + * \param[in] cmd command definition to be installed + * \returns 0 on success; negative on error */ int ctrl_cmd_install(enum ctrl_node_type node, struct ctrl_cmd_element *cmd) { vector cmds_vec; @@ -221,6 +231,10 @@ return 0; } +/*! Allocate a control command of given \a type. + * \param[in] ctx talloc context from which to allocate + * \param[in] type command type to set after allocation + * \returns callee-allocated \ref ctrl_cmd. Caller must talloc_free() it. */ struct ctrl_cmd *ctrl_cmd_create(void *ctx, enum ctrl_type type) { struct ctrl_cmd *cmd; @@ -233,6 +247,10 @@ return cmd; } +/*! Perform a deepl copy of the given \a cmd, allocating memory from \a ctx. + * \param[in] ctx talloc context from which to allocate + * \param[in cmd CTRL command to be copied + * \returns deep copy of \a cmd on success; NULL on error */ struct ctrl_cmd *ctrl_cmd_cpy(void *ctx, struct ctrl_cmd *cmd) { struct ctrl_cmd *cmd2; @@ -269,7 +287,10 @@ return NULL; } -/*! Parse CTRL command struct from msgb, return NULL on any error. +/*! Parse/Decode CTRL from \ref msgb into command struct. + * \param[in] ctx talloc context from which to allocate + * \param[in] msg message buffer containing command to be decoded + * \returns callee-allocated decoded CTRL command; NULL on allocation or other failure * The caller is responsible to talloc_free() the returned struct pointer. */ struct ctrl_cmd *ctrl_cmd_parse(void *ctx, struct msgb *msg) { @@ -290,8 +311,11 @@ return true; } -/*! Parse CTRL command struct from msgb, return ctrl->type == CTRL_TYPE_ERROR and an error message in - * ctrl->reply on any error. +/*! Parse/Decode CTRL from \ref msgb into command struct. + * \param[in] ctx talloc context from which to allocate + * \param[in] msg message buffer containing command to be decoded + * \returns callee-allocated decoded CTRL command; NULL on allocation failure, + * ctrl->type == CTRL_TYPE_ERROR and an error message in ctrl->reply on any error. * The caller is responsible to talloc_free() the returned struct pointer. */ struct ctrl_cmd *ctrl_cmd_parse2(void *ctx, struct msgb *msg) { @@ -466,6 +490,9 @@ return cmd; } +/*! Encode a given CTRL command from its parsed form into a message buffer. + * \param[in] cmd decoded/parsed form of to-be-encoded command + * \returns callee-allocated message buffer containing the encoded \a cmd; NULL on error */ struct msgb *ctrl_cmd_make(struct ctrl_cmd *cmd) { struct msgb *msg; @@ -556,6 +583,15 @@ return NULL; } +/*! Build a deferred control command state and keep it the per-connection list of deferred commands. + * This function is typically called by a ctrl command handler that wishes to defer returning a + * response. The reutnred state can later be used to check if the deferred command is still alive, + * and to respond to the specific command. This only works to defer the response to GET and SET. + * \param[in] ctx talloc context from whihc to allocate the ctrl_cmd_def + * \param[in] cmd the control command whose response is deferred + * \param[in] data opaque, user-defined pointer + * \param[in] secs number of seconds until the command times out + * \returns callee-allocated ctrl_cmd_def */ struct ctrl_cmd_def * ctrl_cmd_def_make(const void *ctx, struct ctrl_cmd *cmd, void *data, unsigned int secs) { @@ -576,6 +612,9 @@ return cd; } +/*! Determine if the given deferred control command is still alive or a zombie. + * \param[in] cd deferred ctrl command state + * \returns 0 is \a cd is still alive; 1 if it's a zombie */ int ctrl_cmd_def_is_zombie(struct ctrl_cmd_def *cd) { /* luckily we're still alive */ @@ -589,6 +628,10 @@ return 1; } +/*! Send the response to a deferred ctrl command. + * The command can only be a resply to a SET or a GET operation. + * \param[in] cd deferred ctrl command state + * \returns 0 if command sent successfully; negative on error */ int ctrl_cmd_def_send(struct ctrl_cmd_def *cd) { struct ctrl_cmd *cmd = cd->cmd; diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 269b7b9..d3e6fac 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -75,6 +75,11 @@ }; static LLIST_HEAD(ctrl_lookup_helpers); +/*! Parse ascii-encoded decimal number at vline[i] + * \param[in] vline vector containing a tokenized line + * \param[in] i index into the vector \a vline + * \param[out] num parsed decimal integer number at vline[i] + * \returns 1 on success; 0 in case of error */ int ctrl_parse_get_num(vector vline, int i, long *num) { char *token, *tmp; @@ -94,7 +99,10 @@ return 1; } -/* Send command to all */ +/*! Send a CTRL command to all connections. + * \param[in] ctrl global control handle + * \param[in] cmd command to send to all connections in \ctrl + * \returns number of times the command has been sent */ int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd) { struct ctrl_connection *ccon; @@ -109,6 +117,10 @@ return ret; } +/*! Encode a CTRL command and append it to the given write queue + * \param[inout] queue write queue to which encoded \a cmd shall be appended + * \param[in] cmd decoded command representation + * \returns 0 in case of success; negative on error */ int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd) { int ret; @@ -152,6 +164,9 @@ return r; } +/*! Copy given \a cmd and convert copy to CTRL_TYPE_TRAP. + * \param[in] cmd command to be copied + * \returns pointer to newly-allocated copy of type TRAP. Allocated as sibling of \a cmd */ struct ctrl_cmd *ctrl_cmd_trap(struct ctrl_cmd *cmd) { struct ctrl_cmd *trap; @@ -361,6 +376,11 @@ return -EBADF; } +/*! Handle a received CTRL command contained in a \ref msgb. + * \param[in] ctrl CTRL interface handle + * \param[in] ccon CTRL connection through which the command was received + * \param[in] msg message buffer containing CTRL command including IPA+IPA_EXT headers + * \returns 0 on success; negative on error */ int ctrl_handle_msg(struct ctrl_handle *ctrl, struct ctrl_connection *ccon, struct msgb *msg) { struct ctrl_cmd *cmd; -- To view, visit https://gerrit.osmocom.org/9332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8dc2f24d4bf557ff7bb0f2f46881f9f8d9d7f86f Gerrit-Change-Number: 9332 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 14:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 14:59:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9336 Change subject: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case ...................................................................... BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case Change-Id: Ic86dd023693df5ad593eec090af815c926f87d34 --- M library/BSSAP_Adapter.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/9336/1 diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 7404a6f..b46bb3e 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -155,6 +155,11 @@ log("Connecting BSSMAP Emulation to SCCP_SP_PORT and starting emulation"); /* connect BSSNAP component to upposer side of SCCP */ connect(ba.vc_BSSMAP:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); + if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or + cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { + /* connect IPA MGCP port with BSSMAP MGCP port */ + connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_BSSMAP:MGCP); + } /* start the BSSMAP emulation */ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } -- To view, visit https://gerrit.osmocom.org/9336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic86dd023693df5ad593eec090af815c926f87d34 Gerrit-Change-Number: 9336 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 14:59:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 14:59:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: cosmetic typo fix Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9337 Change subject: BSSAP_Adapter: cosmetic typo fix ...................................................................... BSSAP_Adapter: cosmetic typo fix Change-Id: I2aba2316f12c2f752d58e58687c1ef529b983b96 --- M library/BSSAP_Adapter.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/9337/1 diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index b46bb3e..7f03f33 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -153,7 +153,7 @@ T.start; //T.timeout; log("Connecting BSSMAP Emulation to SCCP_SP_PORT and starting emulation"); - /* connect BSSNAP component to upposer side of SCCP */ + /* connect BSSNAP component to upper side of SCCP */ connect(ba.vc_BSSMAP:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { -- To view, visit https://gerrit.osmocom.org/9337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2aba2316f12c2f752d58e58687c1ef529b983b96 Gerrit-Change-Number: 9337 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 14:59:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 14:59:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9338 Change subject: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() ...................................................................... BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() In non-handler mode, the SCCP emulation is currently started before there's a user registered to SCCP_SP_PORT. If the first BSSMAP package arrives from the network, then the SCCP_Emulation will crash as it cannot deliver the resulting SCCP user primitive to the user. Let's split start from initialization, so user code can still register something to SCCP_SP_PORT before starting SCCP_Emulation. Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774 --- M bsc/BSC_Tests.ttcn M library/BSSAP_Adapter.ttcn M msc/MSC_Tests.ttcn 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/9338/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 936544b..906e214 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -312,6 +312,8 @@ connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT); f_legacy_bssap_reset(); } + f_bssap_start(g_bssap); + f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); f_init_mgcp("VirtMSC"); diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 7f03f33..e50487d 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -164,9 +164,12 @@ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } - ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); } +function f_bssap_start(inout BSSAP_Adapter ba) { + ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); +} + } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 56ac3d3..f843839 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -228,6 +228,7 @@ for (var integer i := 0; i < num_bsc; i := i + 1) { if (isbound(mp_bssap_cfg[i])) { f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); + f_bssap_start(g_bssap[i]); } else { setverdict(fail, "missing BSSAP configuration"); } -- To view, visit https://gerrit.osmocom.org/9338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774 Gerrit-Change-Number: 9338 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun May 27 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#136?= In-Reply-To: <1373482728.178.1527347407311.JavaMail.jenkins@jenkins.osmocom.org> References: <1373482728.178.1527347407311.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1883654278.195.1527433807000.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o rm -f y.tab.c gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9336 ) Change subject: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic86dd023693df5ad593eec090af815c926f87d34 Gerrit-Change-Number: 9336 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:33:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: cosmetic typo fix In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9337 ) Change subject: BSSAP_Adapter: cosmetic typo fix ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2aba2316f12c2f752d58e58687c1ef529b983b96 Gerrit-Change-Number: 9337 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:33:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9338 ) Change subject: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774 Gerrit-Change-Number: 9338 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:33:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9336 ) Change subject: BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case ...................................................................... BSSAP_Adapter: Connect ConnHdlr:MGCP to IPA MGCP in SCCPlite case Change-Id: Ic86dd023693df5ad593eec090af815c926f87d34 --- M library/BSSAP_Adapter.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 7404a6f..b46bb3e 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -155,6 +155,11 @@ log("Connecting BSSMAP Emulation to SCCP_SP_PORT and starting emulation"); /* connect BSSNAP component to upposer side of SCCP */ connect(ba.vc_BSSMAP:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); + if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or + cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { + /* connect IPA MGCP port with BSSMAP MGCP port */ + connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_BSSMAP:MGCP); + } /* start the BSSMAP emulation */ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } -- To view, visit https://gerrit.osmocom.org/9336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic86dd023693df5ad593eec090af815c926f87d34 Gerrit-Change-Number: 9336 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: cosmetic typo fix In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9337 ) Change subject: BSSAP_Adapter: cosmetic typo fix ...................................................................... BSSAP_Adapter: cosmetic typo fix Change-Id: I2aba2316f12c2f752d58e58687c1ef529b983b96 --- M library/BSSAP_Adapter.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index b46bb3e..7f03f33 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -153,7 +153,7 @@ T.start; //T.timeout; log("Connecting BSSMAP Emulation to SCCP_SP_PORT and starting emulation"); - /* connect BSSNAP component to upposer side of SCCP */ + /* connect BSSNAP component to upper side of SCCP */ connect(ba.vc_BSSMAP:BSSAP, ba.vc_SCCP:SCCP_SP_PORT); if (cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER or cfg.transport == BSSAP_TRANSPORT_SCCPlite_CLIENT) { -- To view, visit https://gerrit.osmocom.org/9337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2aba2316f12c2f752d58e58687c1ef529b983b96 Gerrit-Change-Number: 9337 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:33:27 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:33:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9338 ) Change subject: BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() ...................................................................... BSSAP_Adapter: Split f_bssap_start() from f_bssap_init() In non-handler mode, the SCCP emulation is currently started before there's a user registered to SCCP_SP_PORT. If the first BSSMAP package arrives from the network, then the SCCP_Emulation will crash as it cannot deliver the resulting SCCP user primitive to the user. Let's split start from initialization, so user code can still register something to SCCP_SP_PORT before starting SCCP_Emulation. Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774 --- M bsc/BSC_Tests.ttcn M library/BSSAP_Adapter.ttcn M msc/MSC_Tests.ttcn 3 files changed, 7 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 936544b..906e214 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -312,6 +312,8 @@ connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT); f_legacy_bssap_reset(); } + f_bssap_start(g_bssap); + f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); f_init_mgcp("VirtMSC"); diff --git a/library/BSSAP_Adapter.ttcn b/library/BSSAP_Adapter.ttcn index 7f03f33..e50487d 100644 --- a/library/BSSAP_Adapter.ttcn +++ b/library/BSSAP_Adapter.ttcn @@ -164,9 +164,12 @@ ba.vc_BSSMAP.start(BSSMAP_Emulation.main(valueof(ops), "")); } - ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); } +function f_bssap_start(inout BSSAP_Adapter ba) { + ba.vc_SCCP.start(SCCPStart(ba.sccp_pars)); +} + } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 56ac3d3..f843839 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -228,6 +228,7 @@ for (var integer i := 0; i < num_bsc; i := i + 1) { if (isbound(mp_bssap_cfg[i])) { f_bssap_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), BSC_BssmapOps); + f_bssap_start(g_bssap[i]); } else { setverdict(fail, "missing BSSAP configuration"); } -- To view, visit https://gerrit.osmocom.org/9338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I55c94f18531bb7e5369500dc90f4b0ff3a420774 Gerrit-Change-Number: 9338 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:35:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:35:33 +0000 Subject: Change in libosmocore[master]: add gsm0808_cell_id_to_list() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9333 ) Change subject: add gsm0808_cell_id_to_list() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibf746ac60b1b1e920baf494b396658a5ceabd788 Gerrit-Change-Number: 9333 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:35:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:37:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:37:10 +0000 Subject: Change in libosmocore[master]: add support for gsm0808 HANDOVER REQUIRED message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9334 ) Change subject: add support for gsm0808 HANDOVER REQUIRED message ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9334/1/include/osmocom/gsm/gsm0808.h File include/osmocom/gsm/gsm0808.h: https://gerrit.osmocom.org/#/c/9334/1/include/osmocom/gsm/gsm0808.h at 109 PS1, Line 109: ws -- To view, visit https://gerrit.osmocom.org/9334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 Gerrit-Change-Number: 9334 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:37:10 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:37:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:37:40 +0000 Subject: Change in libosmocore[master]: add gsm0808_create_handover_request_ack() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9335 ) Change subject: add gsm0808_create_handover_request_ack() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I692292a06c7d66004404560dc4ed933ca9107f9b Gerrit-Change-Number: 9335 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 15:37:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:38:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:38:15 +0000 Subject: Change in osmo-bsc[master]: remove remaining bits of osmo-bsc_nat Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9339 Change subject: remove remaining bits of osmo-bsc_nat ...................................................................... remove remaining bits of osmo-bsc_nat osmo-bsc_nat is too heavily tied into legacy SCCPlite code, as it is not using libosmo-sigtran/osmo_ss7 so far. It's also full of customer-specific code and it's shared use of some libbsc code here has been complicating osmo-bsc development. The current plan is to continue to use osmo-bsc_nat from openbsc.git for those legacy users that need it, and not use osmo-bsc_nat in new 3GPP AoIP setups. Should we ever get a strong demand for an AoIP based bsc_nat, we can still revisit this later. Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 --- M configure.ac M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_nat.h D include/osmocom/bsc/bsc_nat_callstats.h D include/osmocom/bsc/bsc_nat_sccp.h D include/osmocom/bsc/nat_rewrite_trie.h M src/libfilter/bsc_msg_acc.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_msc.c D src/osmo-bsc_nat/Makefile.am D src/osmo-bsc_nat/bsc_filter.c D src/osmo-bsc_nat/bsc_mgcp_utils.c D src/osmo-bsc_nat/bsc_nat.c D src/osmo-bsc_nat/bsc_nat_ctrl.c D src/osmo-bsc_nat/bsc_nat_filter.c D src/osmo-bsc_nat/bsc_nat_rewrite.c D src/osmo-bsc_nat/bsc_nat_rewrite_trie.c D src/osmo-bsc_nat/bsc_nat_utils.c D src/osmo-bsc_nat/bsc_nat_vty.c D src/osmo-bsc_nat/bsc_sccp.c D src/osmo-bsc_nat/bsc_ussd.c M tests/Makefile.am D tests/bsc-nat-trie/Makefile.am D tests/bsc-nat-trie/bsc_nat_trie_test.c D tests/bsc-nat-trie/bsc_nat_trie_test.ok D tests/bsc-nat-trie/prefixes.csv D tests/bsc-nat/Makefile.am D tests/bsc-nat/barr.cfg D tests/bsc-nat/barr_dup.cfg D tests/bsc-nat/bsc_data.c D tests/bsc-nat/bsc_nat_test.c D tests/bsc-nat/bsc_nat_test.ok D tests/bsc-nat/prefixes.csv M tests/testsuite.at 34 files changed, 2 insertions(+), 10,373 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/9339/1 -- To view, visit https://gerrit.osmocom.org/9339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 Gerrit-Change-Number: 9339 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 15:44:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 15:44:56 +0000 Subject: Change in osmo-bsc[master]: remove remaining bits of osmo-bsc_nat In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9339 to look at the new patch set (#2). Change subject: remove remaining bits of osmo-bsc_nat ...................................................................... remove remaining bits of osmo-bsc_nat osmo-bsc_nat is too heavily tied into legacy SCCPlite code, as it is not using libosmo-sigtran/osmo_ss7 so far. It's also full of customer-specific code and it's shared use of some libbsc code here has been complicating osmo-bsc development. The current plan is to continue to use osmo-bsc_nat from openbsc.git for those legacy users that need it, and not use osmo-bsc_nat in new 3GPP AoIP setups. Should we ever get a strong demand for an AoIP based bsc_nat, we can still revisit this later. Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 --- M configure.ac M debian/control M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_nat.h D include/osmocom/bsc/bsc_nat_callstats.h D include/osmocom/bsc/bsc_nat_sccp.h D include/osmocom/bsc/nat_rewrite_trie.h M src/libfilter/bsc_msg_acc.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_msc.c D src/osmo-bsc_nat/Makefile.am D src/osmo-bsc_nat/bsc_filter.c D src/osmo-bsc_nat/bsc_mgcp_utils.c D src/osmo-bsc_nat/bsc_nat.c D src/osmo-bsc_nat/bsc_nat_ctrl.c D src/osmo-bsc_nat/bsc_nat_filter.c D src/osmo-bsc_nat/bsc_nat_rewrite.c D src/osmo-bsc_nat/bsc_nat_rewrite_trie.c D src/osmo-bsc_nat/bsc_nat_utils.c D src/osmo-bsc_nat/bsc_nat_vty.c D src/osmo-bsc_nat/bsc_sccp.c D src/osmo-bsc_nat/bsc_ussd.c M tests/Makefile.am D tests/bsc-nat-trie/Makefile.am D tests/bsc-nat-trie/bsc_nat_trie_test.c D tests/bsc-nat-trie/bsc_nat_trie_test.ok D tests/bsc-nat-trie/prefixes.csv D tests/bsc-nat/Makefile.am D tests/bsc-nat/barr.cfg D tests/bsc-nat/barr_dup.cfg D tests/bsc-nat/bsc_data.c D tests/bsc-nat/bsc_nat_test.c D tests/bsc-nat/bsc_nat_test.ok D tests/bsc-nat/prefixes.csv M tests/testsuite.at M tests/vty_test_runner.py 36 files changed, 2 insertions(+), 10,726 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/9339/2 -- To view, visit https://gerrit.osmocom.org/9339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 Gerrit-Change-Number: 9339 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:02:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:02:13 +0000 Subject: Change in osmo-bsc[master]: remove remaining bits of osmo-bsc_nat In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9339 to look at the new patch set (#3). Change subject: remove remaining bits of osmo-bsc_nat ...................................................................... remove remaining bits of osmo-bsc_nat osmo-bsc_nat is too heavily tied into legacy SCCPlite code, as it is not using libosmo-sigtran/osmo_ss7 so far. It's also full of customer-specific code and it's shared use of some libbsc code here has been complicating osmo-bsc development. The current plan is to continue to use osmo-bsc_nat from openbsc.git for those legacy users that need it, and not use osmo-bsc_nat in new 3GPP AoIP setups. Should we ever get a strong demand for an AoIP based bsc_nat, we can still revisit this later. Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 --- M configure.ac M debian/control D doc/examples/osmo-bsc_nat/black-list.cfg D doc/examples/osmo-bsc_nat/bscs.cfg D doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_nat.h D include/osmocom/bsc/bsc_nat_callstats.h D include/osmocom/bsc/bsc_nat_sccp.h D include/osmocom/bsc/nat_rewrite_trie.h M src/libfilter/bsc_msg_acc.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_msc.c D src/osmo-bsc_nat/Makefile.am D src/osmo-bsc_nat/bsc_filter.c D src/osmo-bsc_nat/bsc_mgcp_utils.c D src/osmo-bsc_nat/bsc_nat.c D src/osmo-bsc_nat/bsc_nat_ctrl.c D src/osmo-bsc_nat/bsc_nat_filter.c D src/osmo-bsc_nat/bsc_nat_rewrite.c D src/osmo-bsc_nat/bsc_nat_rewrite_trie.c D src/osmo-bsc_nat/bsc_nat_utils.c D src/osmo-bsc_nat/bsc_nat_vty.c D src/osmo-bsc_nat/bsc_sccp.c D src/osmo-bsc_nat/bsc_ussd.c M tests/Makefile.am D tests/bsc-nat-trie/Makefile.am D tests/bsc-nat-trie/bsc_nat_trie_test.c D tests/bsc-nat-trie/bsc_nat_trie_test.ok D tests/bsc-nat-trie/prefixes.csv D tests/bsc-nat/Makefile.am D tests/bsc-nat/barr.cfg D tests/bsc-nat/barr_dup.cfg D tests/bsc-nat/bsc_data.c D tests/bsc-nat/bsc_nat_test.c D tests/bsc-nat/bsc_nat_test.ok D tests/bsc-nat/prefixes.csv M tests/testsuite.at M tests/vty_test_runner.py 39 files changed, 2 insertions(+), 10,806 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/9339/3 -- To view, visit https://gerrit.osmocom.org/9339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 Gerrit-Change-Number: 9339 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:02:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:02:14 +0000 Subject: Change in osmo-bsc[master]: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9340 Change subject: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL ...................................................................... Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL The bsc_msc_connection dates back to the old pre-libosmo-sigtran days, and 90% of the field members weren't used at all (even the new sigtran specific ones!). Let's merge what remains into struct bsc_msc_data. As a side effect, the already dysfunctional "dest A.B.C.D" VTY command has been removed from the MSC node. There's quite a bit of fall-out in the CTRL interface, which was the code with strongest ties to bsc_msc_connection. This was resolved by properly porting CTRL handling over to libosmo-sigtran, meaning that an IPA/SCCPlite connected MSC can now again send CTRL GET/SET commands, and can also receive those selective few TRAPs that old osmo-bsc-sccplite also sent to its MSC[s]. Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Related: OS#2012 --- M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_msc.h M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/osmo_bsc_sigtran.h M src/libbsc/Makefile.am D src/libbsc/bsc_msc.c M src/libbsc/bsc_subscr_conn_fsm.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c M tests/bssap/bssap_test.c 16 files changed, 179 insertions(+), 509 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/9340/1 diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 80f9b01..bae13f0 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -5,7 +5,6 @@ abis_rsl.h \ acc_ramp.h \ arfcn_range_encode.h \ - bsc_msc.h \ bsc_msg_filter.h \ bsc_rll.h \ bsc_subscriber.h \ diff --git a/include/osmocom/bsc/bsc_msc.h b/include/osmocom/bsc/bsc_msc.h deleted file mode 100644 index ceaea53..0000000 --- a/include/osmocom/bsc/bsc_msc.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Routines to talk to the MSC using the IPA Protocol */ -/* - * (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#ifndef BSC_MSC_H -#define BSC_MSC_H - -#include -#include -#include -#include - -#include - -struct bsc_msc_dest { - struct llist_head list; - - char *ip; - int port; - int dscp; -}; - - -struct bsc_msc_connection { - /* FIXME: Remove stuff that is no longer needed! */ - struct osmo_wqueue write_queue; - int is_connected; - int is_authenticated; - int first_contact; - - struct llist_head *dests; - - const char *name; - - void (*connection_loss) (struct bsc_msc_connection *); - void (*connected) (struct bsc_msc_connection *); - struct osmo_timer_list reconnect_timer; - struct osmo_timer_list timeout_timer; - - struct msgb *pending_msg; - - /* Sigtran connection data */ - struct osmo_sccp_instance *sccp; - struct osmo_sccp_user *sccp_user; - struct osmo_sccp_addr g_calling_addr; - struct osmo_sccp_addr g_called_addr; - struct a_reset_ctx *reset; - - int conn_id_counter; -}; - -struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dest); -int bsc_msc_connect(struct bsc_msc_connection *); -void bsc_msc_schedule_connect(struct bsc_msc_connection *); - -void bsc_msc_lost(struct bsc_msc_connection *); - -struct msgb *bsc_msc_id_get_resp(int fixed, const char *token, const uint8_t *res, int len); - -#endif diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 2ace178..baa58e7 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -3,6 +3,7 @@ * * (C) 2010-2015 by Holger Hans Peter Freyther * (C) 2010-2015 by On-Waves + * (C) 2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -27,7 +28,6 @@ #ifndef _OSMO_MSC_DATA_H #define _OSMO_MSC_DATA_H -#include "bsc_msc.h" #include "debug.h" #include @@ -75,26 +75,20 @@ /* Connection data */ - struct bsc_msc_connection *msc_con; struct osmo_plmn_id core_plmn; int core_lac; int core_ci; int rtp_base; + bool is_authenticated; /* audio codecs */ struct gsm48_multi_rate_conf amr_conf; struct gsm_audio_support **audio_support; int audio_length; - /* destinations */ - struct llist_head dests; - /* ussd welcome text */ char *ussd_welcome_txt; - /* mgcp agent */ - struct osmo_wqueue mgcp_agent; - int nr; /* ussd msc connection lost text */ diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h index 80d4f5b..bd8b063 100644 --- a/include/osmocom/bsc/osmo_bsc_sigtran.h +++ b/include/osmocom/bsc/osmo_bsc_sigtran.h @@ -41,3 +41,6 @@ /* Send reset-ack to MSC */ void osmo_bsc_sigtran_tx_reset_ack(const struct bsc_msc_data *msc); + +/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg); diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 744278b..d215e14 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -47,7 +47,7 @@ system_information.c \ e1_config.c \ bsc_api.c \ - bsc_msc.c bsc_vty.c \ + bsc_vty.c \ gsm_04_08_utils.c \ gsm_04_80_utils.c \ bsc_init.c \ diff --git a/src/libbsc/bsc_msc.c b/src/libbsc/bsc_msc.c deleted file mode 100644 index 648b3e6..0000000 --- a/src/libbsc/bsc_msc.c +++ /dev/null @@ -1,320 +0,0 @@ -/* Routines to talk to the MSC using the IPA Protocol */ -/* - * (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -static void connection_loss(struct bsc_msc_connection *con) -{ - struct osmo_fd *fd; - - fd = &con->write_queue.bfd; - - if (con->pending_msg) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) dropping incomplete message.\n", con->name); - msgb_free(con->pending_msg); - con->pending_msg = NULL; - } - - close(fd->fd); - fd->fd = -1; - fd->cb = osmo_wqueue_bfd_cb; - fd->when = 0; - - con->is_connected = 0; - con->first_contact = 0; - con->connection_loss(con); -} - -static void msc_con_timeout(void *_con) -{ - struct bsc_msc_connection *con = _con; - - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Connection timeout.\n", con->name); - bsc_msc_lost(con); -} - -/* called in the case of a non blocking connect */ -static int msc_connection_connect(struct osmo_fd *fd, unsigned int what) -{ - int rc; - int val; - struct bsc_msc_connection *con; - struct osmo_wqueue *queue; - - socklen_t len = sizeof(val); - - queue = container_of(fd, struct osmo_wqueue, bfd); - con = container_of(queue, struct bsc_msc_connection, write_queue); - - if ((what & BSC_FD_WRITE) == 0) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Callback but not writable.\n", con->name); - return -1; - } - - /* From here on we will either be connected or reconnect */ - osmo_timer_del(&con->timeout_timer); - - /* check the socket state */ - rc = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &val, &len); - if (rc != 0) { - LOGP(DMSC, LOGL_ERROR, - "getsockopt for the MSC(%s) socket failed.\n", con->name); - goto error; - } - if (val != 0) { - LOGP(DMSC, LOGL_ERROR, - "Not connected to the MSC(%s): %d\n", - con->name, val); - goto error; - } - - - /* go to full operation */ - fd->cb = osmo_wqueue_bfd_cb; - fd->when = BSC_FD_READ | BSC_FD_EXCEPT; - - con->is_connected = 1; - LOGP(DMSC, LOGL_NOTICE, - "(Re)Connected to the MSC(%s).\n", con->name); - if (con->connected) - con->connected(con); - return 0; - -error: - osmo_fd_unregister(fd); - connection_loss(con); - return -1; -} -static void setnonblocking(struct osmo_fd *fd) -{ - int flags; - - flags = fcntl(fd->fd, F_GETFL); - if (flags < 0) { - perror("fcntl get failed"); - close(fd->fd); - fd->fd = -1; - return; - } - - flags |= O_NONBLOCK; - flags = fcntl(fd->fd, F_SETFL, flags); - if (flags < 0) { - perror("fcntl get failed"); - close(fd->fd); - fd->fd = -1; - return; - } -} - -int bsc_msc_connect(struct bsc_msc_connection *con) -{ - struct bsc_msc_dest *dest; - struct osmo_fd *fd; - struct sockaddr_in sin; - int on = 1, ret; - - if (llist_empty(con->dests)) { - LOGP(DMSC, LOGL_ERROR, - "No MSC(%s) connections configured.\n", - con->name); - connection_loss(con); - return -1; - } - - /* TODO: Why are we not using the libosmocore soecket - * abstraction, or libosmo-netif? */ - - /* move to the next connection */ - dest = (struct bsc_msc_dest *) con->dests->next; - llist_del(&dest->list); - llist_add_tail(&dest->list, con->dests); - - LOGP(DMSC, LOGL_NOTICE, - "Attempting to connect MSC(%s) at %s:%d\n", - con->name, dest->ip, dest->port); - - con->is_connected = 0; - - msgb_free(con->pending_msg); - con->pending_msg = NULL; - - fd = &con->write_queue.bfd; - fd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - fd->priv_nr = 1; - - if (fd->fd < 0) { - perror("Creating TCP socket failed"); - return fd->fd; - } - - /* make it non blocking */ - setnonblocking(fd); - - /* set the socket priority */ - ret = setsockopt(fd->fd, IPPROTO_IP, IP_TOS, - &dest->dscp, sizeof(dest->dscp)); - if (ret != 0) - LOGP(DMSC, LOGL_ERROR, - "Failed to set DSCP to %d on MSC(%s). %s\n", - dest->dscp, con->name, strerror(errno)); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_port = htons(dest->port); - inet_aton(dest->ip, &sin.sin_addr); - - ret = setsockopt(fd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret != 0) - LOGP(DMSC, LOGL_ERROR, - "Failed to set SO_REUSEADDR socket option\n"); - ret = connect(fd->fd, (struct sockaddr *) &sin, sizeof(sin)); - - if (ret == -1 && errno == EINPROGRESS) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Connection in progress\n", con->name); - fd->when = BSC_FD_WRITE; - fd->cb = msc_connection_connect; - osmo_timer_setup(&con->timeout_timer, msc_con_timeout, con); - osmo_timer_schedule(&con->timeout_timer, 20, 0); - } else if (ret < 0) { - perror("Connection failed"); - connection_loss(con); - return ret; - } else { - fd->when = BSC_FD_READ | BSC_FD_EXCEPT; - fd->cb = osmo_wqueue_bfd_cb; - con->is_connected = 1; - if (con->connected) - con->connected(con); - } - - ret = osmo_fd_register(fd); - if (ret < 0) { - perror("Registering the fd failed"); - close(fd->fd); - return ret; - } - - return ret; -} - -struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dests) -{ - struct bsc_msc_connection *con; - - con = talloc_zero(NULL, struct bsc_msc_connection); - if (!con) { - LOGP(DMSC, LOGL_FATAL, "Failed to create the MSC connection.\n"); - return NULL; - } - - con->dests = dests; - con->write_queue.bfd.fd = -1; - con->name = ""; - osmo_wqueue_init(&con->write_queue, 100); - return con; -} - -void bsc_msc_lost(struct bsc_msc_connection *con) -{ - osmo_wqueue_clear(&con->write_queue); - osmo_timer_del(&con->timeout_timer); - osmo_timer_del(&con->reconnect_timer); - - if (con->write_queue.bfd.fd >= 0) - osmo_fd_unregister(&con->write_queue.bfd); - connection_loss(con); -} - -static void reconnect_msc(void *_msc) -{ - struct bsc_msc_connection *con = _msc; - - LOGP(DMSC, LOGL_NOTICE, - "Attempting to reconnect to the MSC(%s).\n", con->name); - bsc_msc_connect(con); -} - -void bsc_msc_schedule_connect(struct bsc_msc_connection *con) -{ - LOGP(DMSC, LOGL_NOTICE, - "Attempting to reconnect to the MSC(%s)\n", con->name); - osmo_timer_setup(&con->reconnect_timer, reconnect_msc, con); - osmo_timer_schedule(&con->reconnect_timer, 5, 0); -} - -struct msgb *bsc_msc_id_get_resp(int fixed, const char *token, const uint8_t *res, int len) -{ - struct msgb *msg; - - if (!token) { - LOGP(DMSC, LOGL_ERROR, "No token specified.\n"); - return NULL; - } - - msg = msgb_alloc_headroom(4096, 128, "id resp"); - if (!msg) { - LOGP(DMSC, LOGL_ERROR, "Failed to create the message.\n"); - return NULL; - } - - /* - * The situation is bizarre. The encoding doesn't follow the - * TLV structure. It is more like a LV and old versions had - * it wrong but we want new versions to old servers so we - * introduce the quirk here. - */ - msg->l2h = msgb_v_put(msg, IPAC_MSGT_ID_RESP); - if (fixed) { - msgb_put_u8(msg, 0); - msgb_put_u8(msg, strlen(token) + 2); - msgb_tv_fixed_put(msg, IPAC_IDTAG_UNITNAME, strlen(token) + 1, (uint8_t *) token); - if (len > 0) { - msgb_put_u8(msg, 0); - msgb_put_u8(msg, len + 1); - msgb_tv_fixed_put(msg, 0x24, len, res); - } - } else { - msgb_l16tv_put(msg, strlen(token) + 1, - IPAC_IDTAG_UNITNAME, (uint8_t *) token); - } - - return msg; -} diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 54224f7..89ac482 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c index 120169b..852067e 100644 --- a/src/libfilter/bsc_msg_filter.c +++ b/src/libfilter/bsc_msg_filter.c @@ -23,7 +23,6 @@ #include -#include #include #include #include diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index 8c16bde..8081ea4 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 5f88b85..471f9d0 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -30,30 +30,126 @@ #include #include -#include + +#include + +#include +#include #include #include #include #include -void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_connection *msc_con) +extern struct gsm_network *bsc_gsmnet; + +/* Obtain SS7 application server currently handling given MSC (DPC) */ +static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) +{ + struct osmo_ss7_route *rt; + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(msc->a.sccp); + rt = osmo_ss7_route_lookup(ss7, msc->a.msc_addr.pc); + if (!rt) + return NULL; + return rt->dest.as; +} + + +/* Encode a CTRL command and send it to the given ASP + * \param[in] asp ASP through which we shall send the encoded message + * \param[in] cmd decoded CTRL command to be encoded and sent. Ownership is *NOT* + * transferred, to permit caller to send the same CMD to several ASPs. + * Caller must hence free 'cmd' itself. + * \returns 0 on success; negative on error */ +static int sccplite_asp_ctrl_cmd_send(struct osmo_ss7_asp *asp, struct ctrl_cmd *cmd) +{ + /* this is basically like libosmoctrl:ctrl_cmd_send(), not for a dedicated + * CTRL connection but for the CTRL piggy-back on the IPA/SCCPlite link */ + struct msgb *msg; + + /* don't attempt to send CTRL on a non-SCCPlite ASP */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + return 0; + + msg = ctrl_cmd_make(cmd); + if (!msg) + return -1; + + ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); + ipa_prepend_header(msg, IPAC_PROTO_OSMO); + + return osmo_ss7_asp_send(asp, msg); +} + +/* Ownership of 'cmd' is *NOT* transferred, to permit caller to send the same CMD to several ASPs. + * Caller must hence free 'cmd' itself. */ +static int sccplite_msc_ctrl_cmd_send(struct bsc_msc_data *msc, struct ctrl_cmd *cmd) +{ + struct osmo_ss7_as *as; + struct osmo_ss7_asp *asp; + unsigned int i; + + as = msc_get_ss7_as(msc); + if (!as) + return -1; + + /* don't attempt to send CTRL on a non-SCCPlite AS */ + if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + return 0; + + /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + asp = as->cfg.asps[i]; + if (!asp) + continue; + /* FIXME: deal with multiple ASPs per AS */ + return sccplite_asp_ctrl_cmd_send(asp, cmd); + } + return -1; +} + +/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + struct ctrl_cmd *cmd; + int rc; + + /* caller has already ensured ipaccess_head + ipaccess_head_ext */ + OSMO_ASSERT(msg->l2h); + + /* prase raw (ASCII) CTRL command into ctrl_cmd */ + cmd = ctrl_cmd_parse2(asp, msg); + OSMO_ASSERT(cmd); + msgb_free(msg); + if (cmd->type == CTRL_TYPE_ERROR) + goto send_reply; + + /* handle the CTRL command */ + ctrl_cmd_handle(bsc_gsmnet->ctrl, cmd, bsc_gsmnet); + +send_reply: + rc = sccplite_asp_ctrl_cmd_send(asp, cmd); + talloc_free(cmd); + return rc; +} + + +void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_data *msc_data) { struct ctrl_cmd *trap; struct ctrl_handle *ctrl; - struct bsc_msc_data *msc_data; - msc_data = (struct bsc_msc_data *) msc_con->write_queue.bfd.data; ctrl = msc_data->network->ctrl; trap = ctrl_cmd_trap(cmd); if (!trap) { + LOGP(DCTRL, LOGL_ERROR, "Failed to create trap.\n"); return; } ctrl_cmd_send_to_all(ctrl, trap); - ctrl_cmd_send(&msc_con->write_queue, trap); + sccplite_msc_ctrl_cmd_send(msc_data, trap); talloc_free(trap); } @@ -62,15 +158,18 @@ static int get_msc_connection_status(struct ctrl_cmd *cmd, void *data) { struct bsc_msc_data *msc = (struct bsc_msc_data *)cmd->node; + struct osmo_ss7_as *as; if (msc == NULL) { cmd->reply = "msc not found"; return CTRL_CMD_ERROR; } + as = msc_get_ss7_as(msc); + if (!as) { + cmd->reply = "AS not found for MSC"; + return CTRL_CMD_ERROR; + } - if (msc->msc_con->is_connected) - cmd->reply = "connected"; - else - cmd->reply = "disconnected"; + cmd->reply = talloc_strdup(cmd, osmo_fsm_inst_state_name(as->fi)); return CTRL_CMD_REPLY; } @@ -80,14 +179,15 @@ static int get_msc0_connection_status(struct ctrl_cmd *cmd, void *data) { - struct gsm_network *gsmnet = data; - struct bsc_msc_data *msc = osmo_msc_data_find(gsmnet, 0); + struct bsc_msc_data *msc = osmo_msc_data_find(bsc_gsmnet, 0); + void *old_node = cmd->node; + int rc; - if (msc->msc_con->is_connected) - cmd->reply = "connected"; - else - cmd->reply = "disconnected"; - return CTRL_CMD_REPLY; + cmd->node = msc; + rc = get_msc_connection_status(cmd, data); + cmd->node = old_node; + + return rc; } static int msc_connection_status_trap_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -184,12 +284,12 @@ static int get_bts_loc(struct ctrl_cmd *cmd, void *data); -static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_connection *msc_con) +static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_data *msc) { struct ctrl_cmd *cmd; const char *oper, *admin, *policy; - cmd = ctrl_cmd_create(msc_con, CTRL_TYPE_TRAP); + cmd = ctrl_cmd_create(msc, CTRL_TYPE_TRAP); if (!cmd) { LOGP(DCTRL, LOGL_ERROR, "Failed to create TRAP command.\n"); return; @@ -213,7 +313,7 @@ osmo_mnc_name(bts->network->plmn.mnc, bts->network->plmn.mnc_3_digits)); - osmo_bsc_send_trap(cmd, msc_con); + osmo_bsc_send_trap(cmd, msc); talloc_free(cmd); } @@ -222,7 +322,7 @@ struct bsc_msc_data *msc; llist_for_each_entry(msc, &bts->network->bsc_data->mscs, entry) - generate_location_state_trap(bts, msc->msc_con); + generate_location_state_trap(bts, msc); } static int location_equal(struct bts_location *a, struct bts_location *b) @@ -537,7 +637,7 @@ trap->id = "0"; trap->variable = "inform-msc-v1"; trap->reply = talloc_strdup(trap, cmd->value); - ctrl_cmd_send(&msc->msc_con->write_queue, trap); + sccplite_msc_ctrl_cmd_send(msc, trap); talloc_free(trap); } @@ -625,7 +725,7 @@ net = msc->data->network; llist_for_each_entry(bts, &net->bts_list, list) - generate_location_state_trap(bts, msc->data->msc_con); + generate_location_state_trap(bts, msc->data); return 0; } diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 5f60989..0d0fc29 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -161,7 +161,7 @@ round_robin: llist_for_each_entry(msc, &bsc->mscs, entry) { - if (!msc->msc_con->is_authenticated) + if (!msc->is_authenticated) continue; if (!is_emerg && msc->type != MSC_CON_TYPE_NORMAL) continue; diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index db6bcdb..095a07a 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -248,8 +248,6 @@ extern int bsc_shutdown_net(struct gsm_network *net); static void signal_handler(int signal) { - struct bsc_msc_data *msc; - fprintf(stdout, "signal %u received\n", signal); switch (signal) { @@ -270,8 +268,6 @@ case SIGUSR2: if (!bsc_gsmnet->bsc_data) return; - llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) - bsc_msc_lost(msc->msc_con); break; default: break; diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 10f602a..e00c9ef 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -1,6 +1,6 @@ /* * Handle the connection to the MSC. This include ping/timeout/reconnect - * (C) 2008-2009 by Harald Welte + * (C) 2008-2018 by Harald Welte * (C) 2009-2015 by Holger Hans Peter Freyther * (C) 2009-2015 by On-Waves * All Rights Reserved @@ -41,19 +41,12 @@ int osmo_bsc_msc_init(struct bsc_msc_data *data) { - data->msc_con = bsc_msc_create(data, &data->dests); - if (!data->msc_con) { - LOGP(DMSC, LOGL_ERROR, "Creating the MSC network connection failed.\n"); - return -1; - } - /* FIXME: This is a leftover from the old architecture that used * sccp-lite with osmocom specific authentication. Since we now * changed to AoIP the connected status and the authentication * status is managed differently. However osmo_bsc_filter.c still * needs the flags to be set to one. See also: OS#3112 */ - data->msc_con->is_connected = 1; - data->msc_con->is_authenticated = 1; + data->is_authenticated = 1; return 0; } @@ -86,7 +79,6 @@ /* Init back pointer */ msc_data->network = net; - INIT_LLIST_HEAD(&msc_data->dests); msc_data->core_plmn = (struct osmo_plmn_id){ .mcc = GSM_MCC_MNC_INVALID, .mnc = GSM_MCC_MNC_INVALID, diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 2c3507d..c33124f 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -512,3 +513,37 @@ "A-interface: More than one invalid/inclomplete configuration detected, unable to revover - check config file!\n"); return -EINVAL; } + +/* this function receives all messages received on an ASP for a PPID / StreamID that + * libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP */ +int osmo_ss7_asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg) +{ + struct ipaccess_head *iph; + struct ipaccess_head_ext *iph_ext; + + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { + msgb_free(msg); + return 0; + } + + switch (ppid_mux) { + case IPAC_PROTO_OSMO: + if (msg->len < sizeof(*iph) + sizeof(*iph_ext)) { + LOGP(DMSC, LOGL_ERROR, "The message is too short.\n"); + msgb_free(msg); + return -EINVAL; + } + iph = (struct ipaccess_head *) msg->data; + iph_ext = (struct ipaccess_head_ext *) iph->data; + msg->l2h = iph_ext->data; + switch (iph_ext->proto) { + case IPAC_PROTO_EXT_CTRL: + return bsc_sccplite_rx_ctrl(asp, msg); + } + break; + default: + break; + } + msgb_free(msg); + return 0; /* OSMO_SS7_UNKNOWN? */ +} diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index bda89c1..d1a82ba 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -1,6 +1,7 @@ /* Osmo BSC VTY Configuration */ /* (C) 2009-2015 by Holger Hans Peter Freyther * (C) 2009-2014 by On-Waves + * (C) 2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -105,8 +106,6 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc) { - struct bsc_msc_dest *dest; - vty_out(vty, "msc %d%s", msc->nr, VTY_NEWLINE); if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) vty_out(vty, " core-mobile-network-code %s%s", @@ -154,10 +153,6 @@ } - llist_for_each_entry(dest, &msc->dests, list) - vty_out(vty, " dest %s %d %d%s", dest->ip, dest->port, - dest->dscp, VTY_NEWLINE); - vty_out(vty, " type %s%s", msc->type == MSC_CON_TYPE_NORMAL ? "normal" : "local", VTY_NEWLINE); vty_out(vty, " allow-emergency %s%s", msc->allow_emerg ? @@ -337,58 +332,6 @@ return CMD_ERR_INCOMPLETE; } -DEFUN(cfg_net_msc_dest, - cfg_net_msc_dest_cmd, - "dest A.B.C.D <1-65000> <0-255>", - "Add a destination to a MUX/MSC\n" - "IP Address\n" "Port\n" "DSCP\n") -{ - struct bsc_msc_dest *dest; - struct bsc_msc_data *data = bsc_msc_data(vty); - - dest = talloc_zero(osmo_bsc_data(vty), struct bsc_msc_dest); - if (!dest) { - vty_out(vty, "%%Failed to create structure.%s", VTY_NEWLINE); - return CMD_WARNING; - } - - dest->ip = talloc_strdup(dest, argv[0]); - if (!dest->ip) { - vty_out(vty, "%%Failed to copy dest ip.%s", VTY_NEWLINE); - talloc_free(dest); - return CMD_WARNING; - } - - dest->port = atoi(argv[1]); - dest->dscp = atoi(argv[2]); - llist_add_tail(&dest->list, &data->dests); - return CMD_SUCCESS; -} - -DEFUN(cfg_net_msc_no_dest, - cfg_net_msc_no_dest_cmd, - "no dest A.B.C.D <1-65000> <0-255>", - NO_STR "Remove a destination to a MUX/MSC\n" - "IP Address\n" "Port\n" "DSCP\n") -{ - struct bsc_msc_dest *dest, *tmp; - struct bsc_msc_data *data = bsc_msc_data(vty); - - int port = atoi(argv[1]); - int dscp = atoi(argv[2]); - - llist_for_each_entry_safe(dest, tmp, &data->dests, list) { - if (port != dest->port || dscp != dest->dscp - || strcmp(dest->ip, argv[0]) != 0) - continue; - - llist_del(&dest->list); - talloc_free(dest); - } - - return CMD_SUCCESS; -} - DEFUN(cfg_net_msc_welcome_ussd, cfg_net_msc_welcome_ussd_cmd, "bsc-welcome-text .TEXT", @@ -787,10 +730,12 @@ { struct bsc_msc_data *msc; llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) { - vty_out(vty, "MSC Nr: %d is connected: %d auth: %d.%s", - msc->nr, - msc->msc_con ? msc->msc_con->is_connected : -1, - msc->msc_con ? msc->msc_con->is_authenticated : -1, + vty_out(vty, "%d %s %s ", + msc->a.cs7_instance, + osmo_ss7_asp_protocol_name(msc->a.asp_proto), + osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr)); + vty_out(vty, "%s%s", + osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr), VTY_NEWLINE); } @@ -943,8 +888,6 @@ install_element(MSC_NODE, &cfg_net_bsc_ci_cmd); install_element(MSC_NODE, &cfg_net_bsc_rtp_base_cmd); install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd); - install_element(MSC_NODE, &cfg_net_msc_dest_cmd); - install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_no_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_lost_ussd_cmd); diff --git a/tests/bssap/bssap_test.c b/tests/bssap/bssap_test.c index 00bc64c..c9e7075 100644 --- a/tests/bssap/bssap_test.c +++ b/tests/bssap/bssap_test.c @@ -156,3 +156,7 @@ struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { OSMO_ASSERT(0); } + +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) { + OSMO_ASSERT(0); +} -- To view, visit https://gerrit.osmocom.org/9340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Gerrit-Change-Number: 9340 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:02:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:02:15 +0000 Subject: Change in osmo-bsc[master]: move 'extern struct gsm_network *bsc_gsmnet" to header file Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9341 Change subject: move 'extern struct gsm_network *bsc_gsmnet" to header file ...................................................................... move 'extern struct gsm_network *bsc_gsmnet" to header file It's not a good idea to keep extern declarations copied over half a dozen C files. Let's move it to a header. Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/abis_nm_vty.c M src/libbsc/abis_om2000_vty.c M src/libbsc/bsc_init.c M src/libbsc/bts_ipaccess_nanobts.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 8 files changed, 8 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/9341/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5ba4362..1cf79a5 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1350,6 +1350,8 @@ return 0; } +extern struct gsm_network *bsc_gsmnet; + enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid); const char *bts_gprs_mode_name(enum bts_gprs_mode mode); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c index 956d28b..3019eb8 100644 --- a/src/libbsc/abis_nm_vty.c +++ b/src/libbsc/abis_nm_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OML (Netowrk Management) */ -/* (C) 2009-2010 by Harald Welte +/* (C) 2009-2018 by Harald Welte * * All Rights Reserved * @@ -42,8 +42,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node oml_node = { OML_NODE, "%s(oml)# ", diff --git a/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c index b55a6c4..faf39c1 100644 --- a/src/libbsc/abis_om2000_vty.c +++ b/src/libbsc/abis_om2000_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OM2000 */ -/* (C) 2010-2011 by Harald Welte +/* (C) 2010-2018 by Harald Welte * * All Rights Reserved * @@ -40,8 +40,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node om2k_node = { OM2K_NODE, "%s(om2k)# ", diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 5b157c5..508a7f4 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -1,6 +1,6 @@ /* A hackish minimal BSC (+MSC +HLR) implementation */ -/* (C) 2008-2010 by Harald Welte +/* (C) 2008-2018 by Harald Welte * (C) 2009 by Holger Hans Peter Freyther * All Rights Reserved * @@ -42,9 +42,6 @@ #include #include -/* global pointer to the gsm network data structure */ -extern struct gsm_network *bsc_gsmnet; - /* Callback function for NACK on the OML NM */ static int oml_msg_nack(struct nm_nack_signal_data *nack) { diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index 823fd66..843f264 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -1,6 +1,6 @@ /* ip.access nanoBTS specific code */ -/* (C) 2009-2010 by Harald Welte +/* (C) 2009-2018 by Harald Welte * * All Rights Reserved * @@ -43,8 +43,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 471f9d0..698a00d 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -41,8 +41,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - /* Obtain SS7 application server currently handling given MSC (DPC) */ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index c33124f..608c3fb 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -1,5 +1,5 @@ /* (C) 2017 by sysmocom s.f.m.c. GmbH, Author: Philipp Maier - * (C) 2017 by Harald Welte + * (C) 2017-2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -34,13 +34,12 @@ #include #include #include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ static struct llist_head *msc_list; -extern struct gsm_network *bsc_gsmnet; - #define RESET_INTERVAL 1 /* sek */ #define SCCP_MSG_MAXSIZE 1024 #define CS7_POINTCODE_DEFAULT_OFFSET 2 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index d1a82ba..34080c0 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -38,8 +38,6 @@ #define IPA_STR "IP.ACCESS specific\n" -extern struct gsm_network *bsc_gsmnet; - static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) { return bsc_gsmnet->bsc_data; -- To view, visit https://gerrit.osmocom.org/9341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451 Gerrit-Change-Number: 9341 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:02:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:02:15 +0000 Subject: Change in osmo-bsc[master]: Re-introduce support for IPA-encapsulated MGCP Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9342 Change subject: Re-introduce support for IPA-encapsulated MGCP ...................................................................... Re-introduce support for IPA-encapsulated MGCP Old osmo-bsc-sccplite already supported this, but in the migration over to libosmo-sigtran and to real 3GPP AoIP, this functionality got lost. We now crate a UDP proxy socket. Any MGCP commands received via IPA from MSC (or rather: bsc_nat) are retransmitted to the MGW via UDP on this socket. Any responses back from the MGW received on the UDP socket are retransmitted back to MSC/bsc_nat as MGCP inside the IPA multiplex. Closes: OS#2536 Change-Id: I38ad8fa645c08900e0e1f1b4b96136bc6d96b3ab --- M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/osmo_bsc_sigtran.h M src/osmo-bsc/osmo_bsc_audio.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M tests/bssap/bssap_test.c 7 files changed, 161 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/42/9342/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index baa58e7..3918b71 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -31,6 +31,7 @@ #include "debug.h" #include +#include #include @@ -127,6 +128,15 @@ * BSSMAP RESET procedure */ struct osmo_fsm_inst *reset_fsm; } a; + /* Proxy between IPA/SCCPlite encapsulated MGCP and UDP */ + struct { + /* local (BSC) IP address to be used */ + char *local_addr; + /* local (BSC) UDP port to be usd to talk with MGW */ + uint16_t local_port; + /* UDP socket for proxying MGCP via SCCPlite/IPA */ + struct osmo_fd ofd; + } mgcp_ipa; }; /* diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h index bd8b063..b934d51 100644 --- a/include/osmocom/bsc/osmo_bsc_sigtran.h +++ b/include/osmocom/bsc/osmo_bsc_sigtran.h @@ -44,3 +44,12 @@ /* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg); + +/* receive + process a MGCP message from the piggy-back on the IPA/SCCPlite link */ +int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg); + +/* send a message via SCCPLite to given MSC */ +int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg); + +/* we received some data on the UDP proxy socket from the MGW. Pass it to MSC via IPA */ +int bsc_sccplite_mgcp_proxy_cb(struct osmo_fd *ofd, unsigned int what); diff --git a/src/osmo-bsc/osmo_bsc_audio.c b/src/osmo-bsc/osmo_bsc_audio.c index 8eef8d2..ede3939 100644 --- a/src/osmo-bsc/osmo_bsc_audio.c +++ b/src/osmo-bsc/osmo_bsc_audio.c @@ -3,6 +3,7 @@ * * (C) 2009-2010 by Holger Hans Peter Freyther * (C) 2009-2010 by On-Waves + * (C) 2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -28,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -96,3 +99,64 @@ osmo_signal_register_handler(SS_ABISIP, handle_abisip_signal, net); return 0; } + +/* Determine MSC based on the ASP over which the message was received */ +static struct bsc_msc_data *msc_from_asp(struct osmo_ss7_asp *asp) +{ + int msc_nr; + /* this is rather ugly, as we of course have MTP-level routing between + * the local SCCP user (BSC) and the AS/ASPs. However, for the most simple + * SCCPlite case, there is a 1:1 mapping between ASP and AS, and using + * the libosmo-sigtran "simple client", the names are "as[p]-clnt-msc-%u", + * as set in osmo_bsc_sigtran_init() */ + if (sscanf(asp->cfg.name, "asp-clnt-msc-%u", &msc_nr) != 1) { + LOGP(DMSC, LOGL_ERROR, "Cannot find to which MSC the ASP %s belongs\n", asp->cfg.name); + return NULL; + } + return osmo_msc_data_find(bsc_gsmnet, msc_nr); +} + +/* We received an IPA-encapsulated MGCP message from a MSC. Transfers msg ownership. */ +int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + struct bsc_msc_data *msc; + int rc; + + LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n", asp->cfg.name, msg->l2h); + msc = msc_from_asp(asp); + if (msc) { + /* we don't have a write queue here as we simply expect the socket buffers + * to be large enouhg to deal with whatever small/infrequent MGCP messages */ + rc = send(msc->mgcp_ipa.ofd.fd, msgb_l2(msg), msgb_l2len(msg), 0); + } else + rc = 0; + + msgb_free(msg); + return rc; +} + +/* we received some data on the UDP proxy socket from the MGW. Pass it to MSC via IPA */ +int bsc_sccplite_mgcp_proxy_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct bsc_msc_data *msc = ofd->data; + struct msgb *msg; + int rc; + + if (!(what & BSC_FD_READ)) + return 0; + + msg = msgb_alloc_headroom(1024, 16, "MGCP->IPA"); + OSMO_ASSERT(msg); + rc = recv(ofd->fd, msg->data, msgb_tailroom(msg), 0); + if (rc <= 0) { + LOGP(DMSC, LOGL_ERROR, "error receiving data from MGCP<-> IPA proxy UDP socket: " + "%s\n", strerror(errno)); + msgb_free(msg); + return rc; + } + msg->l2h = msgb_put(msg, rc); + LOGP(DMSC, LOGL_NOTICE, "Received MGCP on UDP proxy socket: %s\n", msg->l2h); + + ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD); + return bsc_sccplite_msc_send(msc, msg); +} diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 698a00d..6b7db8d 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -52,6 +52,39 @@ return rt->dest.as; } +static int _ss7_as_send(struct osmo_ss7_as *as, struct msgb *msg) +{ + struct osmo_ss7_asp *asp; + unsigned int i; + + /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + asp = as->cfg.asps[i]; + if (!asp) + continue; + /* FIXME: deal with multiple ASPs per AS */ + return osmo_ss7_asp_send(asp, msg); + } + msgb_free(msg); + return -1; +} + +int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg) +{ + struct osmo_ss7_as *as; + + as = msc_get_ss7_as(msc); + if (!as) { + msgb_free(msg); + return -1; + } + + /* don't attempt to send CTRL on a non-SCCPlite AS */ + if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + return 0; + + return _ss7_as_send(as, msg); +} /* Encode a CTRL command and send it to the given ASP * \param[in] asp ASP through which we shall send the encoded message @@ -83,30 +116,20 @@ * Caller must hence free 'cmd' itself. */ static int sccplite_msc_ctrl_cmd_send(struct bsc_msc_data *msc, struct ctrl_cmd *cmd) { - struct osmo_ss7_as *as; - struct osmo_ss7_asp *asp; - unsigned int i; + struct msgb *msg; - as = msc_get_ss7_as(msc); - if (!as) + msg = ctrl_cmd_make(cmd); + if (!msg) return -1; - /* don't attempt to send CTRL on a non-SCCPlite AS */ - if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) - return 0; + ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); + ipa_prepend_header(msg, IPAC_PROTO_OSMO); - /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (!asp) - continue; - /* FIXME: deal with multiple ASPs per AS */ - return sccplite_asp_ctrl_cmd_send(asp, cmd); - } - return -1; + return bsc_sccplite_msc_send(msc, msg); } -/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ +/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link. + * Transfers msg ownership. */ int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) { struct ctrl_cmd *cmd; diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e00c9ef..e20f92c 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -27,26 +27,49 @@ #include #include #include +#include #include #include +#include #include #include +#include + #include #include #include -int osmo_bsc_msc_init(struct bsc_msc_data *data) +int osmo_bsc_msc_init(struct bsc_msc_data *msc) { + struct gsm_network *net = msc->network; + uint16_t mgw_port; + int rc; + /* FIXME: This is a leftover from the old architecture that used * sccp-lite with osmocom specific authentication. Since we now * changed to AoIP the connected status and the authentication * status is managed differently. However osmo_bsc_filter.c still * needs the flags to be set to one. See also: OS#3112 */ - data->is_authenticated = 1; + msc->is_authenticated = 1; + + if (net->mgw.conf->remote_port == -1) + mgw_port = 2427; + else + mgw_port = net->mgw.conf->remote_port; + + rc = osmo_sock_init2_ofd(&msc->mgcp_ipa.ofd, AF_INET, SOCK_DGRAM, IPPROTO_UDP, + msc->mgcp_ipa.local_addr, msc->mgcp_ipa.local_port, + net->mgw.conf->remote_addr, mgw_port, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + if (rc < 0) { + LOGP(DMSC, LOGL_ERROR, "msc %u: Could not create/connect/bind MGCP proxy socket: %d\n", + msc->nr, rc); + return rc; + } return 0; } @@ -94,6 +117,10 @@ /* Defaults for the audio setup */ msc_data->amr_conf.m5_90 = 1; + osmo_fd_setup(&msc_data->mgcp_ipa.ofd, -1, BSC_FD_READ, &bsc_sccplite_mgcp_proxy_cb, msc_data, 0); + msc_data->mgcp_ipa.local_addr = talloc_strdup(msc_data, "0.0.0.0"); + msc_data->mgcp_ipa.local_port = 0; /* dynamic */ + return msc_data; } diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 608c3fb..85bf0f4 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -538,8 +538,12 @@ switch (iph_ext->proto) { case IPAC_PROTO_EXT_CTRL: return bsc_sccplite_rx_ctrl(asp, msg); + case IPAC_PROTO_EXT_MGCP: + return bsc_sccplite_rx_mgcp(asp, msg); } break; + case IPAC_PROTO_MGCP_OLD: + return bsc_sccplite_rx_mgcp(asp, msg); default: break; } diff --git a/tests/bssap/bssap_test.c b/tests/bssap/bssap_test.c index c9e7075..3754e08 100644 --- a/tests/bssap/bssap_test.c +++ b/tests/bssap/bssap_test.c @@ -160,3 +160,7 @@ int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) { OSMO_ASSERT(0); } + +int bsc_sccplite_rx_mgcp(struct osmo_ss7_asp *asp, struct msgb *msg) { + OSMO_ASSERT(0); +} -- To view, visit https://gerrit.osmocom.org/9342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I38ad8fa645c08900e0e1f1b4b96136bc6d96b3ab Gerrit-Change-Number: 9342 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:22:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:22:43 +0000 Subject: Change in osmo-bsc[master]: remove remaining bits of osmo-bsc_nat In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9339 ) Change subject: remove remaining bits of osmo-bsc_nat ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 Gerrit-Change-Number: 9339 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 16:22:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:22:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:22:50 +0000 Subject: Change in osmo-bsc[master]: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9340 ) Change subject: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Gerrit-Change-Number: 9340 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 16:22:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:22:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:22:55 +0000 Subject: Change in osmo-bsc[master]: move 'extern struct gsm_network *bsc_gsmnet" to header file In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9341 ) Change subject: move 'extern struct gsm_network *bsc_gsmnet" to header file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451 Gerrit-Change-Number: 9341 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 16:22:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 16:23:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 16:23:04 +0000 Subject: Change in osmo-bsc[master]: remove remaining bits of osmo-bsc_nat In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9339 ) Change subject: remove remaining bits of osmo-bsc_nat ...................................................................... remove remaining bits of osmo-bsc_nat osmo-bsc_nat is too heavily tied into legacy SCCPlite code, as it is not using libosmo-sigtran/osmo_ss7 so far. It's also full of customer-specific code and it's shared use of some libbsc code here has been complicating osmo-bsc development. The current plan is to continue to use osmo-bsc_nat from openbsc.git for those legacy users that need it, and not use osmo-bsc_nat in new 3GPP AoIP setups. Should we ever get a strong demand for an AoIP based bsc_nat, we can still revisit this later. Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 --- M configure.ac M debian/control D doc/examples/osmo-bsc_nat/black-list.cfg D doc/examples/osmo-bsc_nat/bscs.cfg D doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_nat.h D include/osmocom/bsc/bsc_nat_callstats.h D include/osmocom/bsc/bsc_nat_sccp.h D include/osmocom/bsc/nat_rewrite_trie.h M src/libfilter/bsc_msg_acc.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_msc.c D src/osmo-bsc_nat/Makefile.am D src/osmo-bsc_nat/bsc_filter.c D src/osmo-bsc_nat/bsc_mgcp_utils.c D src/osmo-bsc_nat/bsc_nat.c D src/osmo-bsc_nat/bsc_nat_ctrl.c D src/osmo-bsc_nat/bsc_nat_filter.c D src/osmo-bsc_nat/bsc_nat_rewrite.c D src/osmo-bsc_nat/bsc_nat_rewrite_trie.c D src/osmo-bsc_nat/bsc_nat_utils.c D src/osmo-bsc_nat/bsc_nat_vty.c D src/osmo-bsc_nat/bsc_sccp.c D src/osmo-bsc_nat/bsc_ussd.c M tests/Makefile.am D tests/bsc-nat-trie/Makefile.am D tests/bsc-nat-trie/bsc_nat_trie_test.c D tests/bsc-nat-trie/bsc_nat_trie_test.ok D tests/bsc-nat-trie/prefixes.csv D tests/bsc-nat/Makefile.am D tests/bsc-nat/barr.cfg D tests/bsc-nat/barr_dup.cfg D tests/bsc-nat/bsc_data.c D tests/bsc-nat/bsc_nat_test.c D tests/bsc-nat/bsc_nat_test.ok D tests/bsc-nat/prefixes.csv M tests/testsuite.at M tests/vty_test_runner.py 39 files changed, 2 insertions(+), 10,806 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/9339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia05dc76336a64a7f08962843b9a7cc19f2c83387 Gerrit-Change-Number: 9339 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 17:48:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 17:48:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix BSSMAP RESET in handler mode Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9343 Change subject: Fix BSSMAP RESET in handler mode ...................................................................... Fix BSSMAP RESET in handler mode This fixes I55c94f18531bb7e5369500dc90f4b0ff3a420774 which was merged a bit too fast, it seems. Change-Id: I42f663f47d38c9e0fd0c0148aacafbf0ecaf3448 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/9343/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 906e214..58f2704 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -307,12 +307,13 @@ * MSC-side BSSAP emulation */ if (handler_mode) { f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_BssmapOps); + f_bssap_start(g_bssap); } else { f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit); connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT); + f_bssap_start(g_bssap); f_legacy_bssap_reset(); } - f_bssap_start(g_bssap); f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/9343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I42f663f47d38c9e0fd0c0148aacafbf0ecaf3448 Gerrit-Change-Number: 9343 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 17:49:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 17:49:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix BSSMAP RESET in handler mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9343 ) Change subject: Fix BSSMAP RESET in handler mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I42f663f47d38c9e0fd0c0148aacafbf0ecaf3448 Gerrit-Change-Number: 9343 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 17:49:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 17:49:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 17:49:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: Fix BSSMAP RESET in handler mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9343 ) Change subject: Fix BSSMAP RESET in handler mode ...................................................................... Fix BSSMAP RESET in handler mode This fixes I55c94f18531bb7e5369500dc90f4b0ff3a420774 which was merged a bit too fast, it seems. Change-Id: I42f663f47d38c9e0fd0c0148aacafbf0ecaf3448 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 906e214..58f2704 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -307,12 +307,13 @@ * MSC-side BSSAP emulation */ if (handler_mode) { f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", MSC_BssmapOps); + f_bssap_start(g_bssap); } else { f_bssap_init(g_bssap, mp_bssap_cfg, "VirtMSC", omit); connect(self:BSSAP, g_bssap.vc_SCCP:SCCP_SP_PORT); + f_bssap_start(g_bssap); f_legacy_bssap_reset(); } - f_bssap_start(g_bssap); f_ipa_ctrl_start(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/9343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I42f663f47d38c9e0fd0c0148aacafbf0ecaf3448 Gerrit-Change-Number: 9343 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 18:18:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 18:18:28 +0000 Subject: Change in osmo-bsc[master]: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9340 to look at the new patch set (#2). Change subject: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL ...................................................................... Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL The bsc_msc_connection dates back to the old pre-libosmo-sigtran days, and 90% of the field members weren't used at all (even the new sigtran specific ones!). Let's merge what remains into struct bsc_msc_data. As a side effect, the already dysfunctional "dest A.B.C.D" VTY command has been removed from the MSC node. There's quite a bit of fall-out in the CTRL interface, which was the code with strongest ties to bsc_msc_connection. This was resolved by properly porting CTRL handling over to libosmo-sigtran, meaning that an IPA/SCCPlite connected MSC can now again send CTRL GET/SET commands, and can also receive those selective few TRAPs that old osmo-bsc-sccplite also sent to its MSC[s]. Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Related: OS#2012 --- M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_msc.h M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/osmo_bsc_sigtran.h M src/libbsc/Makefile.am D src/libbsc/bsc_msc.c M src/libbsc/bsc_subscr_conn_fsm.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c M tests/bssap/bssap_test.c 16 files changed, 182 insertions(+), 506 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/9340/2 -- To view, visit https://gerrit.osmocom.org/9340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Gerrit-Change-Number: 9340 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 18:24:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 18:24:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Handle ID_ACK event in BSC role Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9344 Change subject: RSL_Emulation: Handle ID_ACK event in BSC role ...................................................................... RSL_Emulation: Handle ID_ACK event in BSC role In I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 we introduced code that makes the IPA_Emulation code to emut an ASP_IPA_EVENT_ID_ACK [also] to the RSL port, irrespective of client/server status. However, RSL_Emulation only handled this event in the BTS role for BSC testing, but not in in the BSC role for BTS testing. Change-Id: I99a5c58ea8d1e74b2ad51aed23009af6322a1007 --- M library/RSL_Emulation.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/9344/1 diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 3ad062b..3634373 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -350,6 +350,7 @@ [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23))); } + [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { } [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_IMM_ASSIGN)) -> value rx_rsl { var GsmRrMessage rr; var OCT1 ra; -- To view, visit https://gerrit.osmocom.org/9344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I99a5c58ea8d1e74b2ad51aed23009af6322a1007 Gerrit-Change-Number: 9344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 18:25:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 18:25:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Handle ID_ACK event in BSC role In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9344 ) Change subject: RSL_Emulation: Handle ID_ACK event in BSC role ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I99a5c58ea8d1e74b2ad51aed23009af6322a1007 Gerrit-Change-Number: 9344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 18:25:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 18:25:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 18:25:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSL_Emulation: Handle ID_ACK event in BSC role In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9344 ) Change subject: RSL_Emulation: Handle ID_ACK event in BSC role ...................................................................... RSL_Emulation: Handle ID_ACK event in BSC role In I483ddd45c1cf631a5a9d8f862b6ca728b38bdc14 we introduced code that makes the IPA_Emulation code to emut an ASP_IPA_EVENT_ID_ACK [also] to the RSL port, irrespective of client/server status. However, RSL_Emulation only handled this event in the BTS role for BSC testing, but not in in the BSC role for BTS testing. Change-Id: I99a5c58ea8d1e74b2ad51aed23009af6322a1007 --- M library/RSL_Emulation.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 3ad062b..3634373 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -350,6 +350,7 @@ [bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23))); } + [not bts_role] IPA_PT.receive(ASP_IPA_Event:{up_down := ASP_IPA_EVENT_ID_ACK}) { } [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_IMM_ASSIGN)) -> value rx_rsl { var GsmRrMessage rr; var OCT1 ra; -- To view, visit https://gerrit.osmocom.org/9344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I99a5c58ea8d1e74b2ad51aed23009af6322a1007 Gerrit-Change-Number: 9344 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 18:28:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Sun, 27 May 2018 18:28:05 +0000 Subject: Change in osmo-bsc[master]: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9340 ) Change subject: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Gerrit-Change-Number: 9340 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 27 May 2018 18:28:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 20:04:28 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 27 May 2018 20:04:28 +0000 Subject: Change in libosmocore[master]: add support for gsm0808 HANDOVER REQUIRED message In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9334 to look at the new patch set (#2). Change subject: add support for gsm0808 HANDOVER REQUIRED message ...................................................................... add support for gsm0808 HANDOVER REQUIRED message Related: OS#2283 (inter-BSC Handover, BSC side, MO) Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 4 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/9334/2 -- To view, visit https://gerrit.osmocom.org/9334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 Gerrit-Change-Number: 9334 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 20:04:56 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 27 May 2018 20:04:56 +0000 Subject: Change in libosmocore[master]: add support for gsm0808 HANDOVER REQUIRED message In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9334 ) Change subject: add support for gsm0808 HANDOVER REQUIRED message ...................................................................... Patch Set 2: Code-Review+2 (fixed ws) -- To view, visit https://gerrit.osmocom.org/9334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 Gerrit-Change-Number: 9334 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Sun, 27 May 2018 20:04:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 20:26:21 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 27 May 2018 20:26:21 +0000 Subject: Change in libosmocore[master]: add gsm0808_cell_id_to_list() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/9333 ) Change subject: add gsm0808_cell_id_to_list() ...................................................................... add gsm0808_cell_id_to_list() The idea is to be able to add a gsm0808_cell_id to a gsm0808_cell_id_list2: first convert it to a list, then re-use gsm0808_cell_id_list_add(). It will be used by osmo-bsc to manage neighbor-BSS cell identifiers from VTY. Change-Id: Ibf746ac60b1b1e920baf494b396658a5ceabd788 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 33 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 24c139a..6555734 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -98,6 +98,7 @@ const uint8_t *elem, uint8_t len) OSMO_DEPRECATED("use gsm0808_dec_cell_id_list2 instead"); int gsm0808_cell_id_list_add(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id_list2 *src); +void gsm0808_cell_id_to_list(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id *src); uint8_t gsm0808_enc_cell_id(struct msgb *msg, const struct gsm0808_cell_id *ci); int gsm0808_dec_cell_id(struct gsm0808_cell_id *ci, const uint8_t *elem, uint8_t len); int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 2c659bb..080fc95 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -988,6 +988,37 @@ return added; } +/*! Convert a single Cell Identifier to a Cell Identifier List with one entry. + * \param dst[out] Overwrite this list. + * \param src[in] Set \a dst to contain exactly this item. + */ +void gsm0808_cell_id_to_list(struct gsm0808_cell_id_list2 *dst, const struct gsm0808_cell_id *src) +{ + if (!dst) + return; + if (!src) { + *dst = (struct gsm0808_cell_id_list2){ + .id_discr = CELL_IDENT_NO_CELL, + }; + return; + } + + *dst = (struct gsm0808_cell_id_list2){ + .id_discr = src->id_discr, + .id_list = { src->id }, + .id_list_len = 1, + }; + + switch (src->id_discr) { + case CELL_IDENT_NO_CELL: + case CELL_IDENT_BSS: + dst->id_list_len = 0; + break; + default: + break; + } +} + /*! Encode Cell Identifier IE (3GPP TS 48.008 3.2.2.17). * \param[out] msg Message Buffer to which IE is to be appended * \param[in] ci Cell ID to be encoded diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index c4b1b75..5a57429 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -177,6 +177,7 @@ gsm0808_dec_cell_id_list; gsm0808_dec_cell_id_list2; gsm0808_cell_id_list_add; +gsm0808_cell_id_to_list; gsm0808_enc_cell_id; gsm0808_dec_cell_id; gsm0808_cell_id_name; -- To view, visit https://gerrit.osmocom.org/9333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibf746ac60b1b1e920baf494b396658a5ceabd788 Gerrit-Change-Number: 9333 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 20:26:22 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 27 May 2018 20:26:22 +0000 Subject: Change in libosmocore[master]: add support for gsm0808 HANDOVER REQUIRED message In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/9334 ) Change subject: add support for gsm0808 HANDOVER REQUIRED message ...................................................................... add support for gsm0808 HANDOVER REQUIRED message Related: OS#2283 (inter-BSC Handover, BSC side, MO) Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 --- M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 4 files changed, 130 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 369d713..4f239e6 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -25,6 +25,7 @@ #include "tlv.h" #include +#include #include struct sockaddr_storage; @@ -80,6 +81,42 @@ const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); +/*! 3GPP TS 48.008 ?3.2.2.5.8 Old BSS to New BSS information */ +struct gsm0808_old_bss_to_new_bss_info { + bool extra_information_present; + struct { + bool prec; + bool lcs; + bool ue_prob; + } extra_information; + + bool current_channel_type_2_present; + struct { + uint8_t mode; + uint8_t field; + } current_channel_type_2; + + /* more items are defined in the spec and may be added later */ +}; + +/*! 3GPP TS 48.008 ?3.2.1.9 HANDOVER REQUIRED */ +struct gsm0808_handover_required { + uint16_t cause; + struct gsm0808_cell_id_list2 cil; + + bool current_channel_type_1_present; + uint8_t current_channel_type_1; + + bool speech_version_used_present; + uint8_t speech_version_used; + + bool old_bss_to_new_bss_info_present; + struct gsm0808_old_bss_to_new_bss_info old_bss_to_new_bss_info; + + /* more items are defined in the spec and may be added later */ +}; +struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index b699080..60b9681 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -295,6 +295,28 @@ GSM0808_IE_LAST_USED_EUTRAN_PLMN_ID = 0x95, }; +/* 3GPP TS 48.008 3.2.3 Signalling Field Element Coding */ +enum GSM0808_SIGNALLING_FIELD_ELEMENT_CODING { + GSM0808_FE_IE_EXTRA_INFORMATION = 0x01, /*< 3.2.3.1 */ + GSM0808_FE_IE_CURRENT_CHANNEL_TYPE_2 = 0x02, /*< 3.2.3.2 */ + GSM0808_FE_IE_TARGET_CELL_RADIO_INFORMATION = 0x03, /*< 3.2.3.3 */ + GSM0808_FE_IE_GPRS_SUSPEND_INFORMATION = 0x04, /*< 3.2.3.4 */ + GSM0808_FE_IE_MULTIRATE_CONFIGURATION_INFORMATION = 0x05, /*< 3.2.3.5 */ + GSM0808_FE_IE_DUAL_TRANSFER_MODE_INFORMATION = 0x06, /*< 3.2.3.6 */ + GSM0808_FE_IE_INTER_RAT_HANDOVER_INFO = 0x07, /*< 3.2.3.7 */ + GSM0808_FE_IE_CDMA2000_CAPABILITY_INFORMATION = 0x08, /*< 3.2.3.8 */ + GSM0808_FE_IE_DOWNLINK_CELL_LOAD_INFORMATION = 0x09, /*< 3.2.3.9 */ + GSM0808_FE_IE_UPLINK_CELL_LOAD_INFORMATION = 0x0a, /*< 3.2.3.10 */ + GSM0808_FE_IE_CELL_LOAD_INFORMATION_GROUP = 0x0b, /*< 3.2.3.11 */ + GSM0808_FE_IE_CELL_LOAD_INFORMATION = 0x0c, /*< 3.2.3.12 */ + GSM0808_FE_IE_PS_INDICATION = 0x0d, /*< 3.2.3.13 */ + GSM0808_FE_IE_DTM_HANDOVER_COMMAND_INDICATION = 0x0e, /*< 3.2.3.14 */ + GSM0808_FE_IE_D_RNTI = 0xfe, /*< 3.2.3.15 */ + GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION = 0x0f, /*< 3.2.3.16 */ + GSM0808_FE_IE_SOURCE_CELL_ID = 0x10, /*< 3.2.3.17 */ + GSM0808_FE_IE_IRAT_MEASUREMENT_CONFIGURATION_EXTENDED_E_ARFCNS = 0x11, /*< 3.2.3.18 */ +}; + /* GSM 08.08 3.2.2.5 Cause */ enum gsm0808_cause { GSM0808_CAUSE_RADIO_INTERFACE_MESSAGE_FAILURE = 0, diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 4743175..80f5e6c 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -609,6 +609,76 @@ return gsm0808_create_paging2(imsi, tmsi, &cil2, chan_needed); } +static uint8_t put_old_bss_to_new_bss_information(struct msgb *msg, + const struct gsm0808_old_bss_to_new_bss_info *i) +{ + uint8_t *old_tail; + uint8_t *tlv_len; + + msgb_put_u8(msg, GSM0808_IE_OLD_BSS_TO_NEW_BSS_INFORMATION); + tlv_len = msgb_put(msg, 1); + old_tail = msg->tail; + + if (i->extra_information_present) { + uint8_t val = 0; + if (i->extra_information.prec) + val |= 1 << 0; + if (i->extra_information.lcs) + val |= 1 << 1; + if (i->extra_information.ue_prob) + val |= 1 << 2; + msgb_tlv_put(msg, GSM0808_FE_IE_EXTRA_INFORMATION, 1, &val); + } + + if (i->current_channel_type_2_present) { + uint8_t val[2] = { + i->current_channel_type_2.mode, + i->current_channel_type_2.field, + }; + msgb_tlv_put(msg, GSM0808_FE_IE_CURRENT_CHANNEL_TYPE_2, 2, val); + } + + *tlv_len = (uint8_t) (msg->tail - old_tail); + return *tlv_len + 2; +} + +/*! Create BSSMAP HANDOVER REQUIRED message. + * \param[in] params All information to be encoded. + * \returns newly allocated msgb with BSSMAP REQUIRED message. */ +struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params) +{ + struct msgb *msg; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-REQUIRED"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_REQUIRED); + + /* Cause, 3.2.2.5 */ + msgb_tlv_put(msg, GSM0808_IE_CAUSE, params->cause & 0x80? 2 : 1, (const uint8_t*)¶ms->cause); + + /* Cell Identifier List, 3.2.2.27 */ + gsm0808_enc_cell_id_list2(msg, ¶ms->cil); + + /* Current Channel Type 1, 3.2.2.49 */ + if (params->current_channel_type_1_present) + msgb_tv_fixed_put(msg, GSM0808_IE_CURRENT_CHANNEL_TYPE_1, 1, ¶ms->current_channel_type_1); + + /* Speech Version (Used), 3.2.2.51 */ + if (params->speech_version_used_present) + msgb_tv_fixed_put(msg, GSM0808_IE_SPEECH_VERSION, 1, ¶ms->speech_version_used); + + if (params->old_bss_to_new_bss_info_present) + put_old_bss_to_new_bss_information(msg, ¶ms->old_bss_to_new_bss_info); + + /* pre-pend the header */ + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 5a57429..58a5bfe 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -161,6 +161,7 @@ gsm0808_create_reset; gsm0808_create_reset_ack; gsm0808_create_sapi_reject; +gsm0808_create_handover_required; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/9334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idb6dc3eab0282158a17091d97ed77c1e2e3eb3c2 Gerrit-Change-Number: 9334 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun May 27 20:26:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Sun, 27 May 2018 20:26:23 +0000 Subject: Change in libosmocore[master]: add gsm0808_create_handover_request_ack() In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/9335 ) Change subject: add gsm0808_create_handover_request_ack() ...................................................................... add gsm0808_create_handover_request_ack() Related: OS#2283 (inter-BSC Handover, BSC side, MT) Change-Id: I692292a06c7d66004404560dc4ed933ca9107f9b --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 30 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 4f239e6..5c03400 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -117,6 +117,10 @@ }; struct msgb *gsm0808_create_handover_required(const struct gsm0808_handover_required *params); +struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len, + uint8_t chosen_channel, uint8_t chosen_encr_alg, + uint8_t chosen_speech_version); + struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id); void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id); diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 80f5e6c..5af53ee 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -679,6 +679,31 @@ return msg; } +/*! Create BSSMAP HANDOVER REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 3.2.1.10. */ +struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len, + uint8_t chosen_channel, uint8_t chosen_encr_alg, + uint8_t chosen_speech_version) +{ + struct msgb *msg; + + msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-HANDOVER-ACCEPT-ACK"); + if (!msg) + return NULL; + + /* Message Type, 3.2.2.1 */ + msgb_v_put(msg, BSS_MAP_MSG_HANDOVER_RQST_ACKNOWLEDGE); + + /* Layer 3 Information, 3.2.2.24 */ + msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, l3_info_len, l3_info); + + msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, chosen_channel); + msgb_tv_put(msg, GSM0808_IE_CHOSEN_ENCR_ALG, chosen_encr_alg); + if (chosen_speech_version != 0) + msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, chosen_speech_version); + + return msg; +} + /*! Prepend a DTAP header to given Message Buffer * \param[in] msgb Message Buffer * \param[in] link_id Link Identifier */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 58a5bfe..3b9fbfd 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,6 +162,7 @@ gsm0808_create_reset_ack; gsm0808_create_sapi_reject; gsm0808_create_handover_required; +gsm0808_create_handover_request_ack; gsm0808_prepend_dtap_header; gsm0808_enc_aoip_trasp_addr; gsm0808_dec_aoip_trasp_addr; -- To view, visit https://gerrit.osmocom.org/9335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I692292a06c7d66004404560dc4ed933ca9107f9b Gerrit-Change-Number: 9335 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Sun May 27 20:47:33 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 May 2018 20:47:33 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-sgsn_=C2=BB_--disable?= =?UTF-8?Q?-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3253?= Message-ID: <1648527156.198.1527454053289.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 50.41 KB...] Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/tests' make[4]: Entering directory '/build/deps/libosmocore/tests' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory '/build/deps/libosmocore/tests' make[3]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Leaving directory '/build/deps/libosmocore/tests' make[2]: Entering directory '/build/deps/libosmocore' make[3]: Entering directory '/build/deps/libosmocore' /bin/mkdir -p '/build/deps/install/stow/libosmocore/bin' /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib/pkgconfig' /bin/mkdir -p '/build/deps/install/stow/libosmocore/include' /usr/bin/install -c -m 644 osmo-release.mk '/build/deps/install/stow/libosmocore/include' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc '/build/deps/install/stow/libosmocore/lib/pkgconfig' /usr/bin/install -c osmo-release.sh '/build/deps/install/stow/libosmocore/bin' make install-data-hook make[4]: Entering directory '/build/deps/libosmocore' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory '/build/deps/libosmocore' make[3]: Leaving directory '/build/deps/libosmocore' make[2]: Leaving directory '/build/deps/libosmocore' make[1]: Leaving directory '/build/deps/libosmocore' + STOW_DIR=/build/deps/install/stow stow --restow libosmocore Possible precedence issue with control flow operator at /usr/share/perl5/Stow.pm line 1736. ++ find . -name '*.[hc]' + verify_value_string_arrays_are_terminated.py ./deps/libosmocore/config.h ./deps/libosmocore/utils/osmo-sim-test.c ./deps/libosmocore/utils/osmo-auc-gen.c ./deps/libosmocore/utils/osmo-arfcn.c ./deps/libosmocore/include/osmocom/codec/codec.h ./deps/libosmocore/include/osmocom/codec/ecu.h ./deps/libosmocore/include/osmocom/codec/gsm610_bits.h ./deps/libosmocore/include/osmocom/vty/ports.h ./deps/libosmocore/include/osmocom/vty/misc.h ./deps/libosmocore/include/osmocom/vty/vty.h ./deps/libosmocore/include/osmocom/vty/vector.h ./deps/libosmocore/include/osmocom/vty/buffer.h ./deps/libosmocore/include/osmocom/vty/telnet_interface.h ./deps/libosmocore/include/osmocom/vty/stats.h ./deps/libosmocore/include/osmocom/vty/command.h ./deps/libosmocore/include/osmocom/vty/logging.h ./deps/libosmocore/include/osmocom/ctrl/ports.h ./deps/libosmocore/include/osmocom/ctrl/control_vty.h ./deps/libosmocore/include/osmocom/ctrl/control_if.h ./deps/libosmocore/include/osmocom/ctrl/control_cmd.h ./deps/libosmocore/include/osmocom/coding/gsm0503_coding.h ./deps/libosmocore/include/osmocom/coding/gsm0503_interleaving.h ./deps/libosmocore/include/osmocom/coding/gsm0503_tables.h ./deps/libosmocore/include/osmocom/coding/gsm0503_mapping.h ./deps/libosmocore/include/osmocom/coding/gsm0503_parity.h ./deps/libosmocore/include/osmocom/gprs/gprs_ns_frgre.h ./deps/libosmocore/include/osmocom/gprs/gprs_bssgp.h ./deps/libosmocore/include/osmocom/gprs/protocol/gsm_08_16.h ./deps/libosmocore/include/osmocom/gprs/protocol/gsm_04_60.h ./deps/libosmocore/include/osmocom/gprs/protocol/gsm_08_18.h ./deps/libosmocore/include/osmocom/gprs/gprs_bssgp_bss.h ./deps/libosmocore/include/osmocom/gprs/gprs_msgb.h ./deps/libosmocore/include/osmocom/gprs/gprs_rlc.h ./deps/libosmocore/include/osmocom/gprs/gprs_ns.h ./deps/libosmocore/include/osmocom/gsm/kasumi.h ./deps/libosmocore/include/osmocom/gsm/gsm0808.h ./deps/libosmocore/include/osmocom/gsm/gan.h ./deps/libosmocore/include/osmocom/gsm/gsm0480.h ./deps/libosmocore/include/osmocom/gsm/gsm0341.h ./deps/libosmocore/include/osmocom/gsm/ipa.h ./deps/libosmocore/include/osmocom/gsm/oap.h ./deps/libosmocore/include/osmocom/gsm/tlv.h ./deps/libosmocore/include/osmocom/gsm/meas_rep.h ./deps/libosmocore/include/osmocom/gsm/gsm_utils.h ./deps/libosmocore/include/osmocom/gsm/bts_features.h ./deps/libosmocore/include/osmocom/gsm/gsm0503.h ./deps/libosmocore/include/osmocom/gsm/gsm0411_smc.h ./deps/libosmocore/include/osmocom/gsm/apn.h ./deps/libosmocore/include/osmocom/gsm/gsm23003.h ./deps/libosmocore/include/osmocom/gsm/lapd_core.h ./deps/libosmocore/include/osmocom/gsm/prim.h ./deps/libosmocore/include/osmocom/gsm/l1sap.h ./deps/libosmocore/include/osmocom/gsm/mncc.h ./deps/libosmocore/include/osmocom/gsm/gsup.h ./deps/libosmocore/include/osmocom/gsm/gea.h ./deps/libosmocore/include/osmocom/gsm/comp128v23.h ./deps/libosmocore/include/osmocom/gsm/a5.h ./deps/libosmocore/include/osmocom/gsm/gsm48.h ./deps/libosmocore/include/osmocom/gsm/rsl.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_09_02.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_03_40.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_12_21.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_08.h ./deps/libosmocore/include/osmocom/gsm/protocol/smpp34_osmocom.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_03_41.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_14.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_44_318.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_08_58.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_08_08.h ./deps/libosmocore/include/osmocom/gsm/protocol/ipaccess.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_12.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_11.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_80.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_04_08_gprs.h ./deps/libosmocore/include/osmocom/gsm/protocol/gsm_23_003.h ./deps/libosmocore/include/osmocom/gsm/gsm48_ie.h ./deps/libosmocore/include/osmocom/gsm/rxlev_stat.h ./deps/libosmocore/include/osmocom/gsm/bitvec_gsm.h ./deps/libosmocore/include/osmocom/gsm/gsm0808_utils.h ./deps/libosmocore/include/osmocom/gsm/gsm0502.h ./deps/libosmocore/include/osmocom/gsm/abis_nm.h ./deps/libosmocore/include/osmocom/gsm/gsm0411_utils.h ./deps/libosmocore/include/osmocom/gsm/comp128.h ./deps/libosmocore/include/osmocom/gsm/lapdm.h ./deps/libosmocore/include/osmocom/gsm/sysinfo.h ./deps/libosmocore/include/osmocom/gsm/gsm0411_smr.h ./deps/libosmocore/include/osmocom/core/endian.h ./deps/libosmocore/include/osmocom/core/backtrace.h ./deps/libosmocore/include/osmocom/core/stat_item.h ./deps/libosmocore/include/osmocom/core/bit32gen.h ./deps/libosmocore/include/osmocom/core/signal.h ./deps/libosmocore/include/osmocom/core/conv.h ./deps/libosmocore/include/osmocom/core/timer_compat.h ./deps/libosmocore/include/osmocom/core/application.h ./deps/libosmocore/include/osmocom/core/select.h ./deps/libosmocore/include/osmocom/core/timer.h ./deps/libosmocore/include/osmocom/core/serial.h ./deps/libosmocore/include/osmocom/core/statistics.h ./deps/libosmocore/include/osmocom/core/sercomm.h ./deps/libosmocore/include/osmocom/core/crc32gen.h ./deps/libosmocore/include/osmocom/core/prim.h ./deps/libosmocore/include/osmocom/core/panic.h ./deps/libosmocore/include/osmocom/core/gsmtap.h ./deps/libosmocore/include/osmocom/core/strrb.h ./deps/libosmocore/include/osmocom/core/write_queue.h ./deps/libosmocore/include/osmocom/core/linuxrbtree.h ./deps/libosmocore/include/osmocom/core/loggingrb.h ./deps/libosmocore/include/osmocom/core/msgb.h ./deps/libosmocore/include/osmocom/core/bitcomp.h ./deps/libosmocore/include/osmocom/core/crcgen.h ./deps/libosmocore/include/osmocom/core/gsmtap_util.h ./deps/libosmocore/include/osmocom/core/isdnhdlc.h ./deps/libosmocore/include/osmocom/core/bits.h ./deps/libosmocore/include/osmocom/core/crc16gen.h ./deps/libosmocore/include/osmocom/core/msgfile.h ./deps/libosmocore/include/osmocom/core/utils.h ./deps/libosmocore/include/osmocom/core/crc8gen.h ./deps/libosmocore/include/osmocom/core/macaddr.h ./deps/libosmocore/include/osmocom/core/counter.h ./deps/libosmocore/include/osmocom/core/linuxlist.h ./deps/libosmocore/include/osmocom/core/crc16.h ./deps/libosmocore/include/osmocom/core/byteswap.h ./deps/libosmocore/include/osmocom/core/plugin.h ./deps/libosmocore/include/osmocom/core/fsm.h ./deps/libosmocore/include/osmocom/core/rate_ctr.h ./deps/libosmocore/include/osmocom/core/talloc.h ./deps/libosmocore/include/osmocom/core/prbs.h ./deps/libosmocore/include/osmocom/core/defs.h ./deps/libosmocore/include/osmocom/core/socket.h ./deps/libosmocore/include/osmocom/core/bit16gen.h ./deps/libosmocore/include/osmocom/core/bitvec.h ./deps/libosmocore/include/osmocom/core/process.h ./deps/libosmocore/include/osmocom/core/stats.h ./deps/libosmocore/include/osmocom/core/bit64gen.h ./deps/libosmocore/include/osmocom/core/crc64gen.h ./deps/libosmocore/include/osmocom/core/logging.h ./deps/libosmocore/include/osmocom/sim/sim.h ./deps/libosmocore/include/osmocom/sim/class_tables.h ./deps/libosmocore/include/osmocom/crypt/gprs_cipher.h ./deps/libosmocore/include/osmocom/crypt/auth.h ./deps/libosmocore/src/crc16.c ./deps/libosmocore/src/bitcomp.c ./deps/libosmocore/src/stats_statsd.c ./deps/libosmocore/src/gb/gprs_bssgp.c ./deps/libosmocore/src/gb/gprs_bssgp_util.c ./deps/libosmocore/src/gb/gprs_ns_frgre.c ./deps/libosmocore/src/gb/gprs_bssgp_vty.c ./deps/libosmocore/src/gb/gprs_ns.c ./deps/libosmocore/src/gb/common_vty.c ./deps/libosmocore/src/gb/common_vty.h ./deps/libosmocore/src/gb/gprs_ns_vty.c ./deps/libosmocore/src/gb/gprs_bssgp_bss.c ./deps/libosmocore/src/conv_acc.c ./deps/libosmocore/src/rbtree.c ./deps/libosmocore/src/codec/ecu_fr.c ./deps/libosmocore/src/codec/gsm610.c ./deps/libosmocore/src/codec/gsm620.c ./deps/libosmocore/src/codec/gsm690.c ./deps/libosmocore/src/codec/gsm660.c ./deps/libosmocore/src/panic.c ./deps/libosmocore/src/socket.c ./deps/libosmocore/src/prim.c ./deps/libosmocore/src/logging_syslog.c ./deps/libosmocore/src/conv.c ./deps/libosmocore/src/stat_item.c ./deps/libosmocore/src/logging.c ./deps/libosmocore/src/stats.c ./deps/libosmocore/src/plugin.c ./deps/libosmocore/src/loggingrb.c ./deps/libosmocore/src/timer_clockgettime.c ./deps/libosmocore/src/crc16gen.c ./deps/libosmocore/src/select.c ./deps/libosmocore/src/signal.c ./deps/libosmocore/src/utils.c ./deps/libosmocore/src/bitvec.c ./deps/libosmocore/src/fsm.c ./deps/libosmocore/src/vty/talloc_ctx_vty.c ./deps/libosmocore/src/vty/fsm_vty.c ./deps/libosmocore/src/vty/telnet_interface.c ./deps/libosmocore/src/vty/vector.c ./deps/libosmocore/src/vty/vty.c ./deps/libosmocore/src/vty/utils.c ./deps/libosmocore/src/vty/stats_vty.c ./deps/libosmocore/src/vty/logging_vty.c ./deps/libosmocore/src/vty/command.c ./deps/libosmocore/src/vty/buffer.c ./deps/libosmocore/src/ctrl/control_vty.c ./deps/libosmocore/src/ctrl/control_if.c ./deps/libosmocore/src/ctrl/fsm_ctrl_commands.c ./deps/libosmocore/src/ctrl/control_cmd.c ./deps/libosmocore/src/coding/gsm0503_mapping.c ./deps/libosmocore/src/coding/gsm0503_parity.c ./deps/libosmocore/src/coding/gsm0503_interleaving.c ./deps/libosmocore/src/coding/gsm0503_tables.c ./deps/libosmocore/src/coding/gsm0503_coding.c ./deps/libosmocore/src/sercomm.c ./deps/libosmocore/src/conv_acc_sse_impl.h ./deps/libosmocore/src/prbs.c ./deps/libosmocore/src/pseudotalloc/pseudotalloc.c ./deps/libosmocore/src/pseudotalloc/talloc.h ./deps/libosmocore/src/application.c ./deps/libosmocore/src/gsm/auth_core.c ./deps/libosmocore/src/gsm/milenage/milenage.c ./deps/libosmocore/src/gsm/milenage/crypto.h ./deps/libosmocore/src/gsm/milenage/aes_wrap.h ./deps/libosmocore/src/gsm/milenage/includes.h ./deps/libosmocore/src/gsm/milenage/common.h ./deps/libosmocore/src/gsm/milenage/aes-encblock.c ./deps/libosmocore/src/gsm/milenage/aes_i.h ./deps/libosmocore/src/gsm/milenage/aes.h ./deps/libosmocore/src/gsm/milenage/aes-internal.c ./deps/libosmocore/src/gsm/milenage/aes-internal-enc.c ./deps/libosmocore/src/gsm/milenage/milenage.h ./deps/libosmocore/src/gsm/gsm0503_conv.c ./deps/libosmocore/src/gsm/rxlev_stat.c ./deps/libosmocore/src/gsm/tlv_parser.c ./deps/libosmocore/src/gsm/auth_comp128v23.c ./deps/libosmocore/src/gsm/apn.c ./deps/libosmocore/src/gsm/rsl.c ./deps/libosmocore/src/gsm/gan.c ./deps/libosmocore/src/gsm/gsm0411_utils.c ./deps/libosmocore/src/gsm/gsm_utils.c ./deps/libosmocore/src/gsm/gsm0808.c ./deps/libosmocore/src/gsm/kasumi.c ./deps/libosmocore/src/gsm/a5.c ./deps/libosmocore/src/gsm/gprs_rlc.c ./deps/libosmocore/src/gsm/bts_features.c ./deps/libosmocore/src/gsm/auth_milenage.c ./deps/libosmocore/src/gsm/gsup.c ./deps/libosmocore/src/gsm/lapd_core.c ./deps/libosmocore/src/gsm/oap.c ./deps/libosmocore/src/gsm/gsm0411_smr.c ./deps/libosmocore/src/gsm/gsm48_ie.c ./deps/libosmocore/src/gsm/comp128v23.c ./deps/libosmocore/src/gsm/ipa.c ./deps/libosmocore/src/gsm/gsm0808_utils.c ./deps/libosmocore/src/gsm/comp128.c ./deps/libosmocore/src/gsm/gsm0414.c ./deps/libosmocore/src/gsm/gsm23003.c ./deps/libosmocore/src/gsm/gsm48.c ./deps/libosmocore/src/gsm/gsm0341.c ./deps/libosmocore/src/gsm/gsm0480.c ./deps/libosmocore/src/gsm/abis_nm.c ./deps/libosmocore/src/gsm/mncc.c ./deps/libosmocore/src/gsm/lapdm.c ./deps/libosmocore/src/gsm/gsm_04_08_gprs.c ./deps/libosmocore/src/gsm/gea.c ./deps/libosmocore/src/gsm/gprs_gea.c ./deps/libosmocore/src/gsm/auth_comp128v1.c ./deps/libosmocore/src/gsm/gprs_cipher_core.c ./deps/libosmocore/src/gsm/gsm0411_smc.c ./deps/libosmocore/src/gsm/sysinfo.c ./deps/libosmocore/src/gsm/gsm0502.c ./deps/libosmocore/src/crc32gen.c ./deps/libosmocore/src/serial.c ./deps/libosmocore/src/crc8gen.c ./deps/libosmocore/src/msgfile.c ./deps/libosmocore/src/sim/card_fs_uicc.c ./deps/libosmocore/src/sim/reader.c ./deps/libosmocore/src/sim/card_fs_sim.c ./deps/libosmocore/src/sim/card_fs_usim.c ./deps/libosmocore/src/sim/sim_int.h ./deps/libosmocore/src/sim/card_fs_isim.c ./deps/libosmocore/src/sim/card_fs_tetra.c ./deps/libosmocore/src/sim/core.c ./deps/libosmocore/src/sim/gsm_int.h ./deps/libosmocore/src/sim/reader_pcsc.c ./deps/libosmocore/src/sim/class_tables.c ./deps/libosmocore/src/counter.c ./deps/libosmocore/src/backtrace.c ./deps/libosmocore/src/conv_acc_sse_avx.c ./deps/libosmocore/src/timer_gettimeofday.c ./deps/libosmocore/src/gsmtap_util.c ./deps/libosmocore/src/bits.c ./deps/libosmocore/src/macaddr.c ./deps/libosmocore/src/conv_acc_sse.c ./deps/libosmocore/src/msgb.c ./deps/libosmocore/src/rate_ctr.c ./deps/libosmocore/src/timer.c ./deps/libosmocore/src/conv_acc_generic.c ./deps/libosmocore/src/strrb.c ./deps/libosmocore/src/write_queue.c ./deps/libosmocore/src/crc64gen.c ./deps/libosmocore/src/logging_gsmtap.c ./deps/libosmocore/src/isdnhdlc.c ./deps/libosmocore/tests/kasumi/kasumi_test.c ./deps/libosmocore/tests/gb/bssgp_fc_test.c ./deps/libosmocore/tests/gb/gprs_bssgp_test.c ./deps/libosmocore/tests/gb/gprs_ns_test.c ./deps/libosmocore/tests/gea/gea_test.c ./deps/libosmocore/tests/comp128/comp128_test.c ./deps/libosmocore/tests/codec/codec_ecu_fr_test.c ./deps/libosmocore/tests/codec/codec_test.c ./deps/libosmocore/tests/ussd/ussd_test.c ./deps/libosmocore/tests/abis/abis_test.c ./deps/libosmocore/tests/gsm0408/gsm0408_test.c ./deps/libosmocore/tests/a5/a5_test.c ./deps/libosmocore/tests/endian/endian_test.c ./deps/libosmocore/tests/tlv/tlv_test.c ./deps/libosmocore/tests/gsm0808/gsm0808_test.c ./deps/libosmocore/tests/utils/utils_test.c ./deps/libosmocore/tests/vty/vty_test.c ./deps/libosmocore/tests/msgb/msgb_test.c ./deps/libosmocore/tests/ctrl/ctrl_test.c ./deps/libosmocore/tests/coding/coding_test.c ./deps/libosmocore/tests/stats/stats_test.c ./deps/libosmocore/tests/gsm23003/gsm23003_test.c ./deps/libosmocore/tests/gprs/gprs_test.c ./deps/libosmocore/tests/bitvec/bitvec_test.c ./deps/libosmocore/tests/msgfile/msgfile_test.c ./deps/libosmocore/tests/write_queue/wqueue_test.c ./deps/libosmocore/tests/oap/oap_test.c ./deps/libosmocore/tests/sms/sms_test.c ./deps/libosmocore/tests/strrb/strrb_test.c ./deps/libosmocore/tests/sim/sim_test.c ./deps/libosmocore/tests/sercomm/sercomm_test.c ./deps/libosmocore/tests/socket/socket_test.c ./deps/libosmocore/tests/auth/milenage_test.c ./deps/libosmocore/tests/fr/fr_test.c ./deps/libosmocore/tests/bits/bitfield_test.c ./deps/libosmocore/tests/bits/bitrev_test.c ./deps/libosmocore/tests/bits/bitcomp_test.c ./deps/libosmocore/tests/logging/logging_test.c ./deps/libosmocore/tests/loggingrb/loggingrb_test.c ./deps/libosmocore/tests/lapd/lapd_test.c ./deps/libosmocore/tests/timer/timer_test.c ./deps/libosmocore/tests/timer/clk_override_test.c ./deps/libosmocore/tests/gsup/gsup_test.c ./deps/libosmocore/tests/smscb/gsm0341_test.c ./deps/libosmocore/tests/smscb/smscb_test.c ./deps/libosmocore/tests/prbs/prbs_test.c ./deps/libosmocore/tests/conv/gsm0503_test_vectors.c ./deps/libosmocore/tests/conv/conv.h ./deps/libosmocore/tests/conv/conv.c ./deps/libosmocore/tests/conv/conv_test.c ./deps/libosmocore/tests/conv/conv_gsm0503_test.c ./deps/libosmocore/tests/fsm/fsm_test.c ./deps/libosmocore/tests/libsercomstub.c ./deps/libosmo-netif/include/osmocom/netif/ipa.h ./deps/libosmo-netif/include/osmocom/netif/datagram.h ./deps/libosmo-netif/include/osmocom/netif/osmux.h ./deps/libosmo-netif/include/osmocom/netif/channel.h ./deps/libosmo-netif/include/osmocom/netif/rtp.h ./deps/libosmo-netif/include/osmocom/netif/rs232.h ./deps/libosmo-netif/include/osmocom/netif/jibuf.h ./deps/libosmo-netif/include/osmocom/netif/ipa_unit.h ./deps/libosmo-netif/include/osmocom/netif/stream.h ./deps/libosmo-netif/include/osmocom/netif/channel/abis_ipa_client.h ./deps/libosmo-netif/include/osmocom/netif/channel/abis_ipa_server.h ./deps/libosmo-netif/include/osmocom/netif/amr.h ./deps/libosmo-netif/examples/osmux-test-input.c ./deps/libosmo-netif/examples/stream-client.c ./deps/libosmo-netif/examples/rs232-write.c ./deps/libosmo-netif/examples/stream-server.c ./deps/libosmo-netif/examples/ipa-stream-server.c ./deps/libosmo-netif/examples/lapd-over-datagram-user.c ./deps/libosmo-netif/examples/rtp-udp-test-server.c ./deps/libosmo-netif/examples/lapd-over-datagram-network.c ./deps/libosmo-netif/examples/osmux-test-output.c ./deps/libosmo-netif/examples/ipa-stream-client.c ./deps/libosmo-netif/examples/udp-test.h ./deps/libosmo-netif/examples/udp-test-server.c ./deps/libosmo-netif/examples/rs232-read.c ./deps/libosmo-netif/examples/channel/abis_ipa_stream_server.c ./deps/libosmo-netif/examples/channel/abis_ipa_stream_client.c ./deps/libosmo-netif/examples/udp-test-client.c ./deps/libosmo-netif/examples/rtp-udp-test-client.c ./deps/libosmo-netif/src/osmux.c ./deps/libosmo-netif/src/ipa_unit.c ./deps/libosmo-netif/src/jibuf.c ./deps/libosmo-netif/src/amr.c ./deps/libosmo-netif/src/channel.c ./deps/libosmo-netif/src/rs232.c ./deps/libosmo-netif/src/stream.c ./deps/libosmo-netif/src/ipa.c ./deps/libosmo-netif/src/datagram.c ./deps/libosmo-netif/src/channel/abis/ipa_stream_client.c ./deps/libosmo-netif/src/channel/abis/ipa_stream_server.c ./deps/libosmo-netif/src/rtp.c ./deps/libosmo-netif/tests/osmux/osmux_test2.c ./deps/libosmo-netif/tests/osmux/osmux_test.c ./deps/libosmo-netif/tests/jibuf/jibuf_tool.c ./deps/libosmo-netif/tests/jibuf/jibuf_test.c ./deps/libosmo-netif/tests/osmo-pcap-test/l4_tcp.c ./deps/libosmo-netif/tests/osmo-pcap-test/proto.h ./deps/libosmo-netif/tests/osmo-pcap-test/l4_udp.c ./deps/libosmo-netif/tests/osmo-pcap-test/osmo_pcap.h ./deps/libosmo-netif/tests/osmo-pcap-test/proto.c ./deps/libosmo-netif/tests/osmo-pcap-test/l2_eth.c ./deps/libosmo-netif/tests/osmo-pcap-test/osmux_test.c ./deps/libosmo-netif/tests/osmo-pcap-test/l3_ipv4.c ./deps/libosmo-netif/tests/osmo-pcap-test/pcap.c ./deps/libosmo-netif/tests/osmo-pcap-test/l2_sll.c ./deps/install/stow/libosmocore/include/osmocom/codec/codec.h ./deps/install/stow/libosmocore/include/osmocom/codec/ecu.h ./deps/install/stow/libosmocore/include/osmocom/codec/gsm610_bits.h ./deps/install/stow/libosmocore/include/osmocom/vty/ports.h ./deps/install/stow/libosmocore/include/osmocom/vty/misc.h ./deps/install/stow/libosmocore/include/osmocom/vty/vty.h ./deps/install/stow/libosmocore/include/osmocom/vty/vector.h ./deps/install/stow/libosmocore/include/osmocom/vty/buffer.h ./deps/install/stow/libosmocore/include/osmocom/vty/telnet_interface.h ./deps/install/stow/libosmocore/include/osmocom/vty/stats.h ./deps/install/stow/libosmocore/include/osmocom/vty/command.h ./deps/install/stow/libosmocore/include/osmocom/vty/logging.h ./deps/install/stow/libosmocore/include/osmocom/ctrl/ports.h ./deps/install/stow/libosmocore/include/osmocom/ctrl/control_vty.h ./deps/install/stow/libosmocore/include/osmocom/ctrl/control_if.h ./deps/install/stow/libosmocore/include/osmocom/ctrl/control_cmd.h ./deps/install/stow/libosmocore/include/osmocom/coding/gsm0503_coding.h ./deps/install/stow/libosmocore/include/osmocom/coding/gsm0503_interleaving.h ./deps/install/stow/libosmocore/include/osmocom/coding/gsm0503_tables.h ./deps/install/stow/libosmocore/include/osmocom/coding/gsm0503_mapping.h ./deps/install/stow/libosmocore/include/osmocom/coding/gsm0503_parity.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_ns_frgre.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_bssgp.h ./deps/install/stow/libosmocore/include/osmocom/gprs/protocol/gsm_08_16.h ./deps/install/stow/libosmocore/include/osmocom/gprs/protocol/gsm_04_60.h ./deps/install/stow/libosmocore/include/osmocom/gprs/protocol/gsm_08_18.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_bssgp_bss.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_msgb.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_rlc.h ./deps/install/stow/libosmocore/include/osmocom/gprs/gprs_ns.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gan.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0480.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0341.h ./deps/install/stow/libosmocore/include/osmocom/gsm/ipa.h ./deps/install/stow/libosmocore/include/osmocom/gsm/oap.h ./deps/install/stow/libosmocore/include/osmocom/gsm/tlv.h ./deps/install/stow/libosmocore/include/osmocom/gsm/meas_rep.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm_utils.h ./deps/install/stow/libosmocore/include/osmocom/gsm/bts_features.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0503.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0411_smc.h ./deps/install/stow/libosmocore/include/osmocom/gsm/apn.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm23003.h ./deps/install/stow/libosmocore/include/osmocom/gsm/lapd_core.h ./deps/install/stow/libosmocore/include/osmocom/gsm/prim.h ./deps/install/stow/libosmocore/include/osmocom/gsm/l1sap.h ./deps/install/stow/libosmocore/include/osmocom/gsm/mncc.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsup.h ./deps/install/stow/libosmocore/include/osmocom/gsm/comp128v23.h ./deps/install/stow/libosmocore/include/osmocom/gsm/a5.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm48.h ./deps/install/stow/libosmocore/include/osmocom/gsm/rsl.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_09_02.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_03_40.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_12_21.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_08.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/smpp34_osmocom.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_03_41.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_14.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_44_318.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_08_58.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_08_08.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/ipaccess.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_12.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_11.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_80.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_04_08_gprs.h ./deps/install/stow/libosmocore/include/osmocom/gsm/protocol/gsm_23_003.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm48_ie.h ./deps/install/stow/libosmocore/include/osmocom/gsm/rxlev_stat.h ./deps/install/stow/libosmocore/include/osmocom/gsm/bitvec_gsm.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0808_utils.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0502.h ./deps/install/stow/libosmocore/include/osmocom/gsm/abis_nm.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0411_utils.h ./deps/install/stow/libosmocore/include/osmocom/gsm/comp128.h ./deps/install/stow/libosmocore/include/osmocom/gsm/lapdm.h ./deps/install/stow/libosmocore/include/osmocom/gsm/sysinfo.h ./deps/install/stow/libosmocore/include/osmocom/gsm/gsm0411_smr.h ./deps/install/stow/libosmocore/include/osmocom/core/endian.h ./deps/install/stow/libosmocore/include/osmocom/core/backtrace.h ./deps/install/stow/libosmocore/include/osmocom/core/stat_item.h ./deps/install/stow/libosmocore/include/osmocom/core/bit32gen.h ./deps/install/stow/libosmocore/include/osmocom/core/signal.h ./deps/install/stow/libosmocore/include/osmocom/core/conv.h ./deps/install/stow/libosmocore/include/osmocom/core/timer_compat.h ./deps/install/stow/libosmocore/include/osmocom/core/application.h ./deps/install/stow/libosmocore/include/osmocom/core/select.h ./deps/install/stow/libosmocore/include/osmocom/core/timer.h ./deps/install/stow/libosmocore/include/osmocom/core/serial.h ./deps/install/stow/libosmocore/include/osmocom/core/statistics.h ./deps/install/stow/libosmocore/include/osmocom/core/sercomm.h ./deps/install/stow/libosmocore/include/osmocom/core/crc32gen.h ./deps/install/stow/libosmocore/include/osmocom/core/prim.h ./deps/install/stow/libosmocore/include/osmocom/core/panic.h ./deps/install/stow/libosmocore/include/osmocom/core/gsmtap.h ./deps/install/stow/libosmocore/include/osmocom/core/strrb.h ./deps/install/stow/libosmocore/include/osmocom/core/write_queue.h ./deps/install/stow/libosmocore/include/osmocom/core/linuxrbtree.h ./deps/install/stow/libosmocore/include/osmocom/core/loggingrb.h ./deps/install/stow/libosmocore/include/osmocom/core/msgb.h ./deps/install/stow/libosmocore/include/osmocom/core/bitcomp.h ./deps/install/stow/libosmocore/include/osmocom/core/crcgen.h ./deps/install/stow/libosmocore/include/osmocom/core/gsmtap_util.h ./deps/install/stow/libosmocore/include/osmocom/core/isdnhdlc.h ./deps/install/stow/libosmocore/include/osmocom/core/bits.h ./deps/install/stow/libosmocore/include/osmocom/core/crc16gen.h ./deps/install/stow/libosmocore/include/osmocom/core/msgfile.h ./deps/install/stow/libosmocore/include/osmocom/core/utils.h ./deps/install/stow/libosmocore/include/osmocom/core/crc8gen.h ./deps/install/stow/libosmocore/include/osmocom/core/macaddr.h ./deps/install/stow/libosmocore/include/osmocom/core/counter.h ./deps/install/stow/libosmocore/include/osmocom/core/linuxlist.h ./deps/install/stow/libosmocore/include/osmocom/core/crc16.h ./deps/install/stow/libosmocore/include/osmocom/core/byteswap.h ./deps/install/stow/libosmocore/include/osmocom/core/plugin.h ./deps/install/stow/libosmocore/include/osmocom/core/fsm.h ./deps/install/stow/libosmocore/include/osmocom/core/rate_ctr.h ./deps/install/stow/libosmocore/include/osmocom/core/talloc.h ./deps/install/stow/libosmocore/include/osmocom/core/prbs.h ./deps/install/stow/libosmocore/include/osmocom/core/defs.h ./deps/install/stow/libosmocore/include/osmocom/core/socket.h ./deps/install/stow/libosmocore/include/osmocom/core/bit16gen.h ./deps/install/stow/libosmocore/include/osmocom/core/bitvec.h ./deps/install/stow/libosmocore/include/osmocom/core/process.h ./deps/install/stow/libosmocore/include/osmocom/core/stats.h ./deps/install/stow/libosmocore/include/osmocom/core/bit64gen.h ./deps/install/stow/libosmocore/include/osmocom/core/crc64gen.h ./deps/install/stow/libosmocore/include/osmocom/core/logging.h ./deps/install/stow/libosmocore/include/osmocom/sim/sim.h ./deps/install/stow/libosmocore/include/osmocom/sim/class_tables.h ./deps/install/stow/libosmocore/include/osmocom/crypt/gprs_cipher.h ./deps/install/stow/libosmocore/include/osmocom/crypt/auth.h ./deps/osmo-ggsn/ggsn/icmpv6.h ./deps/osmo-ggsn/ggsn/checksum.c ./deps/osmo-ggsn/ggsn/ggsn.h ./deps/osmo-ggsn/ggsn/ggsn_vty.c ./deps/osmo-ggsn/ggsn/icmpv6.c ./deps/osmo-ggsn/ggsn/ggsn.c ./deps/osmo-ggsn/ggsn/checksum.h ./deps/osmo-ggsn/lib/ippool.c ./deps/osmo-ggsn/lib/lookup.h ./deps/osmo-ggsn/lib/netdev.c ./deps/osmo-ggsn/lib/ippool.h ./deps/osmo-ggsn/lib/gnugetopt.h ./deps/osmo-ggsn/lib/getopt1.c ./deps/osmo-ggsn/lib/debug.c ./deps/osmo-ggsn/lib/netdev.h ./deps/osmo-ggsn/lib/tun.c ./deps/osmo-ggsn/lib/gtp-kernel.c ./deps/osmo-ggsn/lib/tun.h ./deps/osmo-ggsn/lib/getopt.c ./deps/osmo-ggsn/lib/lookup.c ./deps/osmo-ggsn/lib/in46_addr.h ./deps/osmo-ggsn/lib/gtp-kernel.h ./deps/osmo-ggsn/lib/syserr.h ./deps/osmo-ggsn/lib/in46_addr.c ./deps/osmo-ggsn/sgsnemu/sgsnemu.c ./deps/osmo-ggsn/sgsnemu/cmdline.c ./deps/osmo-ggsn/sgsnemu/cmdline.h ./deps/osmo-ggsn/gtp/lookupa.c ./deps/osmo-ggsn/gtp/gtpie.c ./deps/osmo-ggsn/gtp/pdp.c ./deps/osmo-ggsn/gtp/gtp.h ./deps/osmo-ggsn/gtp/lookupa.h ./deps/osmo-ggsn/gtp/queue.h ./deps/osmo-ggsn/gtp/gtpie.h ./deps/osmo-ggsn/gtp/pdp.h ./deps/osmo-ggsn/gtp/gtp.c ./deps/osmo-ggsn/gtp/queue.c ./deps/osmo-ggsn/tests/lib/in46a_test.c ./deps/osmo-ggsn/tests/lib/ippool_test.c ./deps/osmo-ggsn/tests/gtp/gtpie_test.c ./deps/libosmo-abis/include/internal.h ./deps/libosmo-abis/include/osmocom/trau/osmo_ortp.h ./deps/libosmo-abis/include/osmocom/abis/ipa.h ./deps/libosmo-abis/include/osmocom/abis/trau_frame.h ./deps/libosmo-abis/include/osmocom/abis/ipa_proxy.h ./deps/libosmo-abis/include/osmocom/abis/lapd.h ./deps/libosmo-abis/include/osmocom/abis/lapd_pcap.h ./deps/libosmo-abis/include/osmocom/abis/unixsocket_proto.h ./deps/libosmo-abis/include/osmocom/abis/e1_input.h ./deps/libosmo-abis/include/osmocom/abis/ipaccess.h ./deps/libosmo-abis/include/osmocom/abis/abis.h ./deps/libosmo-abis/include/osmocom/abis/subchan_demux.h ./deps/libosmo-abis/include/mISDNif.h ./deps/libosmo-abis/src/subchan_demux.c ./deps/libosmo-abis/src/trau/osmo_ortp.c ./deps/libosmo-abis/src/trau_frame.c ./deps/libosmo-abis/src/ipa_proxy.c ./deps/libosmo-abis/src/input/unixsocket.c ./deps/libosmo-abis/src/input/lapd_pcap.c ./deps/libosmo-abis/src/input/lapd.c ./deps/libosmo-abis/src/input/misdn.c ./deps/libosmo-abis/src/input/rs232.c ./deps/libosmo-abis/src/input/ipa.c ./deps/libosmo-abis/src/input/dahdi.c ./deps/libosmo-abis/src/input/ipaccess.c ./deps/libosmo-abis/src/e1_input_vty.c ./deps/libosmo-abis/src/init.c ./deps/libosmo-abis/src/e1_input.c ./deps/libosmo-abis/tests/subchan_demux/subchan_demux_test.c ./deps/libosmo-abis/tests/e1inp_ipa_bts_test.c ./deps/libosmo-abis/tests/ipa_proxy_test.c ./deps/libosmo-abis/tests/e1inp_ipa_bsc_test.c ./deps/libosmo-abis/tests/ipa_recv/ipa_recv_test.c ./include/osmocom/sgsn/signal.h ./include/osmocom/sgsn/v42bis_private.h ./include/osmocom/sgsn/gtphub.h ./include/osmocom/sgsn/sgsn.h ./include/osmocom/sgsn/gsup_client.h ./include/osmocom/sgsn/gprs_llc_xid.h ./include/osmocom/sgsn/gprs_gb_parse.h ./include/osmocom/sgsn/slhc.h ./include/osmocom/sgsn/vty.h ./include/osmocom/sgsn/gprs_sndcp_xid.h ./include/osmocom/sgsn/common.h ./include/osmocom/sgsn/gprs_sndcp_comp.h ./include/osmocom/sgsn/gb_proxy.h ./include/osmocom/sgsn/gprs_sndcp.h ./include/osmocom/sgsn/v42bis.h ./include/osmocom/sgsn/gprs_utils.h ./include/osmocom/sgsn/debug.h ./include/osmocom/sgsn/gprs_gmm.h ./include/osmocom/sgsn/gprs_subscriber.h ./include/osmocom/sgsn/gprs_sndcp_pcomp.h ./include/osmocom/sgsn/gprs_llc.h ./include/osmocom/sgsn/gprs_sndcp_dcomp.h ./include/osmocom/sgsn/gprs_sgsn.h ./include/osmocom/sgsn/oap_client.h ./include/osmocom/sgsn/crc24.h ./src/libcommon/gsm_subscriber_base.c ./src/libcommon/socket.c ./src/libcommon/gsup_test_client.c ./src/libcommon/gsm_data.c ./src/libcommon/talloc_ctx.c ./src/libcommon/debug.c ./src/libcommon/common_vty.c ./src/libcommon/oap_client.c ./src/libcommon/gsup_client.c ./src/libcommon/gsm_data_shared.c ./src/gprs/gb_proxy_peer.c ./src/gprs/sgsn_ares.c ./src/gprs/gprs_llc_xid.c ./src/gprs/gprs_sndcp_comp.c ./src/gprs/gprs_llc_vty.c ./src/gprs/gprs_llc_parse.c ./src/gprs/gprs_sndcp_pcomp.c ./src/gprs/gb_proxy_main.c ./src/gprs/crc24.c ./src/gprs/gprs_sndcp_vty.c ./src/gprs/gtphub_main.c ./src/gprs/gtphub_sock.c ./src/gprs/v42bis.c ./src/gprs/gb_proxy_tlli.c ./src/gprs/sgsn_main.c ./src/gprs/gtphub_ares.c ./src/gprs/sgsn_vty.c ./src/gprs/sgsn_auth.c ./src/gprs/gtphub_vty.c ./src/gprs/sgsn_ctrl.c ./src/gprs/sgsn_libgtp.c ./src/gprs/gprs_gb_parse.c ./src/gprs/sgsn_cdr.c ./src/gprs/gprs_subscriber.c ./src/gprs/gprs_sndcp.c ./src/gprs/oap_client.c ./src/gprs/gsup_client.c ./src/gprs/gprs_sndcp_dcomp.c ./src/gprs/gb_proxy_vty.c ./src/gprs/gprs_sndcp_xid.c ./src/gprs/slhc.c ./src/gprs/gb_proxy.c ./src/gprs/gtphub.c ./src/gprs/gb_proxy_patch.c ./src/gprs/gprs_utils.c ./src/gprs/gprs_sgsn.c ./src/gprs/gprs_gmm.c ./src/gprs/gprs_llc.c ./tests/xid/xid_test.c ./tests/gbproxy/gbproxy_test.c ./tests/sndcp_xid/sndcp_xid_test.c ./tests/gtphub/gtphub_test.c ./tests/gprs/gprs_test.c ./tests/oap/oap_client_test.c ./tests/slhc/slhc_test.c ./tests/v42bis/v42bis_test.c ./tests/sgsn/sgsn_test.c + export PKG_CONFIG_PATH=/build/deps/install/lib/pkgconfig: + PKG_CONFIG_PATH=/build/deps/install/lib/pkgconfig: + export LD_LIBRARY_PATH=/build/deps/install/lib + LD_LIBRARY_PATH=/build/deps/install/lib + osmo-build-dep.sh libosmo-abis =============================== libosmo-abis =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmo-abis + project=libosmo-abis + branch=master + grep -c remotes/origin/master$ + git branch -a + [ x1 != x0 ] + branch=origin/master + test -d libosmo-abis + cd libosmo-abis + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at b016207... fix double-free/use-after-free of pointers in struct e1inp_line + git rev-parse HEAD b0162077da4d2b60c9006173c11bfab5a0369164 + cd libosmo-abis + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' configure.ac:20: installing './compile' configure.ac:22: installing './config.guess' configure.ac:22: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix=/build/deps/install/stow/libosmo-abis checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking if gcc supports -fvisibility=hidden... yes checking for LIBOSMOCORE... yes checking for LIBOSMOVTY... yes checking for LIBOSMOGSM... yes checking for ORTP... yes checking dahdi/user.h usability... no checking dahdi/user.h presence... no checking for dahdi/user.h... no configure: WARNING: DAHDI input driver will not be built CFLAGS="-g -O2 -Wall" CPPFLAGS=" -Wall" checking that generated files are newer than configure... done configure: creating ./config.status config.status: creating libosmoabis.pc config.status: creating libosmotrau.pc config.status: creating include/Makefile config.status: creating src/Makefile config.status: creating tests/Makefile config.status: creating Makefile config.status: creating config.h config.status: executing tests/atconfig commands config.status: executing depfiles commands config.status: executing libtool commands + make -j 8 install echo 0.5.0.3-b016 > .version-t && mv .version-t .version make install-recursive make[1]: Entering directory '/build/deps/libosmo-abis' Making install in include make[2]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Entering directory '/build/deps/libosmo-abis/include' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /usr/bin/install -c -m 644 osmocom/abis/ipa.h osmocom/abis/trau_frame.h osmocom/abis/ipa_proxy.h osmocom/abis/ipaccess.h osmocom/abis/abis.h osmocom/abis/subchan_demux.h osmocom/abis/e1_input.h osmocom/abis/lapd.h osmocom/abis/lapd_pcap.h osmocom/abis/unixsocket_proto.h '/build/deps/install/stow/libosmo-abis/include/osmocom/abis' /bin/mkdir -p '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' /usr/bin/install -c -m 644 osmocom/trau/osmo_ortp.h '/build/deps/install/stow/libosmo-abis/include/osmocom/trau' make[3]: Leaving directory '/build/deps/libosmo-abis/include' make[2]: Leaving directory '/build/deps/libosmo-abis/include' Making install in src make[2]: Entering directory '/build/deps/libosmo-abis/src' CC e1_input.lo CC init.lo CC e1_input_vty.lo CC ipa_proxy.lo CC subchan_demux.lo CC trau_frame.lo CC input/dahdi.lo CC input/ipa.lo CC input/ipaccess.lo CC input/lapd.lo CC input/lapd_pcap.lo CC input/misdn.lo CC input/rs232.lo CC input/unixsocket.lo CC trau/libosmotrau_la-osmo_ortp.lo trau/osmo_ortp.c:205:9: note: #pragma message: Using internal ortp API: rtp_session_rtcp_rec #pragma message ("Using internal ortp API: rtp_session_rtcp_rec") ^ Makefile:516: recipe for target 'ipa_proxy.lo' failed make[2]: *** [ipa_proxy.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/build/deps/libosmo-abis/src' Makefile:458: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmo-abis' make[1]: *** [install-recursive] Error 1 make: *** [install] Error 2 Makefile:757: recipe for target 'install' failed Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Sun May 27 20:50:52 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 May 2018 20:50:52 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-sgsn_=C2=BB_--dis?= =?UTF-8?Q?able-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3254?= In-Reply-To: <1648527156.198.1527454053289.JavaMail.jenkins@jenkins.osmocom.org> References: <1648527156.198.1527454053289.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1414054941.199.1527454252247.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Sun May 27 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Sun, 27 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#49?= In-Reply-To: <328783667.182.1527374480689.JavaMail.jenkins@jenkins.osmocom.org> References: <328783667.182.1527374480689.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1567831691.201.1527460880827.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15190/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-15190/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-15190/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-15190/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-15190/ libtool: install: (cd /tmp/am-dc-15190/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-15190/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-15190/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-15190/ libtool: install: chmod 644 /tmp/am-dc-15190/ libtool: install: ranlib /tmp/am-dc-15190/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-15190/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-15190/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-15190/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-15190/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-15190/ /bin/mkdir -p '/tmp/am-dc-15190/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-15190/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-15190/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-15190/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-15190/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-15190/ libtool: uninstall: rm -f /tmp/am-dc-15190/ /tmp/am-dc-15190/ /tmp/am-dc-15190/ /tmp/am-dc-15190/ /tmp/am-dc-15190/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-15190/ && rm -f html.tar ) ( cd '/tmp/am-dc-15190/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-15190/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Mon May 28 00:13:49 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:13:49 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#506?= Message-ID: <1961516864.203.1527466429242.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 116.97 KB...] make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.5-f0f7d] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.5-f0f7d/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-28 00:13:47.708269870 +0000 +++ 2018-05-28 00:13:47.760269598 +0000 @@ -2379,6 +2379,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) downlink (V(A)==0 .. V(S)==8) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Sending new block at BSN 8, CS=CS-1 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Complete DL frame, len=13 +../../../src/gprs_rlcmac_meas.cpp:178:47: runtime error: left shift of negative value -999225 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) Dequeue next LLC (len=13) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) data block (BSN 8, CS-1): 1f 43 4b 45 54 20 31 31 4c 4c 43 20 50 41 43 4b 45 54 20 31 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FLOW) need_padding 0 spb_status 0 spb 0 (BSN1 8 BSN2 -1) @@ -2768,6 +2769,7 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) downlink acknowledge TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) ack: (BSN=0)"RRRRRRRRRRRRRRRRRRRRRRRRRRRR"(BSN=27) R=ACK I=NACK TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) DL analysis, range=0:28, lost=0, recv=28, skipped=0, bsn=0, info='RRRRRRRRRRRRRRRRRRRRRRRRRRRR....................................' +../../../src/gprs_rlcmac_meas.cpp:134:49: runtime error: left shift of negative value -998106 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) V(B): (V(A)=28)""(V(S)-1=27) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Final ACK received. TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) changes state from FINISHED to WAIT RELEASE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon May 28 00:14:29 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:14:29 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2239?= Message-ID: <2126944253.204.1527466469597.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 938.87 KB...] Sending "GET 1002 bts.0.location-area-code" Got message: GET_REPLY 1002 bts.0.location-area-code 23 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.location-area-code', 'id': 1002, 'value': '23'}} Sending "SET 1003 bts.0.location-area-code -1" Got message: ERROR 1003 Input not within the range Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Input not within the range'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 bts.0.oml-connection-state 1" Got message: ERROR 1000 Read Only attribute Decoded replies: {1000: {'mtypeok testCtrlErrs (__main__.TestCtrlBSC) ... ok testMcc (__main__.TestCtrlBSC) ... ok testMccMncApply (__main__.TestCtrlBSC) ... ': 'ERROR', 'id': 1000, 'error': 'Read Only attribute'}} Sending "GET 1001 bts.0.oml-connection-state" Got message: GET_REPLY 1001 bts.0.oml-connection-state disconnected Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'bts.0.oml-connection-state', 'id': 1001, 'value': 'disconnected'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 invalid" Got message: ERROR 1000 Command not found Decoded replies: {1000: {'mtype': 'ERROR', 'id': 1000, 'error': 'Command not found'}} Sending "SET 1001 rf_locked 999" Got message: ERROR 1001 Value failed verification. Decoded replies: {1001: {'mtype': 'ERROR', 'id': 1001, 'error': 'Value failed verification.'}} Sending "GET 1002 bts" Got message: ERROR 1002 Error while parsing the index. Decoded replies: {1002: {'mtype': 'ERROR', 'id': 1002, 'error': 'Error while parsing the index.'}} Sending "GET 1003 bts.999" Got message: ERROR 1003 Error while resolving object Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Error while resolving object'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 mcc 23" Got message: SET_REPLY 1000 mcc 023 Decoded replies: {1000: {'mtype': 'SET_REPLY', 'var': 'mcc', 'id': 1000, 'value': '023'}} Sending "GET 1001 mcc" Got message: GET_REPLY 1001 mcc 023 Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1001, 'value': '023'}} Sending "SET 1002 mcc 023" Got message: SET_REPLY 1002 mcc 023 Decoded replies: {1002: {'mtype': 'SET_REPLY', 'var': 'mcc', 'id': 1002, 'value': '023'}} Sending "GET 1003 mcc" Got message: GET_REPLY 1003 mcc 023 Decoded replies: {1003: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1003, 'value': '023'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 mcc-mnc-apply WRONG" Got message: ERROR 1000 Value failed verification. Decoded replies: {1000: {'mtype': 'ERROR', 'id': 1000, 'error': 'Value failed verification.'}} Sending "SET 1001 mcc-mnc-apply 1," Got message: ERROR 1001 Value failed verification. Decoded replies: {1001: {'mtype': 'ERROR', 'id': 1001, 'error': 'Value failed verification.'}} Sending "SET 1002 mcc-mnc-apply 200,3" Got message: SET_REPLY 1002 mcc-mnc-apply Tried to drop the BTS Decoded replies: {1002: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1002, 'value': 'Tried to drop the BTS'}} Sending "SET 1003 mcc-mnc-apply 200,3" Got message: SET_REPLY 1003 mcc-mnc-apply Nothing changed Decoded replies: {1003: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1003, 'value': 'Nothing changed'}} Sending "SET 1004 mcc-mnc-apply 200,4" Got message: SET_REPLY 1004 mcc-mnc-apply Tried to drop the BTS Decoded replies: {1004: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1004, 'value': 'Tried to drop the BTS'}} Sending "SET 1005 mcc-mnc-apply 201,4" Got message: SET_REPLY 1005 mcc-mnc-apply Tried to drop the BTS Decoded replies: {1005: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1005, 'value': 'Tried to drop the BTS'}} Sending "GET 1006 mnc" Got message: GET_REPLY 1006 mnc 04 Decoded replies: {1006: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1006, 'value': '04'}} Sending "GET 1007 mcc" Got message: GET_REPLY 1007 mcc 201 Decoded replies: {1007: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1007, 'value': '201'}} Sending "SET 1008 mcc-mnc-apply 202,03" Got message: SET_REPLY 1008 mcc-mnc-apply Tried to drop the BTS Decoded replies: {1008: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1008, 'value': 'Tried to drop the BTS'}} Sending "GET 1ok testMnc (__main__.TestCtrlBSC) ... ok testRfLock (__main__.TestCtrlBSC) ... 009 mnc" Got message: GET_REPLY 1009 mnc 03 Decoded replies: {1009: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1009, 'value': '03'}} Sending "GET 1010 mcc" Got message: GET_REPLY 1010 mcc 202 Decoded replies: {1010: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1010, 'value': '202'}} Sending "SET 1011 mcc-mnc-apply 2,003" Got message: SET_REPLY 1011 mcc-mnc-apply Tried to drop the BTS Decoded replies: {1011: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1011, 'value': 'Tried to drop the BTS'}} Sending "GET 1012 mnc" Got message: GET_REPLY 1012 mnc 003 Decoded replies: {1012: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1012, 'value': '003'}} Sending "GET 1013 mcc" Got message: GET_REPLY 1013 mcc 002 Decoded replies: {1013: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1013, 'value': '002'}} Sending "SET 1014 mcc-mnc-apply 2,003" Got message: SET_REPLY 1014 mcc-mnc-apply Nothing changed Decoded replies: {1014: {'mtype': 'SET_REPLY', 'var': 'mcc-mnc-apply', 'id': 1014, 'value': 'Nothing changed'}} Sending "GET 1015 mnc" Got message: GET_REPLY 1015 mnc 003 Decoded replies: {1015: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1015, 'value': '003'}} Sending "GET 1016 mcc" Got message: GET_REPLY 1016 mcc 002 Decoded replies: {1016: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1016, 'value': '002'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 mnc 9" Got message: SET_REPLY 1000 mnc 09 Decoded replies: {1000: {'mtype': 'SET_REPLY', 'var': 'mnc', 'id': 1000, 'value': '09'}} Sending "GET 1001 mnc" Got message: GET_REPLY 1001 mnc 09 Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1001, 'value': '09'}} Sending "SET 1002 mnc 09" Got message: SET_REPLY 1002 mnc 09 Decoded replies: {1002: {'mtype': 'SET_REPLY', 'var': 'mnc', 'id': 1002, 'value': '09'}} Sending "GET 1003 mnc" Got message: GET_REPLY 1003 mnc 09 Decoded replies: {1003: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1003, 'value': '09'}} Sending "SET 1004 mnc 009" Got message: SET_REPLY 1004 mnc 009 Decoded replies: {1004: {'mtype': 'SET_REPLY', 'var': 'mnc', 'id': 1004, 'value': '009'}} Sending "GET 1005 mnc" Got message: GET_REPLY 1005 mnc 009 Decoded replies: {1005: {'mtype': 'GET_REPLY', 'var': 'mnc', 'id': 1005, 'value': '009'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.rf_state" Got message: GET_REPLY 1000 bts.0.rf_state inoperational,unlocked,on Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'bts.0.rf_state', 'id': 1000, 'value': 'inoperational,unlocked,on'}} Sending "SET 1001 rf_locked 1" Got message: SET_REPLY 1001 rf_locked 1 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'rf_locked', 'id': 1001, 'value': '1'}} Sending "GET 1002 bts.0.rf_state" Got message: GET_REPLY 1002 bts.0.rf_state inoperational,locked,off Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.rf_state', 'id': 1002, 'value': 'inoperational,locked,off'}} Sending "GET 1003 rf_locked" Got message: GET_REPLY 1003 rf_locked state=off,policy=off Decoded replies: {1003: {'mtype': 'GET_REPLY', 'var': 'rf_locked', 'id': 1003, 'value': 'state=off,policy=off'}} Sending "SET 1004 rf_locked 0" Got message: SET_REPLY 1004 rf_locked 0 Decoded replies: {1004: {'mtype': 'SET_REPLY', 'var': 'rf_locked', 'id': 1004, 'value': '0'}} Sending "GET 1005 bts.0.rf_state" Got message: GET_REPLY 1005 bts.0.rf_state inoperational,unlocked,on Decoded replies: {1005: {'mtype': 'GET_REPLY', 'var': 'bts.0.rf_state', 'id': 1005, 'value': 'inoperational,unlocked,on'}} Sending "GET 1006 rf_locked" Got message: GET_REPLY 1006 rf_locked state=off,policy=on Decoded replies: {1006: {'mtype': 'GET_REPLY', 'var': 'rf_locked', 'id': 1006, 'value': 'state=ook testTimezone (__main__.TestCtrlBSC) ... ok testTrxArfcn (__main__.TestCtrlBSC) ... ok testTrxPowerRed (__main__.TestCtrlBSC) ... ff,policy=on'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 timezone" Got message: GET_REPLY 1000 timezone off Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'timezone', 'id': 1000, 'value': 'off'}} Sending "SET 1001 timezone -2,15,2" Got message: SET_REPLY 1001 timezone -2,15,2 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'timezone', 'id': 1001, 'value': '-2,15,2'}} Sending "GET 1002 timezone" Got message: GET_REPLY 1002 timezone -2,15,2 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'timezone', 'id': 1002, 'value': '-2,15,2'}} Sending "SET 1003 timezone -2,15,2,5,6,7" Got message: SET_REPLY 1003 timezone -2,15,2 Decoded replies: {1003: {'mtype': 'SET_REPLY', 'var': 'timezone', 'id': 1003, 'value': '-2,15,2'}} Sending "SET 1004 timezone -2,15" Got message: ERROR 1004 The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2 Decoded replies: {1004: {'mtype': 'ERROR', 'id': 1004, 'error': "The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2"}} Sending "SET 1005 timezone -2" Got message: ERROR 1005 The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2 Decoded replies: {1005: {'mtype': 'ERROR', 'id': 1005, 'error': "The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2"}} Sending "SET 1006 timezone 1" Got message: ERROR 1006 The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2 Decoded replies: {1006: {'mtype': 'ERROR', 'id': 1006, 'error': "The format is ,, or 'off' where -19 <= hours <= 19, mins in {0, 15, 30, 45}, and 0 <= dst <= 2"}} Sending "SET 1007 timezone off" Got message: SET_REPLY 1007 timezone off Decoded replies: {1007: {'mtype': 'SET_REPLY', 'var': 'timezone', 'id': 1007, 'value': 'off'}} Sending "GET 1008 timezone" Got message: GET_REPLY 1008 timezone off Decoded replies: {1008: {'mtype': 'GET_REPLY', 'var': 'timezone', 'id': 1008, 'value': 'off'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.trx.0.arfcn" Got message: GET_REPLY 1000 bts.0.trx.0.arfcn 871 Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'bts.0.trx.0.arfcn', 'id': 1000, 'value': '871'}} Sending "SET 1001 bts.0.trx.0.arfcn 873" Got message: SET_REPLY 1001 bts.0.trx.0.arfcn 873 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'bts.0.trx.0.arfcn', 'id': 1001, 'value': '873'}} Sending "GET 1002 bts.0.trx.0.arfcn" Got message: GET_REPLY 1002 bts.0.trx.0.arfcn 873 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.trx.0.arfcn', 'id': 1002, 'value': '873'}} Sending "SET 1003 bts.0.trx.0.arfcn 2000" Got message: ERROR 1003 Input not within the range Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Input not within the range'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.19-1c9b8/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.19-1c9b8/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.trx.0.max-power-reduction" Got message: GET_REPLY 1000 bts.0.trx.0.max-power-reduction 20 Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'bts.0.trx.0.max-power-reduction', 'id': 1000, 'value': '20'}} Sending "SET 1001 bts.0.trx.0.max-power-reduction 22" Got message: SET_REPLY 1001 bts.0.trx.0.max-power-reduction 22 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'bts.0.trx.0.max-power-reduction', 'id': 1001, 'value': '22'}} Sending "GET 1002 bts.0.trx.0ERROR ====================================================================== ERROR: testTrxPowerRed (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 151, in tearDown OSError: [Errno 2] No such file or directory: 'tmp_dummy_sock' ---------------------------------------------------------------------- Ran 13 tests in 73.365s FAILED (errors=1) .max-power-reduction" Got message: GET_REPLY 1002 bts.0.trx.0.max-power-reduction 22 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.trx.0.max-power-reduction', 'id': 1002, 'value': '22'}} Sending "SET 1003 bts.0.trx.0.max-power-reduction 1" Got message: ERROR 1003 Value must be even Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Value must be even'}} Terminating took 2.679s Makefile:683: recipe for target 'python-tests' failed make[6]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build/tests' make[6]: *** [python-tests] Error 1 make[5]: *** [check-local] Error 2 Makefile:702: recipe for target 'check-local' failed make[5]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build/tests' make[4]: *** [check-am] Error 2 Makefile:545: recipe for target 'check-am' failed make[4]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build/tests' Makefile:397: recipe for target 'check-recursive' failed make[3]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build/tests' make[3]: *** [check-recursive] Error 1 Makefile:429: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build' make[2]: *** [check-recursive] Error 1 Makefile:720: recipe for target 'check' failed make[1]: Leaving directory '/build/osmo-bsc-1.2.1.19-1c9b8/_build' make[1]: *** [check] Error 2 Makefile:637: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon May 28 00:14:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:14:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_?= =?UTF-8?Q?master,osmocom-master-debian9,lc15,True_#506?= Message-ID: <2065409016.205.1527466476173.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 85.39 KB...] libtool: install: /usr/bin/install -c .libs/osmo-arfcn libtool: install: /usr/bin/install -c .libs/osmo-auc-gen make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' GEN conv/gsm0503_test_vectors.c Generating test vectors... Generate 'xcch' test vector Generate 'rach' test vector Generate 'rach_ext' test vector Generate 'sch' test vector Generate 'cs2' test vector Generate 'cs3' test vector Generate 'cs2_np' test vector Generate 'cs3_np' test vector Generate 'tch_afs_12_2' test vector Generate 'tch_afs_10_2' test vector Generate 'tch_afs_7_95' test vector Generate 'tch_afs_7_4' test vector Generate 'tch_afs_6_7' test vector Generate 'tch_afs_5_9' test vector Generate 'tch_afs_5_15' test vector Generate 'tch_afs_4_75' test vector Generate 'tch_fr' test vector Generate 'tch_hr' test vector Generate 'tch_ahs_7_95' test vector Generate 'tch_ahs_7_4' test vector Generate 'tch_ahs_6_7' test vector Generate 'tch_ahs_5_9' test vector Generate 'tch_ahs_5_15' test vector Generate 'tch_ahs_4_75' test vector Generate 'mcs1_dl_hdr' test vector Generate 'mcs1_ul_hdr' test vector Generate 'mcs1' test vector Generate 'mcs2' test vector Generate 'mcs3' test vector Generate 'mcs4' test vector Generate 'mcs5_dl_hdr' test vector Generate 'mcs5_ul_hdr' test vector Generate 'mcs5' test vector Generate 'mcs6' test vector Generate 'mcs7_dl_hdr' test vector Generate 'mcs7_ul_hdr' test vector Generate 'mcs7' test vector Generate 'mcs8' test vector Generate 'mcs9' test vector Generation complete. make install-am make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc libosmogb.pc libosmoctrl.pc libosmocoding.pc libosmosim.pc ' /usr/bin/install -c osmo-release.sh ' /usr/bin/install -c -m 644 osmo-release.mk ' make install-data-hook make[4]: Entering directory ' make[4]: Nothing to be done for 'install-data-hook'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' + STOW_DIR= stow --restow libosmocore + export PKG_CONFIG_PATH=: + export LD_LIBRARY_PATH= + set +x =============================== osmo-pcu =============================== + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, '.'. libtoolize: copying file './ltmain.sh' libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. configure.ac:21: installing './compile' configure.ac:24: installing './config.guess' configure.ac:24: installing './config.sub' configure.ac:9: installing './install-sh' configure.ac:9: installing './missing' src/Makefile.am: installing './depcomp' tests/Makefile.am:13: warning: source file 'alloc/AllocTest.cpp' is in a subdirectory, tests/Makefile.am:13: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. tests/Makefile.am:21: warning: source file 'alloc/MslotTest.cpp' is in a subdirectory, tests/Makefile.am:21: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file 'bitcomp/BitcompTest.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:38: warning: source file '../src/egprs_rlc_compression.cpp' is in a subdirectory, tests/Makefile.am:38: but option 'subdir-objects' is disabled tests/Makefile.am:97: warning: source file 'codel/codel_test.c' is in a subdirectory, tests/Makefile.am:97: but option 'subdir-objects' is disabled tests/Makefile.am:44: warning: source file 'edge/EdgeTest.cpp' is in a subdirectory, tests/Makefile.am:44: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/pcu_emu.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_replay_gprs_attach.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/openbsc_clone.c' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:52: warning: source file 'emu/test_pdp_activation.cpp' is in a subdirectory, tests/Makefile.am:52: but option 'subdir-objects' is disabled tests/Makefile.am:103: warning: source file 'fn/FnTest.cpp' is in a subdirectory, tests/Makefile.am:103: but option 'subdir-objects' is disabled tests/Makefile.am:81: warning: source file 'llc/LlcTest.cpp' is in a subdirectory, tests/Makefile.am:81: but option 'subdir-objects' is disabled tests/Makefile.am:92: warning: source file 'llist/LListTest.cpp' is in a subdirectory, tests/Makefile.am:92: but option 'subdir-objects' is disabled tests/Makefile.am:70: warning: source file 'ms/MsTest.cpp' is in a subdirectory, tests/Makefile.am:70: but option 'subdir-objects' is disabled tests/Makefile.am:7: warning: source file 'rlcmac/RLCMACTest.cpp' is in a subdirectory, tests/Makefile.am:7: but option 'subdir-objects' is disabled tests/Makefile.am:29: warning: source file 'tbf/TbfTest.cpp' is in a subdirectory, tests/Makefile.am:29: but option 'subdir-objects' is disabled tests/Makefile.am:62: warning: source file 'types/TypesTest.cpp' is in a subdirectory, tests/Makefile.am:62: but option 'subdir-objects' is disabled + ./configure --enable-lc15bts-phy --with-litecell15= --enable-vty-tests checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for a working dd... /bin/dd checking how to truncate binary pipes... /bin/dd bs=4096 count=1 checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes checking how to run the C++ preprocessor... g++ -E checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC -DPIC checking if g++ PIC flag -fPIC -DPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking if g++ supports -c -o file.o... (cached) yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking for LIBOSMOCORE... no configure: error: Package requirements (libosmocore >= 0.11.0) were not met: Package libosmocore was not found in the pkg-config search path. Perhaps you should add the directory containing `libosmocore.pc' to the PKG_CONFIG_PATH environment variable Package 'libosmocore', required by 'world', not found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBOSMOCORE_CFLAGS and LIBOSMOCORE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon May 28 00:14:36 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:14:36 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-msc_=C2=BB_--enable-?= =?UTF-8?Q?iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3655?= Message-ID: <1013843163.206.1527466476234.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 5.01 KB...] > git rev-list --no-walk defc3c8caf518306637ac579ec9b856f50dbb8ec # timeout=10 [osmocom-master-debian9] $ /bin/sh -xe /tmp/jenkins4713616175668694285.sh + ARTIFACT_STORE=/home/osmocom-build/jenkins_build_artifact_store + mkdir -p /home/osmocom-build/jenkins_build_artifact_store + docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store -e JOB_NAME=master-osmo-msc/IU=--enable-iu,a2=default,a3=default,label=osmocom-master-debian9 -e MAKE=make -e PARALLEL_MAKE=-j 8 -e IU=--enable-iu -e PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin -e OSMOPY_DEBUG_TCP_SOCKETS=1 -w /build -u build -v :/build -v /home/osmocom-build/bin:/build_bin -v /home/osmocom-build/jenkins_build_artifact_store:/artifact_store osmocom:amd64 /build/contrib/jenkins.sh + base=/build + deps=/build/deps + inst=/build/deps/install + export deps inst + osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf Skipping repository deps/osmo-iuh Skipping repository deps/libsmpp34 Skipping repository deps/libasn1c Skipping repository deps/libosmo-sccp Skipping repository deps/osmo-mgw Skipping repository deps/libosmocore Skipping repository deps/libosmo-abis Skipping repository deps/libosmo-netif + [ -d /build/deps ] + git_clean /build/deps/libasn1c + repos=/build/deps/libasn1c + [ ! -d /build/deps/libasn1c ] + [ ! -d /build/deps/libasn1c/.git ] + git -C /build/deps/libasn1c checkout -f HEAD + git -C /build/deps/libasn1c clean -dxf + git_clean /build/deps/libosmo-abis + repos=/build/deps/libosmo-abis + [ ! -d /build/deps/libosmo-abis ] + [ ! -d /build/deps/libosmo-abis/.git ] + git -C /build/deps/libosmo-abis checkout -f HEAD + git -C /build/deps/libosmo-abis clean -dxf + git_clean /build/deps/libosmo-netif + repos=/build/deps/libosmo-netif + [ ! -d /build/deps/libosmo-netif ] + [ ! -d /build/deps/libosmo-netif/.git ] + git -C /build/deps/libosmo-netif checkout -f HEAD + git -C /build/deps/libosmo-netif clean -dxf + git_clean /build/deps/libosmo-sccp + repos=/build/deps/libosmo-sccp + [ ! -d /build/deps/libosmo-sccp ] + [ ! -d /build/deps/libosmo-sccp/.git ] + git -C /build/deps/libosmo-sccp checkout -f HEAD + git -C /build/deps/libosmo-sccp clean -dxf + git_clean /build/deps/libosmocore + repos=/build/deps/libosmocore + [ ! -d /build/deps/libosmocore ] + [ ! -d /build/deps/libosmocore/.git ] + git -C /build/deps/libosmocore checkout -f HEAD + git -C /build/deps/libosmocore clean -dxf + git_clean /build/deps/libsmpp34 + repos=/build/deps/libsmpp34 + [ ! -d /build/deps/libsmpp34 ] + [ ! -d /build/deps/libsmpp34/.git ] + git -C /build/deps/libsmpp34 checkout -f HEAD + git -C /build/deps/libsmpp34 clean -dxf + git_clean /build/deps/osmo-iuh + repos=/build/deps/osmo-iuh + [ ! -d /build/deps/osmo-iuh ] + [ ! -d /build/deps/osmo-iuh/.git ] + git -C /build/deps/osmo-iuh checkout -f HEAD + git -C /build/deps/osmo-iuh clean -dxf + git_clean /build/deps/osmo-mgw + repos=/build/deps/osmo-mgw + [ ! -d /build/deps/osmo-mgw ] + [ ! -d /build/deps/osmo-mgw/.git ] + git -C /build/deps/osmo-mgw checkout -f HEAD + git -C /build/deps/osmo-mgw clean -dxf + [ -d layer1-headers ] + mkdir /build/deps mkdir: cannot create directory '/build/deps': File exists + true + osmo-build-dep.sh libosmocore '' ac_cv_path_DOXYGEN=false =============================== libosmocore =============================== + mkdir -p /build/deps + cd /build/deps + osmo-deps.sh libosmocore + project=libosmocore + branch=master + git branch -a + grep -c remotes/origin/master$ + [ x1 != x0 ] + branch=origin/master + test -d libosmocore + cd libosmocore + git fetch --tags origin + git fetch origin + deps= osmo-clean-workspace.sh + chmod -R +w . + git checkout -f HEAD + git clean -dxf + [ -d ] + [ -d layer1-headers ] + git checkout -f origin/master HEAD is now at b662b36... add gsm0808_create_handover_request_ack() + git rev-parse HEAD b662b36da0bd3bd6ccad65e1614df1466a30d20d + cd libosmocore + mkdir -p /build/deps/install/stow + autoreconf --install --force libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `.'. libtoolize: copying file `./ltmain.sh' libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'. libtoolize: copying file `m4/libtool.m4' libtoolize: copying file `m4/ltoptions.m4' libtoolize: copying file `m4/ltsugar.m4' libtoolize: copying file `m4/ltversion.m4' libtoolize: copying file `m4/lt~obsolete.m4' configure.ac:21: installing './compile' configure.ac:23: installing './config.guess' configure.ac:23: installing './config.sub' configure.ac:8: installing './install-sh' configure.ac:8: installing './missing' src/Makefile.am: installing './depcomp' + ./configure --prefix=/build/deps/install/stow/libosmocore ac_cv_path_DOXYGEN=false checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether make supports nested variables... (cached) yes checking whether make sets $(MAKE)... (cached) yes checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... gcc3 checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking how to print strings... printf checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for fgrep... /bin/grep -F checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B checking the name lister (/usr/bin/nm -B) interface... BSD nm checking whether ln -s works... yes checking the maximum length of command line arguments... 1572864 checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... yes checking how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu format... func_convert_file_noop checking how to convert x86_64-unknown-linux-gnu file names to toolchain format... func_convert_file_noop checking for /usr/bin/ld option to reload object files... -r checking for objdump... objdump checking how to recognize dependent libraries... pass_all checking for dlltool... no checking how to associate runtime and link libraries... printf %s\n checking for ar... ar checking for archiver @FILE support... @ checking for strip... strip checking for ranlib... ranlib checking command to parse /usr/bin/nm -B output from gcc object... ok checking for sysroot... no checking for mt... mt checking if mt is a manifest tool... no checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking for dlfcn.h... yes checking for objdir... .libs checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC -DPIC checking if gcc PIC flag -fPIC -DPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking if gcc supports -c -o file.o... (cached) yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... no checking for pkg-config... /usr/bin/pkg-config checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.20... yes checking for ANSI C header files... (cached) yes checking execinfo.h usability... yes checking execinfo.h presence... yes checking for execinfo.h... yes checking sys/select.h usability... yes checking sys/select.h presence... yes checking for sys/select.h... yes checking sys/socket.h usability... yes checking sys/socket.h presence... yes checking for sys/socket.h... yes checking sys/timerfd.h usability... yes checking sys/timerfd.h presence... yes checking for sys/timerfd.h... yes checking syslog.h usability... yes checking syslog.h presence... yes checking for syslog.h... yes checking ctype.h usability... yes checking ctype.h presence... yes checking for ctype.h... yes checking netinet/tcp.h usability... yes checking netinet/tcp.h presence... yes checking for netinet/tcp.h... yes checking for size_t... yes checking for working alloca.h... yes checking for alloca... yes checking for library containing dlopen... -ldl checking for library containing dlsym... -ldl checking for backtrace in -lexecinfo... no checking for doxygen... (cached) false checking whether SYS_getrandom is declared... no checking if gcc supports -fvisibility=hidden... yes checking whether struct tm has tm_gmtoff member... yes checking for TALLOC... yes checking for PCSC... yes checking for LIBGNUTLS... yes checking whether C compiler accepts -mavx2... yes checking whether C compiler accepts -mssse3... yes checking whether C compiler accepts -msse4.1... yes checking whether gcc has __builtin_cpu_supports built-in... yes CFLAGS="-g -O2 -DBUILDING_LIBOSMOCORE -Wall" CPPFLAGS=" -DBUILDING_LIBOSMOCORE -Wall" checking that generated files are newer than configure... done configure: creating ./config.status ./configure: line 14638: ./config.status: No such file or directory ./configure: line 14749: conf1018subs.sh: No such file or directory configure: error: could not make ./config.status Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Mon May 28 00:17:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:17:06 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2240?= In-Reply-To: <2126944253.204.1527466469597.JavaMail.jenkins@jenkins.osmocom.org> References: <2126944253.204.1527466469597.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <556661631.207.1527466626763.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon May 28 00:57:19 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 00:57:19 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-msc_=C2=BB_--ena?= =?UTF-8?Q?ble-iu,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#3656?= In-Reply-To: <1013843163.206.1527466476234.JavaMail.jenkins@jenkins.osmocom.org> References: <1013843163.206.1527466476234.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <2109119708.208.1527469039967.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon May 28 07:34:38 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 07:34:38 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#507?= In-Reply-To: <1961516864.203.1527466429242.JavaMail.jenkins@jenkins.osmocom.org> References: <1961516864.203.1527466429242.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <756783485.218.1527492878507.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Mon May 28 07:36:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 07:36:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,lc15,True_#507?= In-Reply-To: <2065409016.205.1527466476173.JavaMail.jenkins@jenkins.osmocom.org> References: <2065409016.205.1527466476173.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1638604153.219.1527492999726.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Mon May 28 08:12:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 08:12:02 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9345 Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... osmo-bsc: Don't try to package anything bsc-nat related osmo-bsc_nat has been fully removed from osmo-bsc.git Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 --- M recipes-osmocom/osmo-bsc/osmo-bsc.inc 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/45/9345/1 diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index f20362f..d066a58 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -14,12 +14,11 @@ install -d ${D}${sysconfdir}/osmocom/ install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ "osmo-bsc-nat-doc osmo-bsc-nat meas-utils ipaccess-utils bs11-utils abisip-find" +PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service" @@ -43,11 +42,3 @@ ${bindir}/osmo-meas-pcap2db \ ${bindir}/meas_json \ " - -FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " -CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" - -FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat " -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newchange Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 08:13:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 08:13:38 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9345 ) Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... Patch Set 1: Code-Review+2 untested so far -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 28 May 2018 08:13:38 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 08:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 May 2018 08:23:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: check channel mode in f_establish_fully In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9231 to look at the new patch set (#3). Change subject: MSC_ConnectionHandler: check channel mode in f_establish_fully ...................................................................... MSC_ConnectionHandler: check channel mode in f_establish_fully The helper function f_establish_fully() checks the channel type for compatibility. If the channel type is compatible with the desired mode a channel mode modification could be necessary if the current channel mode is different from the desired channel mode. However, this is not checked at the momemend. We just blindly expect a MODE MODIFY message from the BSC and ignore the cases where the current channel mode and the desired channel mode already matches up. This is the case if only a signalling channel is requested with f_establish_fully for example. - Check if the channel mode of the current channel and the desired channel mode match up. - Make sure that the MODE MODIFY from the BSC is only expected when the channel modes are different. Note: The function f_channel_needs_modify() that is used to determine if a channel modification is needed or not does not cover all cases yet. (see fixme note) Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Closes: OS#2762 Related: OS#2936 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 51 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/9231/3 -- To view, visit https://gerrit.osmocom.org/9231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Gerrit-Change-Number: 9231 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 08:23:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 May 2018 08:23:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix TC_ciph_mode_a5_{0, 1, 3} In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9232 to look at the new patch set (#3). Change subject: BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} ...................................................................... BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} The helper function f_tc_ciph_mode_a5(), thich performs all of the three tests currently disables the ASSIGNMENT COMMAND since due to a bug in OsmoBSC a MODE MODIFY would be attempted by the BSC, causing the testcase to fail. The problem in OsmoBSC is now fixed and the ASSIGNMENT COMMAND can be re-enabled again for this test. However, the test function includes and expects an AoIP transport layer address, which is not included for signalling assignments. - Make sure no AoIP transport identifier is included in ths ASSIGNMENT COMMAND - Do not expect an AoIP transport identifier in the ASSIGNMENT COMPLETE from the BSC - Re-Enable the generation of the ASSIGNMENT COMMAND Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Closes: OS#2936 --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/9232/3 -- To view, visit https://gerrit.osmocom.org/9232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Gerrit-Change-Number: 9232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 08:53:50 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 08:53:50 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9345 ) Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 08:53:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:00:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:00:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: check channel mode in f_establish_fully In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9231 ) Change subject: MSC_ConnectionHandler: check channel mode in f_establish_fully ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Gerrit-Change-Number: 9231 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 09:00:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:01:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:01:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix TC_ciph_mode_a5_{0, 1, 3} In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9232 ) Change subject: BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Gerrit-Change-Number: 9232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 09:01:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:01:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:01:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: MSC_ConnectionHandler: check channel mode in f_establish_fully In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9231 ) Change subject: MSC_ConnectionHandler: check channel mode in f_establish_fully ...................................................................... MSC_ConnectionHandler: check channel mode in f_establish_fully The helper function f_establish_fully() checks the channel type for compatibility. If the channel type is compatible with the desired mode a channel mode modification could be necessary if the current channel mode is different from the desired channel mode. However, this is not checked at the momemend. We just blindly expect a MODE MODIFY message from the BSC and ignore the cases where the current channel mode and the desired channel mode already matches up. This is the case if only a signalling channel is requested with f_establish_fully for example. - Check if the channel mode of the current channel and the desired channel mode match up. - Make sure that the MODE MODIFY from the BSC is only expected when the channel modes are different. Note: The function f_channel_needs_modify() that is used to determine if a channel modification is needed or not does not cover all cases yet. (see fixme note) Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Closes: OS#2762 Related: OS#2936 --- M bsc/MSC_ConnectionHandler.ttcn 1 file changed, 51 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 991a693..1a5bed9 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -674,6 +674,41 @@ return false; } +/* Determine if the channel mode specified within rsl_chan_nr requires a + * MODE MODIFY in to match the channel mode specified by given BSSMAP + * ChannelType */ +function f_channel_needs_modify(BSSMAP_IE_ChannelType bssmap, RslChannelNr rsl_chan_nr) +return boolean { + + /* FIXME: This tests the rsl_chan_nr to determine if we are on a + * signalling channel or not. Unfortunately this may lead to false + * results if we are on a TCH. The problem is that a TCH may be also + * used in signalling mode, but this function assumes that only SDCCH4 + * and SDCCH8 are used as signalling channels at all. */ + + var boolean current_signalling := false; + var boolean desired_signalling := false; + + select (rsl_chan_nr) { + case (t_RslChanNr_SDCCH4(?, ?)) { current_signalling := true; } + case (t_RslChanNr_SDCCH8(?, ?)) { current_signalling := true; } + } + + if (bssmap.speechOrDataIndicator == '0011'B) { + desired_signalling := true; + } + + if (current_signalling == desired_signalling) { + /* The desired channel mode is equal to the one we currently + * have, there is no mode modification needed or expected */ + return false; + } else { + /* The desired channel mode and the current channel mode do + * not match. A mode modification is required */ + return true; + } +} + /* establish a channel fully, expecting an assignment matching 'exp' */ function f_establish_fully(template (omit) PDU_BSSAP ass_tpl, template PDU_BSSAP exp_ass_cpl) runs on MSC_ConnHdlr { @@ -698,6 +733,7 @@ timer T := 10.0; var boolean exp_compl := ischosen(exp_ass_cpl.pdu.bssmap.assignmentComplete); var boolean exp_fail := ischosen(exp_ass_cpl.pdu.bssmap.assignmentFailure); + var boolean exp_modify; var ExpectCriteria mgcpcrit := { connid := omit, endpoint := omit, @@ -707,10 +743,22 @@ /* if the channel type is SIGNAL, we're not handling a voice call */ if (ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechOrDataIndicator != '0011'B) { st.voice_call := true; + exp_modify := true; } + /* determine if the current channel can support the given service or not */ if (not f_channel_compatible(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr)) { st.is_assignment := true; + + /* We decided to assign a new channel, so we do not expect + * any mode modify messages on RSL */ + exp_modify := false; + } else { + /* We will continue working with the currently assigned + * channel, we must now check if the mode of the current + * channel is compatible. If not we expect the BSC to modify + * the mode */ + exp_modify := f_channel_needs_modify(ass_cmd.pdu.bssmap.assignmentRequest.channelType, g_chan_nr); } f_create_mgcp_expect(mgcpcrit); @@ -722,21 +770,20 @@ [st.is_assignment] as_assignment(st); /* modify related bits */ - [not st.is_assignment] as_modify(st); + [not st.is_assignment and exp_modify] as_modify(st); /* voice call related bits (IPA CRCX/MDCX + MGCP) */ [st.voice_call] as_Media(); /* if we receive exactly what we expected, always return + pass */ - [st.is_assignment and st.assignment_done or - (not st.is_assignment and st.modify_done)] BSSAP.receive(exp_ass_cpl) -> value bssap { + [st.is_assignment and st.assignment_done or (not st.is_assignment and (st.modify_done or not exp_modify))] BSSAP.receive(exp_ass_cpl) -> value bssap { setverdict(pass); } [exp_fail] BSSAP.receive(exp_ass_cpl) -> value bssap { setverdict(pass); } [(st.is_assignment and st.assignment_done or - (not st.is_assignment and st.modify_done)) and + (not st.is_assignment and (st.modify_done or not exp_modify))) and exp_compl] BSSAP.receive(tr_BSSMAP_AssignmentComplete) { setverdict(fail, "Received non-matching ASSIGNMENT COMPLETE"); } -- To view, visit https://gerrit.osmocom.org/9231 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9004f299220b01ecea6b2316ba3f913c316947dc Gerrit-Change-Number: 9231 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:01:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:01:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix TC_ciph_mode_a5_{0, 1, 3} In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9232 ) Change subject: BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} ...................................................................... BSC_Tests: fix TC_ciph_mode_a5_{0,1,3} The helper function f_tc_ciph_mode_a5(), thich performs all of the three tests currently disables the ASSIGNMENT COMMAND since due to a bug in OsmoBSC a MODE MODIFY would be attempted by the BSC, causing the testcase to fail. The problem in OsmoBSC is now fixed and the ASSIGNMENT COMMAND can be re-enabled again for this test. However, the test function includes and expects an AoIP transport layer address, which is not included for signalling assignments. - Make sure no AoIP transport identifier is included in ths ASSIGNMENT COMMAND - Do not expect an AoIP transport identifier in the ASSIGNMENT COMPLETE from the BSC - Re-Enable the generation of the ASSIGNMENT COMMAND Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Closes: OS#2936 --- M bsc/BSC_Tests.ttcn 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 58f2704..0da0a59 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1473,10 +1473,12 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); var PDU_BSSAP ass_cmd := f_gen_ass_req(); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelTypeSIGNAL); + ass_cmd.pdu.bssmap.assignmentRequest.circuitIdentityCode := omit; + ass_cmd.pdu.bssmap.assignmentRequest.aoIPTransportLayer := omit; + exp_compl.pdu.bssmap.assignmentComplete.circuitIdentityCode := omit; + exp_compl.pdu.bssmap.assignmentComplete.aoIPTransportLayer := omit; - // Disable generation of ASSIGNMENT CMD, as OsmoBSC currently performs MODE MODFIY sign->sign (OS#2936) - //f_establish_fully(ass_cmd, exp_compl); - f_establish_fully(omit, exp_compl); + f_establish_fully(ass_cmd, exp_compl); } testcase TC_ciph_mode_a5_0() runs on test_CT { var MSC_ConnHdlr vc_conn; -- To view, visit https://gerrit.osmocom.org/9232 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib39d7dd2d1b3665570d7b287e431d10111316437 Gerrit-Change-Number: 9232 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:19:35 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:19:35 +0000 Subject: Change in osmo-bsc[master]: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9340 ) Change subject: Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL ...................................................................... Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL The bsc_msc_connection dates back to the old pre-libosmo-sigtran days, and 90% of the field members weren't used at all (even the new sigtran specific ones!). Let's merge what remains into struct bsc_msc_data. As a side effect, the already dysfunctional "dest A.B.C.D" VTY command has been removed from the MSC node. There's quite a bit of fall-out in the CTRL interface, which was the code with strongest ties to bsc_msc_connection. This was resolved by properly porting CTRL handling over to libosmo-sigtran, meaning that an IPA/SCCPlite connected MSC can now again send CTRL GET/SET commands, and can also receive those selective few TRAPs that old osmo-bsc-sccplite also sent to its MSC[s]. Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Related: OS#2012 --- M include/osmocom/bsc/Makefile.am D include/osmocom/bsc/bsc_msc.h M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/osmo_bsc_sigtran.h M src/libbsc/Makefile.am D src/libbsc/bsc_msc.c M src/libbsc/bsc_subscr_conn_fsm.c M src/libfilter/bsc_msg_filter.c M src/osmo-bsc/osmo_bsc_api.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_filter.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c M tests/bssap/bssap_test.c 16 files changed, 182 insertions(+), 506 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 80f9b01..bae13f0 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -5,7 +5,6 @@ abis_rsl.h \ acc_ramp.h \ arfcn_range_encode.h \ - bsc_msc.h \ bsc_msg_filter.h \ bsc_rll.h \ bsc_subscriber.h \ diff --git a/include/osmocom/bsc/bsc_msc.h b/include/osmocom/bsc/bsc_msc.h deleted file mode 100644 index ceaea53..0000000 --- a/include/osmocom/bsc/bsc_msc.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Routines to talk to the MSC using the IPA Protocol */ -/* - * (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#ifndef BSC_MSC_H -#define BSC_MSC_H - -#include -#include -#include -#include - -#include - -struct bsc_msc_dest { - struct llist_head list; - - char *ip; - int port; - int dscp; -}; - - -struct bsc_msc_connection { - /* FIXME: Remove stuff that is no longer needed! */ - struct osmo_wqueue write_queue; - int is_connected; - int is_authenticated; - int first_contact; - - struct llist_head *dests; - - const char *name; - - void (*connection_loss) (struct bsc_msc_connection *); - void (*connected) (struct bsc_msc_connection *); - struct osmo_timer_list reconnect_timer; - struct osmo_timer_list timeout_timer; - - struct msgb *pending_msg; - - /* Sigtran connection data */ - struct osmo_sccp_instance *sccp; - struct osmo_sccp_user *sccp_user; - struct osmo_sccp_addr g_calling_addr; - struct osmo_sccp_addr g_called_addr; - struct a_reset_ctx *reset; - - int conn_id_counter; -}; - -struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dest); -int bsc_msc_connect(struct bsc_msc_connection *); -void bsc_msc_schedule_connect(struct bsc_msc_connection *); - -void bsc_msc_lost(struct bsc_msc_connection *); - -struct msgb *bsc_msc_id_get_resp(int fixed, const char *token, const uint8_t *res, int len); - -#endif diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index 2ace178..baa58e7 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -3,6 +3,7 @@ * * (C) 2010-2015 by Holger Hans Peter Freyther * (C) 2010-2015 by On-Waves + * (C) 2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -27,7 +28,6 @@ #ifndef _OSMO_MSC_DATA_H #define _OSMO_MSC_DATA_H -#include "bsc_msc.h" #include "debug.h" #include @@ -75,26 +75,20 @@ /* Connection data */ - struct bsc_msc_connection *msc_con; struct osmo_plmn_id core_plmn; int core_lac; int core_ci; int rtp_base; + bool is_authenticated; /* audio codecs */ struct gsm48_multi_rate_conf amr_conf; struct gsm_audio_support **audio_support; int audio_length; - /* destinations */ - struct llist_head dests; - /* ussd welcome text */ char *ussd_welcome_txt; - /* mgcp agent */ - struct osmo_wqueue mgcp_agent; - int nr; /* ussd msc connection lost text */ diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h index 80d4f5b..bd8b063 100644 --- a/include/osmocom/bsc/osmo_bsc_sigtran.h +++ b/include/osmocom/bsc/osmo_bsc_sigtran.h @@ -41,3 +41,6 @@ /* Send reset-ack to MSC */ void osmo_bsc_sigtran_tx_reset_ack(const struct bsc_msc_data *msc); + +/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg); diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 744278b..d215e14 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -47,7 +47,7 @@ system_information.c \ e1_config.c \ bsc_api.c \ - bsc_msc.c bsc_vty.c \ + bsc_vty.c \ gsm_04_08_utils.c \ gsm_04_80_utils.c \ bsc_init.c \ diff --git a/src/libbsc/bsc_msc.c b/src/libbsc/bsc_msc.c deleted file mode 100644 index 648b3e6..0000000 --- a/src/libbsc/bsc_msc.c +++ /dev/null @@ -1,320 +0,0 @@ -/* Routines to talk to the MSC using the IPA Protocol */ -/* - * (C) 2010 by Holger Hans Peter Freyther - * (C) 2010 by On-Waves - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -static void connection_loss(struct bsc_msc_connection *con) -{ - struct osmo_fd *fd; - - fd = &con->write_queue.bfd; - - if (con->pending_msg) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) dropping incomplete message.\n", con->name); - msgb_free(con->pending_msg); - con->pending_msg = NULL; - } - - close(fd->fd); - fd->fd = -1; - fd->cb = osmo_wqueue_bfd_cb; - fd->when = 0; - - con->is_connected = 0; - con->first_contact = 0; - con->connection_loss(con); -} - -static void msc_con_timeout(void *_con) -{ - struct bsc_msc_connection *con = _con; - - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Connection timeout.\n", con->name); - bsc_msc_lost(con); -} - -/* called in the case of a non blocking connect */ -static int msc_connection_connect(struct osmo_fd *fd, unsigned int what) -{ - int rc; - int val; - struct bsc_msc_connection *con; - struct osmo_wqueue *queue; - - socklen_t len = sizeof(val); - - queue = container_of(fd, struct osmo_wqueue, bfd); - con = container_of(queue, struct bsc_msc_connection, write_queue); - - if ((what & BSC_FD_WRITE) == 0) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Callback but not writable.\n", con->name); - return -1; - } - - /* From here on we will either be connected or reconnect */ - osmo_timer_del(&con->timeout_timer); - - /* check the socket state */ - rc = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &val, &len); - if (rc != 0) { - LOGP(DMSC, LOGL_ERROR, - "getsockopt for the MSC(%s) socket failed.\n", con->name); - goto error; - } - if (val != 0) { - LOGP(DMSC, LOGL_ERROR, - "Not connected to the MSC(%s): %d\n", - con->name, val); - goto error; - } - - - /* go to full operation */ - fd->cb = osmo_wqueue_bfd_cb; - fd->when = BSC_FD_READ | BSC_FD_EXCEPT; - - con->is_connected = 1; - LOGP(DMSC, LOGL_NOTICE, - "(Re)Connected to the MSC(%s).\n", con->name); - if (con->connected) - con->connected(con); - return 0; - -error: - osmo_fd_unregister(fd); - connection_loss(con); - return -1; -} -static void setnonblocking(struct osmo_fd *fd) -{ - int flags; - - flags = fcntl(fd->fd, F_GETFL); - if (flags < 0) { - perror("fcntl get failed"); - close(fd->fd); - fd->fd = -1; - return; - } - - flags |= O_NONBLOCK; - flags = fcntl(fd->fd, F_SETFL, flags); - if (flags < 0) { - perror("fcntl get failed"); - close(fd->fd); - fd->fd = -1; - return; - } -} - -int bsc_msc_connect(struct bsc_msc_connection *con) -{ - struct bsc_msc_dest *dest; - struct osmo_fd *fd; - struct sockaddr_in sin; - int on = 1, ret; - - if (llist_empty(con->dests)) { - LOGP(DMSC, LOGL_ERROR, - "No MSC(%s) connections configured.\n", - con->name); - connection_loss(con); - return -1; - } - - /* TODO: Why are we not using the libosmocore soecket - * abstraction, or libosmo-netif? */ - - /* move to the next connection */ - dest = (struct bsc_msc_dest *) con->dests->next; - llist_del(&dest->list); - llist_add_tail(&dest->list, con->dests); - - LOGP(DMSC, LOGL_NOTICE, - "Attempting to connect MSC(%s) at %s:%d\n", - con->name, dest->ip, dest->port); - - con->is_connected = 0; - - msgb_free(con->pending_msg); - con->pending_msg = NULL; - - fd = &con->write_queue.bfd; - fd->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - fd->priv_nr = 1; - - if (fd->fd < 0) { - perror("Creating TCP socket failed"); - return fd->fd; - } - - /* make it non blocking */ - setnonblocking(fd); - - /* set the socket priority */ - ret = setsockopt(fd->fd, IPPROTO_IP, IP_TOS, - &dest->dscp, sizeof(dest->dscp)); - if (ret != 0) - LOGP(DMSC, LOGL_ERROR, - "Failed to set DSCP to %d on MSC(%s). %s\n", - dest->dscp, con->name, strerror(errno)); - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_port = htons(dest->port); - inet_aton(dest->ip, &sin.sin_addr); - - ret = setsockopt(fd->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (ret != 0) - LOGP(DMSC, LOGL_ERROR, - "Failed to set SO_REUSEADDR socket option\n"); - ret = connect(fd->fd, (struct sockaddr *) &sin, sizeof(sin)); - - if (ret == -1 && errno == EINPROGRESS) { - LOGP(DMSC, LOGL_ERROR, - "MSC(%s) Connection in progress\n", con->name); - fd->when = BSC_FD_WRITE; - fd->cb = msc_connection_connect; - osmo_timer_setup(&con->timeout_timer, msc_con_timeout, con); - osmo_timer_schedule(&con->timeout_timer, 20, 0); - } else if (ret < 0) { - perror("Connection failed"); - connection_loss(con); - return ret; - } else { - fd->when = BSC_FD_READ | BSC_FD_EXCEPT; - fd->cb = osmo_wqueue_bfd_cb; - con->is_connected = 1; - if (con->connected) - con->connected(con); - } - - ret = osmo_fd_register(fd); - if (ret < 0) { - perror("Registering the fd failed"); - close(fd->fd); - return ret; - } - - return ret; -} - -struct bsc_msc_connection *bsc_msc_create(void *ctx, struct llist_head *dests) -{ - struct bsc_msc_connection *con; - - con = talloc_zero(NULL, struct bsc_msc_connection); - if (!con) { - LOGP(DMSC, LOGL_FATAL, "Failed to create the MSC connection.\n"); - return NULL; - } - - con->dests = dests; - con->write_queue.bfd.fd = -1; - con->name = ""; - osmo_wqueue_init(&con->write_queue, 100); - return con; -} - -void bsc_msc_lost(struct bsc_msc_connection *con) -{ - osmo_wqueue_clear(&con->write_queue); - osmo_timer_del(&con->timeout_timer); - osmo_timer_del(&con->reconnect_timer); - - if (con->write_queue.bfd.fd >= 0) - osmo_fd_unregister(&con->write_queue.bfd); - connection_loss(con); -} - -static void reconnect_msc(void *_msc) -{ - struct bsc_msc_connection *con = _msc; - - LOGP(DMSC, LOGL_NOTICE, - "Attempting to reconnect to the MSC(%s).\n", con->name); - bsc_msc_connect(con); -} - -void bsc_msc_schedule_connect(struct bsc_msc_connection *con) -{ - LOGP(DMSC, LOGL_NOTICE, - "Attempting to reconnect to the MSC(%s)\n", con->name); - osmo_timer_setup(&con->reconnect_timer, reconnect_msc, con); - osmo_timer_schedule(&con->reconnect_timer, 5, 0); -} - -struct msgb *bsc_msc_id_get_resp(int fixed, const char *token, const uint8_t *res, int len) -{ - struct msgb *msg; - - if (!token) { - LOGP(DMSC, LOGL_ERROR, "No token specified.\n"); - return NULL; - } - - msg = msgb_alloc_headroom(4096, 128, "id resp"); - if (!msg) { - LOGP(DMSC, LOGL_ERROR, "Failed to create the message.\n"); - return NULL; - } - - /* - * The situation is bizarre. The encoding doesn't follow the - * TLV structure. It is more like a LV and old versions had - * it wrong but we want new versions to old servers so we - * introduce the quirk here. - */ - msg->l2h = msgb_v_put(msg, IPAC_MSGT_ID_RESP); - if (fixed) { - msgb_put_u8(msg, 0); - msgb_put_u8(msg, strlen(token) + 2); - msgb_tv_fixed_put(msg, IPAC_IDTAG_UNITNAME, strlen(token) + 1, (uint8_t *) token); - if (len > 0) { - msgb_put_u8(msg, 0); - msgb_put_u8(msg, len + 1); - msgb_tv_fixed_put(msg, 0x24, len, res); - } - } else { - msgb_l16tv_put(msg, strlen(token) + 1, - IPAC_IDTAG_UNITNAME, (uint8_t *) token); - } - - return msg; -} diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c index 54224f7..89ac482 100644 --- a/src/libbsc/bsc_subscr_conn_fsm.c +++ b/src/libbsc/bsc_subscr_conn_fsm.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c index 120169b..852067e 100644 --- a/src/libfilter/bsc_msg_filter.c +++ b/src/libfilter/bsc_msg_filter.c @@ -23,7 +23,6 @@ #include -#include #include #include #include diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index 8c16bde..8081ea4 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 5f88b85..7891cf4 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -30,30 +30,126 @@ #include #include -#include + +#include + +#include +#include #include #include #include #include -void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_connection *msc_con) +extern struct gsm_network *bsc_gsmnet; + +/* Obtain SS7 application server currently handling given MSC (DPC) */ +static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) +{ + struct osmo_ss7_route *rt; + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(msc->a.sccp); + rt = osmo_ss7_route_lookup(ss7, msc->a.msc_addr.pc); + if (!rt) + return NULL; + return rt->dest.as; +} + + +/* Encode a CTRL command and send it to the given ASP + * \param[in] asp ASP through which we shall send the encoded message + * \param[in] cmd decoded CTRL command to be encoded and sent. Ownership is *NOT* + * transferred, to permit caller to send the same CMD to several ASPs. + * Caller must hence free 'cmd' itself. + * \returns 0 on success; negative on error */ +static int sccplite_asp_ctrl_cmd_send(struct osmo_ss7_asp *asp, struct ctrl_cmd *cmd) +{ + /* this is basically like libosmoctrl:ctrl_cmd_send(), not for a dedicated + * CTRL connection but for the CTRL piggy-back on the IPA/SCCPlite link */ + struct msgb *msg; + + /* don't attempt to send CTRL on a non-SCCPlite ASP */ + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + return 0; + + msg = ctrl_cmd_make(cmd); + if (!msg) + return -1; + + ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); + ipa_prepend_header(msg, IPAC_PROTO_OSMO); + + return osmo_ss7_asp_send(asp, msg); +} + +/* Ownership of 'cmd' is *NOT* transferred, to permit caller to send the same CMD to several ASPs. + * Caller must hence free 'cmd' itself. */ +static int sccplite_msc_ctrl_cmd_send(struct bsc_msc_data *msc, struct ctrl_cmd *cmd) +{ + struct osmo_ss7_as *as; + struct osmo_ss7_asp *asp; + unsigned int i; + + as = msc_get_ss7_as(msc); + if (!as) + return -1; + + /* don't attempt to send CTRL on a non-SCCPlite AS */ + if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) + return 0; + + /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ + for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { + asp = as->cfg.asps[i]; + if (!asp) + continue; + /* FIXME: deal with multiple ASPs per AS */ + return sccplite_asp_ctrl_cmd_send(asp, cmd); + } + return -1; +} + +/* receive + process a CTRL command from the piggy-back on the IPA/SCCPlite link */ +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) +{ + struct ctrl_cmd *cmd; + int rc; + + /* caller has already ensured ipaccess_head + ipaccess_head_ext */ + OSMO_ASSERT(msg->l2h); + + /* prase raw (ASCII) CTRL command into ctrl_cmd */ + cmd = ctrl_cmd_parse2(asp, msg); + OSMO_ASSERT(cmd); + msgb_free(msg); + if (cmd->type == CTRL_TYPE_ERROR) + goto send_reply; + + /* handle the CTRL command */ + ctrl_cmd_handle(bsc_gsmnet->ctrl, cmd, bsc_gsmnet); + +send_reply: + rc = sccplite_asp_ctrl_cmd_send(asp, cmd); + talloc_free(cmd); + return rc; +} + + +void osmo_bsc_send_trap(struct ctrl_cmd *cmd, struct bsc_msc_data *msc_data) { struct ctrl_cmd *trap; struct ctrl_handle *ctrl; - struct bsc_msc_data *msc_data; - msc_data = (struct bsc_msc_data *) msc_con->write_queue.bfd.data; ctrl = msc_data->network->ctrl; trap = ctrl_cmd_trap(cmd); if (!trap) { + LOGP(DCTRL, LOGL_ERROR, "Failed to create trap.\n"); return; } ctrl_cmd_send_to_all(ctrl, trap); - ctrl_cmd_send(&msc_con->write_queue, trap); + sccplite_msc_ctrl_cmd_send(msc_data, trap); talloc_free(trap); } @@ -62,12 +158,21 @@ static int get_msc_connection_status(struct ctrl_cmd *cmd, void *data) { struct bsc_msc_data *msc = (struct bsc_msc_data *)cmd->node; + struct osmo_ss7_as *as; + const char *as_state_name; + if (msc == NULL) { cmd->reply = "msc not found"; return CTRL_CMD_ERROR; } + as = msc_get_ss7_as(msc); + if (!as) { + cmd->reply = "AS not found for MSC"; + return CTRL_CMD_ERROR; + } - if (msc->msc_con->is_connected) + as_state_name = osmo_fsm_inst_state_name(as->fi); + if (!strcmp(as_state_name, "AS_ACTIVE")) cmd->reply = "connected"; else cmd->reply = "disconnected"; @@ -80,14 +185,15 @@ static int get_msc0_connection_status(struct ctrl_cmd *cmd, void *data) { - struct gsm_network *gsmnet = data; - struct bsc_msc_data *msc = osmo_msc_data_find(gsmnet, 0); + struct bsc_msc_data *msc = osmo_msc_data_find(bsc_gsmnet, 0); + void *old_node = cmd->node; + int rc; - if (msc->msc_con->is_connected) - cmd->reply = "connected"; - else - cmd->reply = "disconnected"; - return CTRL_CMD_REPLY; + cmd->node = msc; + rc = get_msc_connection_status(cmd, data); + cmd->node = old_node; + + return rc; } static int msc_connection_status_trap_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -184,12 +290,12 @@ static int get_bts_loc(struct ctrl_cmd *cmd, void *data); -static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_connection *msc_con) +static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_data *msc) { struct ctrl_cmd *cmd; const char *oper, *admin, *policy; - cmd = ctrl_cmd_create(msc_con, CTRL_TYPE_TRAP); + cmd = ctrl_cmd_create(msc, CTRL_TYPE_TRAP); if (!cmd) { LOGP(DCTRL, LOGL_ERROR, "Failed to create TRAP command.\n"); return; @@ -213,7 +319,7 @@ osmo_mnc_name(bts->network->plmn.mnc, bts->network->plmn.mnc_3_digits)); - osmo_bsc_send_trap(cmd, msc_con); + osmo_bsc_send_trap(cmd, msc); talloc_free(cmd); } @@ -222,7 +328,7 @@ struct bsc_msc_data *msc; llist_for_each_entry(msc, &bts->network->bsc_data->mscs, entry) - generate_location_state_trap(bts, msc->msc_con); + generate_location_state_trap(bts, msc); } static int location_equal(struct bts_location *a, struct bts_location *b) @@ -537,7 +643,7 @@ trap->id = "0"; trap->variable = "inform-msc-v1"; trap->reply = talloc_strdup(trap, cmd->value); - ctrl_cmd_send(&msc->msc_con->write_queue, trap); + sccplite_msc_ctrl_cmd_send(msc, trap); talloc_free(trap); } @@ -625,7 +731,7 @@ net = msc->data->network; llist_for_each_entry(bts, &net->bts_list, list) - generate_location_state_trap(bts, msc->data->msc_con); + generate_location_state_trap(bts, msc->data); return 0; } diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c index 5f60989..0d0fc29 100644 --- a/src/osmo-bsc/osmo_bsc_filter.c +++ b/src/osmo-bsc/osmo_bsc_filter.c @@ -161,7 +161,7 @@ round_robin: llist_for_each_entry(msc, &bsc->mscs, entry) { - if (!msc->msc_con->is_authenticated) + if (!msc->is_authenticated) continue; if (!is_emerg && msc->type != MSC_CON_TYPE_NORMAL) continue; diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index db6bcdb..095a07a 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -248,8 +248,6 @@ extern int bsc_shutdown_net(struct gsm_network *net); static void signal_handler(int signal) { - struct bsc_msc_data *msc; - fprintf(stdout, "signal %u received\n", signal); switch (signal) { @@ -270,8 +268,6 @@ case SIGUSR2: if (!bsc_gsmnet->bsc_data) return; - llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) - bsc_msc_lost(msc->msc_con); break; default: break; diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 10f602a..e00c9ef 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -1,6 +1,6 @@ /* * Handle the connection to the MSC. This include ping/timeout/reconnect - * (C) 2008-2009 by Harald Welte + * (C) 2008-2018 by Harald Welte * (C) 2009-2015 by Holger Hans Peter Freyther * (C) 2009-2015 by On-Waves * All Rights Reserved @@ -41,19 +41,12 @@ int osmo_bsc_msc_init(struct bsc_msc_data *data) { - data->msc_con = bsc_msc_create(data, &data->dests); - if (!data->msc_con) { - LOGP(DMSC, LOGL_ERROR, "Creating the MSC network connection failed.\n"); - return -1; - } - /* FIXME: This is a leftover from the old architecture that used * sccp-lite with osmocom specific authentication. Since we now * changed to AoIP the connected status and the authentication * status is managed differently. However osmo_bsc_filter.c still * needs the flags to be set to one. See also: OS#3112 */ - data->msc_con->is_connected = 1; - data->msc_con->is_authenticated = 1; + data->is_authenticated = 1; return 0; } @@ -86,7 +79,6 @@ /* Init back pointer */ msc_data->network = net; - INIT_LLIST_HEAD(&msc_data->dests); msc_data->core_plmn = (struct osmo_plmn_id){ .mcc = GSM_MCC_MNC_INVALID, .mnc = GSM_MCC_MNC_INVALID, diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 2c3507d..c33124f 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -512,3 +513,37 @@ "A-interface: More than one invalid/inclomplete configuration detected, unable to revover - check config file!\n"); return -EINVAL; } + +/* this function receives all messages received on an ASP for a PPID / StreamID that + * libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP */ +int osmo_ss7_asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg) +{ + struct ipaccess_head *iph; + struct ipaccess_head_ext *iph_ext; + + if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { + msgb_free(msg); + return 0; + } + + switch (ppid_mux) { + case IPAC_PROTO_OSMO: + if (msg->len < sizeof(*iph) + sizeof(*iph_ext)) { + LOGP(DMSC, LOGL_ERROR, "The message is too short.\n"); + msgb_free(msg); + return -EINVAL; + } + iph = (struct ipaccess_head *) msg->data; + iph_ext = (struct ipaccess_head_ext *) iph->data; + msg->l2h = iph_ext->data; + switch (iph_ext->proto) { + case IPAC_PROTO_EXT_CTRL: + return bsc_sccplite_rx_ctrl(asp, msg); + } + break; + default: + break; + } + msgb_free(msg); + return 0; /* OSMO_SS7_UNKNOWN? */ +} diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index bda89c1..d1a82ba 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -1,6 +1,7 @@ /* Osmo BSC VTY Configuration */ /* (C) 2009-2015 by Holger Hans Peter Freyther * (C) 2009-2014 by On-Waves + * (C) 2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -105,8 +106,6 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc) { - struct bsc_msc_dest *dest; - vty_out(vty, "msc %d%s", msc->nr, VTY_NEWLINE); if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) vty_out(vty, " core-mobile-network-code %s%s", @@ -154,10 +153,6 @@ } - llist_for_each_entry(dest, &msc->dests, list) - vty_out(vty, " dest %s %d %d%s", dest->ip, dest->port, - dest->dscp, VTY_NEWLINE); - vty_out(vty, " type %s%s", msc->type == MSC_CON_TYPE_NORMAL ? "normal" : "local", VTY_NEWLINE); vty_out(vty, " allow-emergency %s%s", msc->allow_emerg ? @@ -337,58 +332,6 @@ return CMD_ERR_INCOMPLETE; } -DEFUN(cfg_net_msc_dest, - cfg_net_msc_dest_cmd, - "dest A.B.C.D <1-65000> <0-255>", - "Add a destination to a MUX/MSC\n" - "IP Address\n" "Port\n" "DSCP\n") -{ - struct bsc_msc_dest *dest; - struct bsc_msc_data *data = bsc_msc_data(vty); - - dest = talloc_zero(osmo_bsc_data(vty), struct bsc_msc_dest); - if (!dest) { - vty_out(vty, "%%Failed to create structure.%s", VTY_NEWLINE); - return CMD_WARNING; - } - - dest->ip = talloc_strdup(dest, argv[0]); - if (!dest->ip) { - vty_out(vty, "%%Failed to copy dest ip.%s", VTY_NEWLINE); - talloc_free(dest); - return CMD_WARNING; - } - - dest->port = atoi(argv[1]); - dest->dscp = atoi(argv[2]); - llist_add_tail(&dest->list, &data->dests); - return CMD_SUCCESS; -} - -DEFUN(cfg_net_msc_no_dest, - cfg_net_msc_no_dest_cmd, - "no dest A.B.C.D <1-65000> <0-255>", - NO_STR "Remove a destination to a MUX/MSC\n" - "IP Address\n" "Port\n" "DSCP\n") -{ - struct bsc_msc_dest *dest, *tmp; - struct bsc_msc_data *data = bsc_msc_data(vty); - - int port = atoi(argv[1]); - int dscp = atoi(argv[2]); - - llist_for_each_entry_safe(dest, tmp, &data->dests, list) { - if (port != dest->port || dscp != dest->dscp - || strcmp(dest->ip, argv[0]) != 0) - continue; - - llist_del(&dest->list); - talloc_free(dest); - } - - return CMD_SUCCESS; -} - DEFUN(cfg_net_msc_welcome_ussd, cfg_net_msc_welcome_ussd_cmd, "bsc-welcome-text .TEXT", @@ -787,10 +730,12 @@ { struct bsc_msc_data *msc; llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) { - vty_out(vty, "MSC Nr: %d is connected: %d auth: %d.%s", - msc->nr, - msc->msc_con ? msc->msc_con->is_connected : -1, - msc->msc_con ? msc->msc_con->is_authenticated : -1, + vty_out(vty, "%d %s %s ", + msc->a.cs7_instance, + osmo_ss7_asp_protocol_name(msc->a.asp_proto), + osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr)); + vty_out(vty, "%s%s", + osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr), VTY_NEWLINE); } @@ -943,8 +888,6 @@ install_element(MSC_NODE, &cfg_net_bsc_ci_cmd); install_element(MSC_NODE, &cfg_net_bsc_rtp_base_cmd); install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd); - install_element(MSC_NODE, &cfg_net_msc_dest_cmd); - install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_no_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_lost_ussd_cmd); diff --git a/tests/bssap/bssap_test.c b/tests/bssap/bssap_test.c index 00bc64c..c9e7075 100644 --- a/tests/bssap/bssap_test.c +++ b/tests/bssap/bssap_test.c @@ -156,3 +156,7 @@ struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { OSMO_ASSERT(0); } + +int bsc_sccplite_rx_ctrl(struct osmo_ss7_asp *asp, struct msgb *msg) { + OSMO_ASSERT(0); +} -- To view, visit https://gerrit.osmocom.org/9340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f Gerrit-Change-Number: 9340 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:19:38 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 09:19:38 +0000 Subject: Change in osmo-bsc[master]: move 'extern struct gsm_network *bsc_gsmnet" to header file In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9341 ) Change subject: move 'extern struct gsm_network *bsc_gsmnet" to header file ...................................................................... move 'extern struct gsm_network *bsc_gsmnet" to header file It's not a good idea to keep extern declarations copied over half a dozen C files. Let's move it to a header. Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451 --- M include/osmocom/bsc/gsm_data.h M src/libbsc/abis_nm_vty.c M src/libbsc/abis_om2000_vty.c M src/libbsc/bsc_init.c M src/libbsc/bts_ipaccess_nanobts.c M src/osmo-bsc/osmo_bsc_ctrl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/osmo_bsc_vty.c 8 files changed, 8 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 5ba4362..1cf79a5 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1350,6 +1350,8 @@ return 0; } +extern struct gsm_network *bsc_gsmnet; + enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid); const char *bts_gprs_mode_name(enum bts_gprs_mode mode); int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode); diff --git a/src/libbsc/abis_nm_vty.c b/src/libbsc/abis_nm_vty.c index 956d28b..3019eb8 100644 --- a/src/libbsc/abis_nm_vty.c +++ b/src/libbsc/abis_nm_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OML (Netowrk Management) */ -/* (C) 2009-2010 by Harald Welte +/* (C) 2009-2018 by Harald Welte * * All Rights Reserved * @@ -42,8 +42,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node oml_node = { OML_NODE, "%s(oml)# ", diff --git a/src/libbsc/abis_om2000_vty.c b/src/libbsc/abis_om2000_vty.c index b55a6c4..faf39c1 100644 --- a/src/libbsc/abis_om2000_vty.c +++ b/src/libbsc/abis_om2000_vty.c @@ -1,6 +1,6 @@ /* VTY interface for A-bis OM2000 */ -/* (C) 2010-2011 by Harald Welte +/* (C) 2010-2018 by Harald Welte * * All Rights Reserved * @@ -40,8 +40,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static struct cmd_node om2k_node = { OM2K_NODE, "%s(om2k)# ", diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c index 5b157c5..508a7f4 100644 --- a/src/libbsc/bsc_init.c +++ b/src/libbsc/bsc_init.c @@ -1,6 +1,6 @@ /* A hackish minimal BSC (+MSC +HLR) implementation */ -/* (C) 2008-2010 by Harald Welte +/* (C) 2008-2018 by Harald Welte * (C) 2009 by Holger Hans Peter Freyther * All Rights Reserved * @@ -42,9 +42,6 @@ #include #include -/* global pointer to the gsm network data structure */ -extern struct gsm_network *bsc_gsmnet; - /* Callback function for NACK on the OML NM */ static int oml_msg_nack(struct nm_nack_signal_data *nack) { diff --git a/src/libbsc/bts_ipaccess_nanobts.c b/src/libbsc/bts_ipaccess_nanobts.c index 823fd66..843f264 100644 --- a/src/libbsc/bts_ipaccess_nanobts.c +++ b/src/libbsc/bts_ipaccess_nanobts.c @@ -1,6 +1,6 @@ /* ip.access nanoBTS specific code */ -/* (C) 2009-2010 by Harald Welte +/* (C) 2009-2018 by Harald Welte * * All Rights Reserved * @@ -43,8 +43,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - static int bts_model_nanobts_start(struct gsm_network *net); static void bts_model_nanobts_e1line_bind_ops(struct e1inp_line *line); diff --git a/src/osmo-bsc/osmo_bsc_ctrl.c b/src/osmo-bsc/osmo_bsc_ctrl.c index 7891cf4..13cf98d 100644 --- a/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/src/osmo-bsc/osmo_bsc_ctrl.c @@ -41,8 +41,6 @@ #include #include -extern struct gsm_network *bsc_gsmnet; - /* Obtain SS7 application server currently handling given MSC (DPC) */ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index c33124f..608c3fb 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -1,5 +1,5 @@ /* (C) 2017 by sysmocom s.f.m.c. GmbH, Author: Philipp Maier - * (C) 2017 by Harald Welte + * (C) 2017-2018 by Harald Welte * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -34,13 +34,12 @@ #include #include #include +#include /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ static struct llist_head *msc_list; -extern struct gsm_network *bsc_gsmnet; - #define RESET_INTERVAL 1 /* sek */ #define SCCP_MSG_MAXSIZE 1024 #define CS7_POINTCODE_DEFAULT_OFFSET 2 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index d1a82ba..34080c0 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -38,8 +38,6 @@ #define IPA_STR "IP.ACCESS specific\n" -extern struct gsm_network *bsc_gsmnet; - static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) { return bsc_gsmnet->bsc_data; -- To view, visit https://gerrit.osmocom.org/9341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6f643f1393ba0955d9c0cf1cf78d5c604e7b9451 Gerrit-Change-Number: 9341 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:47:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:47:10 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: Increase log level of some messages Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9346 Change subject: acc_ramp: Increase log level of some messages ...................................................................... acc_ramp: Increase log level of some messages Right now, it's impossible to see any ACC Ramping information unless RSL category is set to DEBUG. Barring and Allowing Access Control Class is an important event which should be printed in most cases. Increase log levels of messages printed during some error conditions to be handled as errors. Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 --- M src/libbsc/acc_ramp.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/9346/1 diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c index ff8ff0e..ac9f02d 100644 --- a/src/libbsc/acc_ramp.c +++ b/src/libbsc/acc_ramp.c @@ -46,7 +46,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); } @@ -54,7 +54,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs |= (1 << acc); } @@ -210,7 +210,7 @@ break; case NM_STATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -249,7 +249,7 @@ break; case NM_OPSTATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } -- To view, visit https://gerrit.osmocom.org/9346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 Gerrit-Change-Number: 9346 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:56:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:56:18 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: Increase log level of some messages In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9346 ) Change subject: acc_ramp: Increase log level of some messages ...................................................................... Patch Set 1: This commit should be also backported to openbsc.git. -- To view, visit https://gerrit.osmocom.org/9346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 Gerrit-Change-Number: 9346 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 28 May 2018 09:56:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:16 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:16 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move cleanup log inside cleanup method In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9298 ) Change subject: process: Move cleanup log inside cleanup method ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I72ad453e9dc8340946d7e7d041643fe8ef97439f Gerrit-Change-Number: 9298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 09:59:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:18 +0000 Subject: Change in osmo-gsm-tester[master]: Add option to expect bts/pcu failures and respawn its processes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9299 ) Change subject: Add option to expect bts/pcu failures and respawn its processes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia2a7539f9fad457125ac9b60a52a52999e885ba8 Gerrit-Change-Number: 9299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 09:59:18 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:22 +0000 Subject: Change in osmo-gsm-tester[master]: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9296 ) Change subject: templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface ...................................................................... templates: osmo-bts: Use BTS assigned IP addr to bind CTRL and VTY iface Change-Id: Ib1c3022a6c531ef8c6a5ba31927762806abc37ac --- M src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl M src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl 3 files changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl index 906e7b9..2a1e2d7 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-octphy.cfg.tmpl @@ -12,7 +12,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! - +line vty + bind ${osmo_bts_octphy.addr} +ctrl + bind ${osmo_bts_octphy.addr} +! %for phy in osmo_bts_octphy.phy_list: phy ${loop.index} octphy hw-addr ${phy.hw_addr} diff --git a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl index c9dde86..536e5cb 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-sysmo.cfg.tmpl @@ -12,6 +12,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! +line vty + bind ${osmo_bts_sysmo.addr} +ctrl + bind ${osmo_bts_sysmo.addr} +! phy 0 instance 0 bts 0 diff --git a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl index 1931e9b..d95ca6e 100644 --- a/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bts-trx.cfg.tmpl @@ -15,6 +15,11 @@ ! Level required by ready_for_pcu(): pcu info logging level pcu info ! +line vty + bind ${osmo_bts_trx.addr} +ctrl + bind ${osmo_bts_trx.addr} +! phy 0 osmotrx ip local ${osmo_bts_trx.trx_local_ip} osmotrx ip remote ${osmo_bts_trx.trx_remote_ip} -- To view, visit https://gerrit.osmocom.org/9296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib1c3022a6c531ef8c6a5ba31927762806abc37ac Gerrit-Change-Number: 9296 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:22 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:22 +0000 Subject: Change in osmo-gsm-tester[master]: bsc: Add API to mock BSC RSL IP addr In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9297 ) Change subject: bsc: Add API to mock BSC RSL IP addr ...................................................................... bsc: Add API to mock BSC RSL IP addr Change-Id: I9ca67964e656943b50967a27a88054fd3e484672 --- M src/osmo_gsm_tester/osmo_bsc.py M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py index 2c909bc..323b9ec 100644 --- a/src/osmo_gsm_tester/osmo_bsc.py +++ b/src/osmo_gsm_tester/osmo_bsc.py @@ -31,6 +31,7 @@ process = None bts = None encryption = None + rsl_ip = None mgw = None stp = None @@ -92,6 +93,9 @@ encryption_vty = util.encryption2osmovty(values['bsc']['net']['encryption']) config.overlay(values, dict(bsc=dict(net=dict(encryption=encryption_vty)))) + if self.rsl_ip is not None: + config.overlay(values, dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip)))) + self.dbg('BSC CONFIG:\n' + pprint.pformat(values)) with open(self.config_file, 'w') as f: @@ -105,6 +109,12 @@ def set_encryption(self, val): self.encryption = val + def set_rsl_ip(self, ip_addr): + '''Overwrite RSL IPaddr option sent to all BTS during OML config. Useful + for tests only willing to use osmo-bsc to do the OML setup but using + other external entities to test the RSL path, such as TTCN3 tests.''' + self.rsl_ip = ip_addr + def bts_add(self, bts): self.bts.append(bts) bts.set_bsc(self) diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 71b44cf..814cf97 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -52,6 +52,9 @@ channel allocator ascending rach tx integer 9 rach max transmission 7 +% if bsc.net.get('rsl_ip', False): + ip.access rsl-ip ${bsc.net.rsl_ip} +% endif ip.access unit_id ${bts.ipa_unit_id} 0 oml ip.access stream_id ${bts.stream_id} line 0 % if bts.get('sgsn', False): -- To view, visit https://gerrit.osmocom.org/9297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9ca67964e656943b50967a27a88054fd3e484672 Gerrit-Change-Number: 9297 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:23 +0000 Subject: Change in osmo-gsm-tester[master]: process: Move cleanup log inside cleanup method In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9298 ) Change subject: process: Move cleanup log inside cleanup method ...................................................................... process: Move cleanup log inside cleanup method Change-Id: I72ad453e9dc8340946d7e7d041643fe8ef97439f --- M src/osmo_gsm_tester/process.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 8ae6a55..477a096 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -126,6 +126,7 @@ self.cleanup() def cleanup(self): + self.dbg('Cleanup') self.close_output_logs() if self.result == 0: self.log('Terminated: ok', rc=self.result) @@ -149,7 +150,6 @@ self.log('stderr:\n', m, '\n') def close_output_logs(self): - self.dbg('Cleanup') for k, v in self.outputs.items(): path, f = v if f: -- To view, visit https://gerrit.osmocom.org/9298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I72ad453e9dc8340946d7e7d041643fe8ef97439f Gerrit-Change-Number: 9298 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 09:59:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 09:59:23 +0000 Subject: Change in osmo-gsm-tester[master]: Add option to expect bts/pcu failures and respawn its processes In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9299 ) Change subject: Add option to expect bts/pcu failures and respawn its processes ...................................................................... Add option to expect bts/pcu failures and respawn its processes Some tests may want to reproduce some scenarios in which it is expected that a BTS process is stopped, for instance if the BSC link is dropped. Provide a keepalive parameter to start() for bts and pcu objects to inform suite that failures are expected and that it should keep them alive in case that ocurrs by respawning the BTS process. Change-Id: Ia2a7539f9fad457125ac9b60a52a52999e885ba8 --- M src/osmo_gsm_tester/bts.py M src/osmo_gsm_tester/bts_nanobts.py M src/osmo_gsm_tester/bts_osmo.py M src/osmo_gsm_tester/bts_osmotrx.py M src/osmo_gsm_tester/bts_sysmo.py M src/osmo_gsm_tester/pcu.py M src/osmo_gsm_tester/pcu_osmo.py M src/osmo_gsm_tester/pcu_sysmo.py M src/osmo_gsm_tester/process.py M src/osmo_gsm_tester/suite.py 10 files changed, 57 insertions(+), 38 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, approved diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py index f59cff3..ca33eb4 100644 --- a/src/osmo_gsm_tester/bts.py +++ b/src/osmo_gsm_tester/bts.py @@ -139,8 +139,9 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): - 'Starts BTS proccess and sets self.proc_bts with an object of Process interface' + def start(self, keepalive=False): + '''Starts BTS. If keepalive is set, it will expect internal issues and + respawn related processes when detected''' pass @abstractmethod diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py index d631f1c..29a8ac5 100644 --- a/src/osmo_gsm_tester/bts_nanobts.py +++ b/src/osmo_gsm_tester/bts_nanobts.py @@ -80,7 +80,7 @@ # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.conf.get('ipa_unit_id') is None: raise log.Error('No attribute %s provided in conf!' % attr) self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py index 21ae135..b9b7fef 100644 --- a/src/osmo_gsm_tester/bts_osmo.py +++ b/src/osmo_gsm_tester/bts_osmo.py @@ -57,7 +57,7 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): + def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. pass @@ -108,6 +108,6 @@ # PUBLIC (test API included) ################### @abstractmethod - def start(self): + def start(self, keepalive=False): # coming from bts.Bts, we forward the implementation to children. pass diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py index 9f76194..b9310f8 100644 --- a/src/osmo_gsm_tester/bts_osmotrx.py +++ b/src/osmo_gsm_tester/bts_osmotrx.py @@ -51,7 +51,7 @@ def launch_trx_enabled(self): return util.str2bool(self.conf.get('launch_trx')) - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -59,7 +59,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc @@ -99,7 +99,7 @@ ################### # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.bsc is None: raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') self.suite_run.poll() @@ -110,7 +110,7 @@ if self.launch_trx_enabled(): self.trx = OsmoTrx(self.suite_run, self.conf, self.trx_remote_ip(), self.remote_addr()) - self.trx.start() + self.trx.start(keepalive) self.log('Waiting for osmo-trx to start up...') MainLoop.wait(self, self.trx.trx_ready) @@ -120,7 +120,7 @@ raise RuntimeError('No lib/ in %r' % self.inst) self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_bts = self.launch_process(OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', + self.proc_bts = self.launch_process(keepalive, OsmoBtsTrx.BIN_BTS_TRX, '-r', '1', '-c', os.path.abspath(self.config_file), '-i', self.bsc.addr()) self.suite_run.poll() @@ -163,17 +163,17 @@ self.dbg(r) f.write(r) - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-trx'))) lib = self.inst.child('lib') self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.proc_trx = self.launch_process(OsmoTrx.BIN_TRX, '-x', + self.proc_trx = self.launch_process(keepalive, OsmoTrx.BIN_TRX, '-x', '-j', self.listen_ip, '-i', self.bts_ip, '-C', os.path.abspath(self.config_file)) - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -181,7 +181,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc diff --git a/src/osmo_gsm_tester/bts_sysmo.py b/src/osmo_gsm_tester/bts_sysmo.py index d0f6ff3..65c9279 100644 --- a/src/osmo_gsm_tester/bts_sysmo.py +++ b/src/osmo_gsm_tester/bts_sysmo.py @@ -54,9 +54,9 @@ log.ctx(proc) raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None): + def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): proc = self._process_remote(name, popen_args, remote_cwd) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc @@ -110,7 +110,7 @@ ################### # PUBLIC (test API included) ################### - def start(self): + def start(self, keepalive=False): if self.bsc is None: raise RuntimeError('BTS needs to be added to a BSC or NITB before it can be started') log.log('Starting sysmoBTS to connect to', self.bsc) @@ -151,6 +151,6 @@ if self._direct_pcu_enabled(): args += ('-M',) - self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir) + self.proc_bts = self.launch_remote('osmo-bts-sysmo', args, remote_cwd=remote_run_dir, keepalive=keepalive) # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/pcu.py b/src/osmo_gsm_tester/pcu.py index 97d0b92..0260296 100644 --- a/src/osmo_gsm_tester/pcu.py +++ b/src/osmo_gsm_tester/pcu.py @@ -42,7 +42,7 @@ ################### @abstractmethod - def start(self): + def start(self, keepalive=False): """Start the PCU. Must be implemented by subclass.""" pass @@ -54,7 +54,7 @@ def __init__(self, suite_run, bts, conf): super().__init__(suite_run, bts, conf, 'PcuDummy') - def start(self): + def start(self, keepalive=False): pass # vim: expandtab tabstop=4 shiftwidth=4 diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py index 6ab97de..50ae134 100644 --- a/src/osmo_gsm_tester/pcu_osmo.py +++ b/src/osmo_gsm_tester/pcu_osmo.py @@ -34,7 +34,7 @@ self.conf = conf self.env = {} - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() @@ -44,12 +44,12 @@ raise RuntimeError('No lib/ in %r' % self.inst) self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) } - self.launch_process(OsmoPcu.BIN_PCU, '-r', '1', + self.launch_process(keepalive, OsmoPcu.BIN_PCU, '-r', '1', '-c', os.path.abspath(self.config_file), '-i', self.bts.bsc.addr()) self.suite_run.poll() - def launch_process(self, binary_name, *args): + def launch_process(self, keepalive, binary_name, *args): binary = os.path.abspath(self.inst.child('bin', binary_name)) run_dir = self.run_dir.new_dir(binary_name) if not os.path.isfile(binary): @@ -57,7 +57,7 @@ proc = process.Process(binary_name, run_dir, (binary,) + args, env=self.env) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() return proc diff --git a/src/osmo_gsm_tester/pcu_sysmo.py b/src/osmo_gsm_tester/pcu_sysmo.py index 675de50..b97852a 100644 --- a/src/osmo_gsm_tester/pcu_sysmo.py +++ b/src/osmo_gsm_tester/pcu_sysmo.py @@ -43,7 +43,7 @@ self.remote_env = {} self.remote_user = 'root' - def start(self): + def start(self, keepalive=False): self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name())) self.configure() @@ -75,7 +75,7 @@ ('LD_LIBRARY_PATH=%s' % remote_lib, remote_binary, '-c', remote_config_file, '-r', '1', '-i', self.sysmobts.bsc.addr()), - remote_cwd=remote_run_dir) + remote_cwd=remote_run_dir, keepalive=keepalive) def _process_remote(self, name, popen_args, remote_cwd=None): run_dir = self.run_dir.new_dir(name) @@ -90,9 +90,9 @@ log.ctx(proc) raise log.Error('Exited in error') - def launch_remote(self, name, popen_args, remote_cwd=None): + def launch_remote(self, name, popen_args, remote_cwd=None, keepalive=False): proc = self._process_remote(name, popen_args, remote_cwd) - self.suite_run.remember_to_stop(proc) + self.suite_run.remember_to_stop(proc, keepalive) proc.launch() def run_local(self, name, popen_args): diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py index 477a096..c13ded0 100644 --- a/src/osmo_gsm_tester/process.py +++ b/src/osmo_gsm_tester/process.py @@ -79,6 +79,13 @@ self.set_name(self.name_str, pid=self.process_obj.pid) self.log('Launched') + def respawn(self): + self.dbg('respawn') + assert not self.is_running() + self.result = None + self.killed = None + self.launch() + def _poll_termination(self, time_to_wait_for_term=5): wait_step = 0.001 waited_time = 0 diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py index 76cd248..618a39b 100644 --- a/src/osmo_gsm_tester/suite.py +++ b/src/osmo_gsm_tester/suite.py @@ -230,19 +230,27 @@ skipped += 1 return (passed, skipped, failed) - def remember_to_stop(self, process): + def remember_to_stop(self, process, respawn=False): + '''Ask suite to monitor and manage lifecycle of the Process object. If a + process managed by suite finishes before cleanup time, the current test + will be marked as FAIL and end immediatelly. If respwan=True, then suite + will respawn() the process instead.''' if self._processes is None: self._processes = [] - self._processes.insert(0, process) + self._processes.insert(0, (process, respawn)) def stop_processes(self): while self._processes: - self._processes.pop().terminate() + process, respawn = self._processes.pop() + process.terminate() def stop_process(self, process): 'Remove process from monitored list and stop it' - self._processes.remove(process) - process.terminate() + for proc_respawn in self._processes: + proc, respawn = proc_respawn + if proc == process: + self._processes.remove(proc_respawn) + proc.terminate() def free_resources(self): if self.reserved_resources is None: @@ -351,12 +359,15 @@ def poll(self): if self._processes: - for process in self._processes: + for process, respawn in self._processes: if process.terminated(): - process.log_stdout_tail() - process.log_stderr_tail() - log.ctx(process) - raise log.Error('Process ended prematurely: %s' % process.name()) + if respawn == True: + process.respawn() + else: + process.log_stdout_tail() + process.log_stderr_tail() + log.ctx(process) + raise log.Error('Process ended prematurely: %s' % process.name()) def prompt(self, *msgs, **msg_details): 'ask for user interaction. Do not use in tests that should run automatically!' -- To view, visit https://gerrit.osmocom.org/9299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia2a7539f9fad457125ac9b60a52a52999e885ba8 Gerrit-Change-Number: 9299 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 10:08:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 10:08:43 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2) to the change originally created by Harald Welte. ( https://gerrit.osmocom.org/9345 ) Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... osmo-bsc: Don't try to package anything bsc-nat related osmo-bsc_nat has been fully removed from osmo-bsc.git in 1c9b8b19176854ecf4a3d57e9eef6b495361557f. Instead, build the one from openbsc.git. Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 --- M recipes-osmocom/openbsc/openbsc.inc M recipes-osmocom/osmo-bsc/osmo-bsc.inc 2 files changed, 11 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/45/9345/2 -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: newpatchset Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 10:22:05 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 10:22:05 +0000 Subject: Change in osmo-gsm-tester[master]: powersupply_sispm: Add port number to log name Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9347 Change subject: powersupply_sispm: Add port number to log name ...................................................................... powersupply_sispm: Add port number to log name This way it can easily be spotted which port is being triggered in case someone wants to manually test it. Change-Id: Ibd2c70170d97a786e37b6838b1ed6d4eb637ad8b --- M src/osmo_gsm_tester/powersupply_sispm.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/47/9347/1 diff --git a/src/osmo_gsm_tester/powersupply_sispm.py b/src/osmo_gsm_tester/powersupply_sispm.py index b35592f..4505b17 100644 --- a/src/osmo_gsm_tester/powersupply_sispm.py +++ b/src/osmo_gsm_tester/powersupply_sispm.py @@ -86,6 +86,7 @@ raise log.Error('No "port" attribute provided in power_supply conf!') if not int(myport): raise log.Error('Wrong non numeric "port" attribute provided in power_supply conf!') + self.set_name('sispm-'+mydevid+'-'+myport) self.port = int(myport) device = self._get_device() if device is None: -- To view, visit https://gerrit.osmocom.org/9347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd2c70170d97a786e37b6838b1ed6d4eb637ad8b Gerrit-Change-Number: 9347 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 10:46:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 10:46:47 +0000 Subject: Change in osmo-gsm-tester[master]: event_loop: Log parameters during wait timeout exception Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9348 Change subject: event_loop: Log parameters during wait timeout exception ...................................................................... event_loop: Log parameters during wait timeout exception Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d --- M src/osmo_gsm_tester/event_loop.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/48/9348/1 diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/event_loop.py index 64a110d..0fe0940 100644 --- a/src/osmo_gsm_tester/event_loop.py +++ b/src/osmo_gsm_tester/event_loop.py @@ -109,7 +109,7 @@ def wait(self, log_obj, condition, *condition_args, timeout=300, timestep=1, **condition_kwargs): if not self.wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep): log.ctx(log_obj) - raise log.Error('Wait timeout') + raise log.Error('Wait timeout', condition=condition, timeout=timeout, timestemp=timestep) def sleep(self, log_obj, seconds): assert seconds > 0. -- To view, visit https://gerrit.osmocom.org/9348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d Gerrit-Change-Number: 9348 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:04:45 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 11:04:45 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9349 Change subject: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest ...................................................................... osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest This VTY cmd has been removed in osmo-bsc.git 68e4be9c845e25f53aea511b1c57340a9da5825c. Change-Id: I48c0b8a7b2a0088887f1309efc40bcf1da0f1626 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/49/9349/1 diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 814cf97..30774cf 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -110,7 +110,6 @@ mgw remote-port 2427 mgw endpoint-range 1 31 codec-list hr3 - dest 151.80.237.229 5000 184 amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden -- To view, visit https://gerrit.osmocom.org/9349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I48c0b8a7b2a0088887f1309efc40bcf1da0f1626 Gerrit-Change-Number: 9349 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:23:34 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 11:23:34 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9345 ) Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: comment Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 11:23:34 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:56:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:56:13 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9349 ) Change subject: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I48c0b8a7b2a0088887f1309efc40bcf1da0f1626 Gerrit-Change-Number: 9349 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Mon, 28 May 2018 11:56:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:56:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:56:25 +0000 Subject: Change in osmo-gsm-tester[master]: powersupply_sispm: Add port number to log name In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9347 ) Change subject: powersupply_sispm: Add port number to log name ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibd2c70170d97a786e37b6838b1ed6d4eb637ad8b Gerrit-Change-Number: 9347 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 11:56:25 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:57:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:57:00 +0000 Subject: Change in osmo-gsm-tester[master]: event_loop: Log parameters during wait timeout exception In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9348 ) Change subject: event_loop: Log parameters during wait timeout exception ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9348/2/src/osmo_gsm_tester/event_loop.py File src/osmo_gsm_tester/event_loop.py: https://gerrit.osmocom.org/#/c/9348/2/src/osmo_gsm_tester/event_loop.py at 112 PS2, Line 112: timestemp=timestep timestep? timestamp? but "timestemp" sounds weird? -- To view, visit https://gerrit.osmocom.org/9348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d Gerrit-Change-Number: 9348 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Mon, 28 May 2018 11:57:00 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:57:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:57:15 +0000 Subject: Change in meta-telephony[laforge/nightly]: osmo-bsc: Don't try to package anything bsc-nat related In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9345 ) Change subject: osmo-bsc: Don't try to package anything bsc-nat related ...................................................................... osmo-bsc: Don't try to package anything bsc-nat related osmo-bsc_nat has been fully removed from osmo-bsc.git in 1c9b8b19176854ecf4a3d57e9eef6b495361557f. Instead, build the one from openbsc.git. Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 --- M recipes-osmocom/openbsc/openbsc.inc M recipes-osmocom/osmo-bsc/osmo-bsc.inc 2 files changed, 11 insertions(+), 13 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved; Verified diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index 36c57e7..9f23d52 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -11,9 +11,9 @@ file://osmo-bsc-sccplite.service \ " -INC_PR = "r0.${META_TELEPHONY_OSMO_INC}" +INC_PR = "r1.${META_TELEPHONY_OSMO_INC}" -EXTRA_OECONF += "--enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" +EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729" inherit autotools update-rc.d pkgconfig @@ -21,6 +21,7 @@ install -d ${D}${sysconfdir}/osmocom install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg + install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ # Install sysv-init files install -d ${D}${sysconfdir}/init.d @@ -37,7 +38,7 @@ } -PACKAGES =+ "osmo-bsc-sccplite osmo-nitb" +PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" @@ -62,3 +63,9 @@ ${sysconfdir}/osmocom/osmo-nitb.cfg \ ${systemd_unitdir}/system/osmo-nitb.service \ " + +CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +FILES_osmo-bsc-nat = " \ + ${bindir}/osmo-bsc_nat \ + ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ + " diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc index f20362f..d066a58 100644 --- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc +++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc @@ -14,12 +14,11 @@ install -d ${D}${sysconfdir}/osmocom/ install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/ - install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/ install -m 0644 ${S}/contrib/systemd/osmo-bsc.service ${D}${systemd_system_unitdir}/ } -PACKAGES =+ "osmo-bsc-nat-doc osmo-bsc-nat meas-utils ipaccess-utils bs11-utils abisip-find" +PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find" SYSTEMD_PACKAGES = "osmo-bsc" SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service" @@ -43,11 +42,3 @@ ${bindir}/osmo-meas-pcap2db \ ${bindir}/meas_json \ " - -FILES_osmo-bsc-nat = " \ - ${bindir}/osmo-bsc_nat \ - ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ - " -CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" - -FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat " -- To view, visit https://gerrit.osmocom.org/9345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61 Gerrit-Change-Number: 9345 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:58:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:58:03 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: Increase log level of some messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9346 ) Change subject: acc_ramp: Increase log level of some messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 Gerrit-Change-Number: 9346 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling Gerrit-Comment-Date: Mon, 28 May 2018 11:58:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 11:58:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 11:58:06 +0000 Subject: Change in osmo-bsc[master]: acc_ramp: Increase log level of some messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9346 ) Change subject: acc_ramp: Increase log level of some messages ...................................................................... acc_ramp: Increase log level of some messages Right now, it's impossible to see any ACC Ramping information unless RSL category is set to DEBUG. Barring and Allowing Access Control Class is an important event which should be printed in most cases. Increase log levels of messages printed during some error conditions to be handled as errors. Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 --- M src/libbsc/acc_ramp.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/acc_ramp.c b/src/libbsc/acc_ramp.c index ff8ff0e..ac9f02d 100644 --- a/src/libbsc/acc_ramp.c +++ b/src/libbsc/acc_ramp.c @@ -46,7 +46,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); } @@ -54,7 +54,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs |= (1 << acc); } @@ -210,7 +210,7 @@ break; case NM_STATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -249,7 +249,7 @@ break; case NM_OPSTATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } -- To view, visit https://gerrit.osmocom.org/9346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5404e91fe7c0b3209e8033594e659387bbc924d6 Gerrit-Change-Number: 9346 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:01:26 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 12:01:26 +0000 Subject: Change in osmo-gsm-tester[master]: event_loop: Log parameters during wait timeout exception In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9348 to look at the new patch set (#3). Change subject: event_loop: Log parameters during wait timeout exception ...................................................................... event_loop: Log parameters during wait timeout exception Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d --- M src/osmo_gsm_tester/event_loop.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/48/9348/3 -- To view, visit https://gerrit.osmocom.org/9348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d Gerrit-Change-Number: 9348 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:08:35 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 May 2018 12:08:35 +0000 Subject: Change in osmo-bsc[master]: doc: add msc charts on Assignment/Handover internals Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9350 Change subject: doc: add msc charts on Assignment/Handover internals ...................................................................... doc: add msc charts on Assignment/Handover internals In doc/, add two message sequence charts with lots of implementation specifics, to clarify the current code state. Mark various problems in red notes. This chart and others should help to illustrate future code changes as I go along refactoring handover, lchan allocation and adding inter-BSC handover. Change-Id: I20999e938441d4fed2d37462b262b74a696f616d --- A assignment.msc M doc/Makefile.am A doc/handover.msc 3 files changed, 357 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/9350/1 diff --git a/assignment.msc b/assignment.msc new file mode 100644 index 0000000..e2bdf84 --- /dev/null +++ b/assignment.msc @@ -0,0 +1,181 @@ +msc { + hscale=3; + ms [label="MS"], bts [label="BTS"], bsc[label="BSC"], bsc_gscon[label="BSC conn FSM"], bsc_mgcp[label="BSC mgcp FSM"], mgw[label="MGW"], msc_[label="MSC"]; + + ms note msc_ [label="lchan allocation sequence for BSSMAP Assignment Request"]; + + bsc <= msc_ [label="BSSMAP Assignment Request"]; + bsc box bsc [label="bssmap_handle_assignm_req()"]; + bsc -> bsc_gscon [label="GSCON_EV_A_ASSIGNMENT_CMD"]; + + --- [label="is the chan_mode a speech mode?"]; + + bsc_gscon abox bsc_gscon [label="ST_WAIT_CRCX_BTS (MGCP_MGW_TIMEOUT = 4s)"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_create()"]; + bsc_mgcp => mgw [label="CRCX (for BTS)"]; + bsc_mgcp abox bsc_mgcp [label="ST_CRCX (MGCP_MGW_TIMEOUT = 4s)"]; + bsc_gscon note bsc_mgcp [label="two timeouts running in parallel"]; + bsc_gscon note bsc_mgcp [label="note: #define MGCP_MGW_TIMEOUT exists twice, + once in libosmo-mgcp-client, + once in bsc_subscr_conn_fsm.c"]; + bsc_mgcp -> bsc_gscon [label="mgcp_conn_create() exits"]; + bsc_gscon -> bsc [label="bssmap_handle_assignm_req() exits"]; + ...; + --- [label="On Timeout"]; + bsc_gscon note bsc_gscon [label="The conn FSM likely timeouts first"]; + bsc_gscon => msc_ [label="BSSMAP Assignment Failure"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc_mgcp note bsc_mgcp [label="The MGCP FSM will timeout right after that, and terminate itself, + emitting the parent_term event set upon mgcp_conn_create():"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_FAIL_BTS"]; + bsc_gscon note bsc_gscon [label="GSCON_EV_MGW_FAIL_BTS is handled by the conn FSM allstate + handler. It sets conn->user_plane.fi_bts = NULL. There is code + that would emit a BSSMAP Assignment Failure, but not in + ST_ACTIVE"]; + --- [label="end: 'On Timeout'"]; + ...; + + bsc_mgcp <= mgw [label="CRCX OK (for BTS)"]; + bsc_mgcp box bsc_mgcp [label="libosmo-mgcp-client fsm_crcx_resp_cb()"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_CRCX_RESP_BTS"]; + --- [label="end: 'is the chan_mode a speech mode?'"]; + + bsc_gscon note bsc_gscon [label="for mode=sign, we're still handling GSCON_EV_A_ASSIGNMENT_CMD; + for speech mode, we're handling GSCON_EV_MGW_CRCX_RESP_BTS"]; + bsc <- bsc_gscon [label="gsm0808_assign_req()"]; + + bsc box bsc [label="lchan_alloc(): pick available lchan"]; + bsc box bsc [label="rsl_chan_activate_lchan()"]; + + --- [label="is the chosen lchan on dynamic timeslot that is currently used as PDCH?"]; + bts <= bsc [label="i) RSL RF Chan Release of PDCH (Osmocom dyn TS)"]; + bts <= bsc [label="OR ii) RSL PDCH Deact (ip.access dyn TS)"]; + bsc -> bsc_gscon [label="gsm0808_assign_req() returns early"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"]; + ...; + bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"]; + bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"]; + bsc box bsc [label="rsl_chan_activate_lchan() re-invoked"]; + bts <= bsc [label="RSL Chan Activ"]; + --- [label="else (no dyn TS switchover)"]; + + bts <= bsc [label="RSL Chan Activ"]; + bsc -> bsc_gscon [label="gsm0808_assign_req() returns"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"]; + ---; + + ...; + --- [label="On Timeout"]; + bsc_gscon => msc_ [label="BSSMAP Assignment Failure"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc_gscon note bsc_mgcp [linecolor="red", + label="The mgcp FSM from CRCX above apparently lacks a cleanup action for this case. + It should be cleaned up eventually when the conn is torn down, but we should + release RTP endpoints as soon as possible."]; + --- [label="end: 'On Timeout'"]; + ...; + + bts => bsc [label="RSL Chan Activ ACK"]; + bsc box bsc [label="bsc_api.c handle_chan_ack()"]; + ms <= bsc [label="RR Assignment Command"]; + + ...; + ms note bsc_gscon [label="We rely on the overall conn FSM ST_WAIT_ASS_COMPL timeout."]; + ...; + + ms => bsc [label="RR Assignment Complete"]; + bsc box bsc [label="handle_ass_compl()"]; + --- [label="Release old lchan"]; + bsc box bsc [label="_lchan_handle_release(sacch_deact=0)"]; + bsc box bsc [label="rsl_release_sapis_from(start=1)"]; + bts <= bsc [label="RSL Release Request (Local End)..."]; + bts <= bsc [label="...for each SAPI except link_id=0"]; + bsc box bsc [label="rsl_release_request(link_id=0)"]; + bts <= bsc [label="RSL Release Request (Local End) for link_id=0"]; + bsc box bsc [label="_lchan_handle_release() returns here, the remaining release is asynchronous; + see `End: 'Release old lchan'` below."]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over RSL Release Request!"]; + ...; + bts => bsc [label="RSL Release Confirm..."]; + bts => bsc [label="...for each SAPI and link_id=0"]; + bsc abox bsc [label="start T3111"]; + ...; + bsc box bsc [label="T3111 expires"]; + bsc abox bsc [label="Start lchan->act_timer with lchan_deact_tmr_cb"]; + bts <= bsc [label="RSL RF Channel Release"]; + ...; + --- [label="On timeout"]; + bsc box bsc [label="lchan_deact_tmr_cb()"]; + bsc box bsc [label="rsl_lchan_mark_broken(): state=LCHAN_S_BROKEN"]; + bsc box bsc [label="lchan_free()"]; + bsc -> bsc [label="S_LCHAN_UNEXPECTED_RELEASE"]; + bsc box bsc [label="bsc_api.c handle_release()"]; + bsc box bsc [label="bsc->assign_fail()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_FAIL"]; + bsc note bsc_gscon [linecolor="orange", + label="The name 'RR_ASS_FAIL' might suggest the event means an actual RR Assignment + Failure message being received. Maybe this should be called GSCON_EV_ASSIGNMENT_ERROR."]; + ...; + bsc box bsc [label="bsc->clear_request()"]; + bsc box bsc [label="bsc_clear_request encodes a BSSMAP Clear Request message and passes it on + to the conn FSM as data argument via:"]; + bsc -> bsc_gscon [label="GSCON_EV_TX_SCCP"]; + bsc_gscon => msc_ [label="BSSMAP Clear Request"]; + bsc note bsc_gscon [linecolor="red", + label="Instead of sending an arbitrary message, the conn FSM should + be explicitly instructed to clear the connection, to be able + to notice if the MSC failed to respond to the Clear Request. + Currently, this relies on the MSC responding with a Clear + Command, hopefully, some time later."]; + --- [label="End: 'On timeout'"]; + ...; + bts => bsc [label="RSL RF Channel Release Ack"]; + --- [label="End: 'Release old lchan'"]; + bsc box bsc [label="still in handle_ass_compl()"]; + bsc note bsc [label="officially take over new lchan: conn->lchan = conn->secondary_lchan"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access)"]; + bts <= bsc [label="IPACC CRCX"]; + ---; + bsc -> bsc [label="handle_ass_compl() calls bsc_api->assign_compl()"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access) && conn->user_plane.rtp_ip"]; + bsc box bsc [label="bsc_assign_compl()"]; + bsc note bsc [label="set ass_compl.valid = true, + postponing GSCON_EV_RR_ASS_COMPL until after the + IPACC MDCX ACK received in osmo_bsc_audio.c"]; + bsc box bsc [label="exit early: bsc_assign_compl()"]; + bsc box bsc [label="exit early: handle_ass_compl()"]; + bsc box bsc [label="osmo_bsc_audio.c"]; + bts => bsc [label="IPACC CRCX ACK"]; + bts <= bsc [label="IPACC MDCX"]; + bts => bsc [label="IPACC MDCX ACK"]; + bsc box bsc [label="handle_abisip_signal()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_COMPL"]; + --- [label="else"]; + bsc box bsc [label="bsc_assign_compl()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_COMPL"]; + --- ; + + --- [label="is chan_mode a speech mode?"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_MDCX_BTS"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_modify()"]; + bsc_mgcp note bsc_mgcp [label="same mgcp FSM as above, for BTS side"]; + bsc_mgcp => mgw [label="MDCX (for BTS)"]; + bsc_mgcp <= mgw [label="MDCX OK"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_MDCX_RESP_BTS"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_CRCX_MSC"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_create()"]; + bsc_mgcp note bsc_mgcp [label="second mgcp FSM for MSC side"]; + bsc_mgcp => mgw [label="CRCX (for MSC)"]; + bsc_mgcp <= mgw [label="CRCX OK (for MSC)"]; + bsc_gscon <- bsc_mgcp [label="GSCON_EV_MGW_CRCX_RESP_MSC"]; + ---; + + bsc_gscon => msc_ [label="BSSMAP Assignment Complete"]; + + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; +} diff --git a/doc/Makefile.am b/doc/Makefile.am index 5a23107..cc2e277 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,15 @@ SUBDIRS = \ examples \ $(NULL) + +msc: \ + $(builddir)/handover.png \ + $(builddir)/assignment.png \ + $(NULL) + +$(builddir)/%.png: $(srcdir)/%.msc + mscgen -T png -o $@ $< + +.PHONY: poll +poll: + while true; do $(MAKE) msc; sleep 1; done diff --git a/doc/handover.msc b/doc/handover.msc new file mode 100644 index 0000000..e5e787c --- /dev/null +++ b/doc/handover.msc @@ -0,0 +1,164 @@ +# Handover between cells, intra-BSC +msc { + hscale=3; + ms [label="MS"], bts [label="BTS"], bsc[label="BSC"], bsc_gscon[label="BSC conn FSM"], bsc_mgcp[label="BSC mgcp FSM"], mgw[label="MGW"]; + + ms note mgw [label="intra-BSC Handover sequence"]; + + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc box bsc [label="bsc_handover_start(): init conn->ho"]; + bsc -> bsc_gscon [label="GSCON_EV_HO_START"]; + bsc <- bsc_gscon [label="bsc_handover_start_gscon()"]; + + bsc box bsc [label="lchan_alloc(): pick available lchan"]; + bsc box bsc [label="rsl_chan_activate_lchan()"]; + + --- [label="is the chosen lchan on dynamic timeslot that is currently used as PDCH?"]; + bts <= bsc [label="i) RSL RF Chan Release of PDCH (Osmocom dyn TS)"]; + bts <= bsc [label="OR ii) RSL PDCH Deact (ip.access dyn TS)"]; + bsc -> bsc_gscon [label="bsc_handover_start_gscon() returns early"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_HO_COMPL (no timeout, relies on T3103 below)"]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"]; + ...; + bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"]; + bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"]; + bsc box bsc [label="rsl_chan_activate_lchan() re-invoked"]; + bts <= bsc [label="RSL Chan Activ"]; + --- [label="else (no dyn TS switchover)"]; + + bts <= bsc [label="RSL Chan Activ"]; + bsc -> bsc_gscon [label="bsc_handover_start_gscon() returns"]; + ---; + bsc_gscon abox bsc_gscon [label="ST_WAIT_HO_COMPL (no timeout, relies on T3103 below)"]; + + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching out for RSL Chan Activ ACK/NACK!"]; + ...; + bts => bsc [label="RSL Chan Activ ACK"]; + bsc -> bsc [label="S_LCHAN_ACTIVATE_ACK"]; + bsc box bsc [label="handover_logic.c ho_logic_sig_cb()"]; + bsc box bsc [label="ho_chan_activ_ack()"]; + bsc note bsc [label="gsm48_send_ho_cmd()"]; + ms <= bsc [label="RR Handover Command"]; + bsc abox bsc [label="start T3103"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access)"]; + bts <= bsc [label="IPACC CRCX"]; + bsc -> bsc [label="ho_chan_activ_ack() returns"]; + bts note bsc [linecolor="red", + label="There seems to be no timer watching over IPACC CRCX ACK/NACK! + If no response is received, we simply ignore that fact and carry on as if + everything was fine."]; + ...; + bts note bsc [label="The IPACC CRCX and MDCX ACKs may come back at any time: + before or after the Handover Detect, before or after Handover Complete."]; + bts note bsc_mgcp [linecolor="red", + label="The CRCX ACK contains vital information for routing the RTP stream. + If the CRCX ACK were very slow, we would not know which RTP/RTPC ports + to point the MGW at, below at mgcp_conn_modify()! + Even though this being unrealistic, we must make sure to receive a CRCX ACK."]; + ...; + bsc box bsc [label="osmo_bsc_audio.c"]; + bts => bsc [label="IPACC CRCX ACK"]; + bts <= bsc [label="IPACC MDCX"]; + ...; + bts note bsc [linecolor="red", + label="There seems to be no timer watching over IPACC MDCX ACK/NACK! + If no response is received, we simply ignore that fact and carry on as if + everything was fine."]; + ...; + bts => bsc [label="IPACC MDCX ACK"]; + bts note bsc [label="IPACC MDCX ACK triggers no events or actions"]; + ---; + + ...; + ms => bsc [label="RR Handover Detect"]; + bsc -> bsc [label="S_LCHAN_HANDOVER_DETECT"]; + bsc box bsc [label="ho_rsl_detect(): no action, only logging"]; + bsc note bsc_gscon [label="Handover Detect triggers no events or actions"]; + bsc note bsc_gscon [linecolor="red", + label="upon Handover Detect, we should already start re-routing the RTP! + Instead we wait for Handover Complete."]; + + ...; + ms => bsc [label="RR Handover Complete"]; + bsc -> bsc [label="S_LCHAN_HANDOVER_COMPL"]; + bsc box bsc [label="handover_logic.c ho_logic_sig_cb()"]; + bsc box bsc [label="ho_gsm48_ho_compl()"]; + bsc box bsc [label="stop T3103"]; + bts note bsc_gscon [label="If anything goes wrong from this point on, we will not move back + to the old lchan: would be pointless after Handover Complete."]; + bsc note bsc [label="officially take over new lchan: conn->lchan = ho->new_lchan"]; + + --- [label="Release old lchan"]; + bsc box bsc [label="_lchan_handle_release(sacch_deact=0)"]; + bsc box bsc [label="rsl_release_sapis_from(start=1)"]; + bts <= bsc [label="RSL Release Request (Local End)..."]; + bts <= bsc [label="...for each SAPI except link_id=0"]; + bsc box bsc [label="rsl_release_request(link_id=0)"]; + bts <= bsc [label="RSL Release Request (Local End) for link_id=0"]; + bsc box bsc [label="_lchan_handle_release() returns here, the remaining release is asynchronous; + see `End: 'Release old lchan'` below."]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over RSL Release Request!"]; + ...; + bts => bsc [label="RSL Release Confirm..."]; + bts => bsc [label="...for each SAPI and link_id=0"]; + bsc abox bsc [label="start T3111"]; + ...; + bsc box bsc [label="T3111 expires"]; + bsc abox bsc [label="Start lchan->act_timer with lchan_deact_tmr_cb"]; + bts <= bsc [label="RSL RF Channel Release"]; + ...; + --- [label="On timeout"]; + bsc box bsc [label="lchan_deact_tmr_cb()"]; + bsc box bsc [label="rsl_lchan_mark_broken(): state=LCHAN_S_BROKEN"]; + bsc box bsc [label="lchan_free()"]; + bsc -> bsc [label="S_LCHAN_UNEXPECTED_RELEASE"]; + bsc box bsc [label="bsc_api.c handle_release()"]; + bsc box bsc [label="bsc->clear_request()"]; + bsc box bsc [label="bsc_clear_request encodes a BSSMAP Clear Request message and passes it on + to the conn FSM as data argument via:"]; + bsc -> bsc_gscon [label="GSCON_EV_TX_SCCP"]; + bsc_gscon rbox bsc_gscon [label="BSSMAP Clear Request to MSC"]; + bsc note bsc_gscon [linecolor="red", + label="During Handover, we actually release the entire conn just because we failed to + gracefully release the old lchan. That is obviously nonsense."]; + bsc note bsc [label="Stop T3101 (but was not active in this code path)"]; + bsc -> bsc [label="S_CHALLOC_FREED"]; + --- [label="End: 'On timeout'"]; + ...; + bts => bsc [label="RSL RF Channel Release Ack"]; + ---; + + bsc box bsc [label="still in ho_gsm48_ho_compl()"]; + bsc note bsc [label="handover_free(), conn->ho = NULL"]; + bsc -> bsc_gscon [label="GSCON_EV_HO_COMPL"]; + bsc note bsc_gscon [linecolor="orange", + label="Handover information is cleared before signalling the conn FSM. + That means the conn FSM cannot possibly log sensible information about exactly + which Handover has just completed."]; + + bsc_gscon abox bsc_gscon [label="ST_WAIT_MDCX_BTS_HO + (MGCP_MGW_TIMEOUT=4s with MGCP_MGW_HO_TIMEOUT_TIMER_NR)"]; + + bsc_gscon -> bsc_mgcp [label="mgcp_conn_modify()"]; + bsc_mgcp note bsc_mgcp [label="mgcp FSM that was established for old lchan, for BTS side"]; + bsc_mgcp => mgw [label="MDCX (for BTS)"]; + ...; + bsc_gscon note mgw [ + label="If we get no MDCX ACK, the MGCP FSM terminates, and emits GSCON_EV_MGW_FAIL_BTS. + Besides invalidating the MGCP FSM pointer, this event has no + effect in ST_WAIT_MDCX_BTS_HO, and we rely on above conn FSM + timeout instead."]; + bsc_gscon note bsc_gscon [linecolor="red", + label="A timeout of ST_WAIT_MDCX_BTS_HO simply transitions back to ST_ACTIVE! + Even though the MGW failed, we carry on as if everything were fine."]; + ...; + bsc_mgcp <= mgw [label="MDCX OK"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_MDCX_RESP_BTS"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; +} -- To view, visit https://gerrit.osmocom.org/9350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I20999e938441d4fed2d37462b262b74a696f616d Gerrit-Change-Number: 9350 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:08:44 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 12:08:44 +0000 Subject: Change in openbsc[master]: acc_ramp: Increase log level of some messages Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9351 Change subject: acc_ramp: Increase log level of some messages ...................................................................... acc_ramp: Increase log level of some messages Right now, it's impossible to see any ACC Ramping information unless RSL category is set to DEBUG. Barring and Allowing Access Control Class is an important event which should be printed in most cases. Increase log levels of messages printed during some error conditions to be handled as errors. Backport of osmo-bsc.git commit 67f20bc356a4908bdb71b5dfc6a1932e6c1fac68. Change-Id: Iec10c2be7aa5efeadd6b0706916678acc5461111 --- M openbsc/src/libbsc/acc_ramp.c 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/51/9351/1 diff --git a/openbsc/src/libbsc/acc_ramp.c b/openbsc/src/libbsc/acc_ramp.c index c90d087..0c4dbac 100644 --- a/openbsc/src/libbsc/acc_ramp.c +++ b/openbsc/src/libbsc/acc_ramp.c @@ -46,7 +46,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); } @@ -54,7 +54,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs |= (1 << acc); } @@ -210,7 +210,7 @@ break; case NM_STATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -249,7 +249,7 @@ break; case NM_OPSTATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -361,4 +361,3 @@ allow_all_accs(acc_ramp); } - -- To view, visit https://gerrit.osmocom.org/9351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iec10c2be7aa5efeadd6b0706916678acc5461111 Gerrit-Change-Number: 9351 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:09:05 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:09:05 +0000 Subject: Change in libosmocore[master]: vty logging: restore level everything for level all In-Reply-To: References: Message-ID: Hello Max, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/4313 to look at the new patch set (#3). Change subject: vty logging: restore level everything for level all ...................................................................... vty logging: restore level everything for level all This modifies https://gerrit.osmocom.org/#/c/3148 to allow issuing of logging level all everything. Change-Id: Idd9933e0e1c06fd217866e2d4dbe6cae63296a16 --- M src/vty/logging_vty.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/4313/3 -- To view, visit https://gerrit.osmocom.org/4313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Idd9933e0e1c06fd217866e2d4dbe6cae63296a16 Gerrit-Change-Number: 4313 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:09:06 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:09:06 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_progress_desc Message-ID: Keith Whyte has uploaded this change for review. ( https://gerrit.osmocom.org/9352 Change subject: Add enum gsm48_progress_desc ...................................................................... Add enum gsm48_progress_desc >From GSM 04.08 Section 10.5.4.21 / Table 10.5.127 Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/9352/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 0bb2dce..4c98ff2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1372,6 +1372,18 @@ #define GSM48_IE_FOLLOW_ON_PROC 0xa1 #define GSM48_IE_CTS_PERMISSION 0xa2 +/* Section 10.5.4.21 / Table 10.5.127 */ + +enum gsm48_progress_desc { + GSM48_PROGR_NOT_E2E = 0x00, + GSM48_PROGR_DEST_NOT_PLMN = 0x02, + GSM48_PROGR_ORIG_NOT_PLMN = 0x03, + GSM48_PROGR_RETURNED = 0x04, + GSM48_PROGR_IN_BAND_AVAIL = 0x08, + GSM48_PROGR_CALL_E2E = 0x20, + GSM48_PROGR_QUEUEING = 0x40, +}; + /* Section 10.5.4.23 / Table 10.5.130 */ enum gsm48_signal_val { GSM48_SIGNAL_DIALTONE = 0x00, -- To view, visit https://gerrit.osmocom.org/9352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 Gerrit-Change-Number: 9352 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:10:05 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:10:05 +0000 Subject: Change in libosmocore[master]: vty logging: restore level everything for level all In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/4313 ) Change subject: vty logging: restore level everything for level all ...................................................................... Patch Set 3: > Uploaded patch set 3. oops.. pushing this again was an error. -- To view, visit https://gerrit.osmocom.org/4313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idd9933e0e1c06fd217866e2d4dbe6cae63296a16 Gerrit-Change-Number: 4313 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max Gerrit-Comment-Date: Mon, 28 May 2018 12:10:05 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:11:20 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:11:20 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_progress_desc In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9352 ) Change subject: Add enum gsm48_progress_desc ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h at 1377 PS1, Line 1377: enum gsm48_progress_desc { I totally made these up... Any better ideas? -- To view, visit https://gerrit.osmocom.org/9352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 Gerrit-Change-Number: 9352 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 12:11:20 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:14:17 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:14:17 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9270 to look at the new patch set (#2). Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Add Cause to DISCONNECT and RELEASE Requests GSM 04.08 10.5.4.11 (Table 10.85) states: Coding standards other than the standard defined for the GSM PLMNS shall not be used if the cause can be represented with the GSM standardized coding. This patch adds cause coding GSM PLMS (3) and sets cause location to "public network serving the local user" (2) This prevents UE that pay attention to this from treating all call termination as an error and paves the way to adding correct cause mapping from Table 10.86 Also replaces use of magic numbers with enum constants. Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 --- M src/mncc.c 1 file changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/70/9270/2 -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:15:31 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:15:31 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9270/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9270/2/src/mncc.c at 218 PS2, Line 218: out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */ Depends on https://gerrit.osmocom.org/#/c/libosmocore/+/9352/ -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 12:15:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:22:22 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 12:22:22 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9270/1/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9270/1/src/mncc.c at 113 PS1, Line 113: mncc->cause.location = GSM48_CAUSE_LOC_PUN_S_LU; > please use GSM48_CAUSE_LOC_PUN_S_LU instead of a magic number "2". [?] Done -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 12:22:22 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 12:30:40 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 May 2018 12:30:40 +0000 Subject: Change in osmo-bsc[master]: doc: add msc charts on Assignment/Handover internals In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9350 to look at the new patch set (#3). Change subject: doc: add msc charts on Assignment/Handover internals ...................................................................... doc: add msc charts on Assignment/Handover internals In doc/, add two message sequence charts with lots of implementation specifics, to clarify the current code state. Mark various problems in red notes. This chart and others should help to illustrate future code changes as I go along refactoring handover, lchan allocation and adding inter-BSC handover. Change-Id: I20999e938441d4fed2d37462b262b74a696f616d --- M doc/Makefile.am A doc/assignment.msc A doc/handover.msc 3 files changed, 357 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/9350/3 -- To view, visit https://gerrit.osmocom.org/9350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I20999e938441d4fed2d37462b262b74a696f616d Gerrit-Change-Number: 9350 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:20:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 13:20:45 +0000 Subject: Change in osmo-bsc[master]: doc: add msc charts on Assignment/Handover internals In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9350 ) Change subject: doc: add msc charts on Assignment/Handover internals ...................................................................... Patch Set 3: Code-Review+2 looks good to me. Not sure if it shouldn't go into osm-gsm-manuals though? I'm a bit undecided, in the end we could always move if we decide those would be interesting to have in the manual. Or we move the manuals in here... -- To view, visit https://gerrit.osmocom.org/9350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20999e938441d4fed2d37462b262b74a696f616d Gerrit-Change-Number: 9350 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 13:20:45 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:21:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 13:21:57 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_progress_desc In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9352 ) Change subject: Add enum gsm48_progress_desc ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h at 1377 PS1, Line 1377: enum gsm48_progress_desc { > I totally made these up... [?] I suppose the values are from the spec, you just made up the shortened names? That's what we always do, so no issue there... -- To view, visit https://gerrit.osmocom.org/9352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 Gerrit-Change-Number: 9352 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 13:21:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:22:56 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 13:22:56 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/9270/2/src/mncc.c File src/mncc.c: https://gerrit.osmocom.org/#/c/9270/2/src/mncc.c at 218 PS2, Line 218: out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */ > Depends on https://gerrit.osmocom. [?] if you push this commit in a branch/sries on top of "9352", then the build verification would pass. -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 13:22:56 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:23:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 13:23:41 +0000 Subject: Change in osmo-gsm-tester[master]: event_loop: Log parameters during wait timeout exception In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9348 ) Change subject: event_loop: Log parameters during wait timeout exception ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d Gerrit-Change-Number: 9348 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 13:23:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:25:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 13:25:07 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 13:25:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:32:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 13:32:59 +0000 Subject: Change in osmo-gsm-tester[master]: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9349 ) Change subject: osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest ...................................................................... osmo-bsc.cfg.tmpl: Remove unused nd recently removed option dest This VTY cmd has been removed in osmo-bsc.git 68e4be9c845e25f53aea511b1c57340a9da5825c. Change-Id: I48c0b8a7b2a0088887f1309efc40bcf1da0f1626 --- M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl index 814cf97..30774cf 100644 --- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl @@ -110,7 +110,6 @@ mgw remote-port 2427 mgw endpoint-range 1 31 codec-list hr3 - dest 151.80.237.229 5000 184 amr-config 12_2k forbidden amr-config 10_2k forbidden amr-config 7_95k forbidden -- To view, visit https://gerrit.osmocom.org/9349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I48c0b8a7b2a0088887f1309efc40bcf1da0f1626 Gerrit-Change-Number: 9349 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:33:01 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 13:33:01 +0000 Subject: Change in osmo-gsm-tester[master]: powersupply_sispm: Add port number to log name In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9347 ) Change subject: powersupply_sispm: Add port number to log name ...................................................................... powersupply_sispm: Add port number to log name This way it can easily be spotted which port is being triggered in case someone wants to manually test it. Change-Id: Ibd2c70170d97a786e37b6838b1ed6d4eb637ad8b --- M src/osmo_gsm_tester/powersupply_sispm.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/powersupply_sispm.py b/src/osmo_gsm_tester/powersupply_sispm.py index b35592f..4505b17 100644 --- a/src/osmo_gsm_tester/powersupply_sispm.py +++ b/src/osmo_gsm_tester/powersupply_sispm.py @@ -86,6 +86,7 @@ raise log.Error('No "port" attribute provided in power_supply conf!') if not int(myport): raise log.Error('Wrong non numeric "port" attribute provided in power_supply conf!') + self.set_name('sispm-'+mydevid+'-'+myport) self.port = int(myport) device = self._get_device() if device is None: -- To view, visit https://gerrit.osmocom.org/9347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd2c70170d97a786e37b6838b1ed6d4eb637ad8b Gerrit-Change-Number: 9347 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 13:33:02 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 13:33:02 +0000 Subject: Change in osmo-gsm-tester[master]: event_loop: Log parameters during wait timeout exception In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9348 ) Change subject: event_loop: Log parameters during wait timeout exception ...................................................................... event_loop: Log parameters during wait timeout exception Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d --- M src/osmo_gsm_tester/event_loop.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/event_loop.py index 64a110d..0f647c2 100644 --- a/src/osmo_gsm_tester/event_loop.py +++ b/src/osmo_gsm_tester/event_loop.py @@ -109,7 +109,7 @@ def wait(self, log_obj, condition, *condition_args, timeout=300, timestep=1, **condition_kwargs): if not self.wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep): log.ctx(log_obj) - raise log.Error('Wait timeout') + raise log.Error('Wait timeout', condition=condition, timeout=timeout, timestep=timestep) def sleep(self, log_obj, seconds): assert seconds > 0. -- To view, visit https://gerrit.osmocom.org/9348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1cf104392bfd11ad263264738eb4d8fa60550a5d Gerrit-Change-Number: 9348 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:06:53 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 15:06:53 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_progress_desc In-Reply-To: References: Message-ID: Keith Whyte has posted comments on this change. ( https://gerrit.osmocom.org/9352 ) Change subject: Add enum gsm48_progress_desc ...................................................................... Patch Set 1: -Code-Review (1 comment) https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h File include/osmocom/gsm/protocol/gsm_04_08.h: https://gerrit.osmocom.org/#/c/9352/1/include/osmocom/gsm/protocol/gsm_04_08.h at 1377 PS1, Line 1377: enum gsm48_progress_desc { > I suppose the values are from the spec, you just made up the shortened names? That's what we always [?] Correct, the values are from spec. -- To view, visit https://gerrit.osmocom.org/9352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 Gerrit-Change-Number: 9352 Gerrit-PatchSet: 1 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Comment-Date: Mon, 28 May 2018 15:06:53 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:08:21 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 15:08:21 +0000 Subject: Change in libosmocore[master]: vty logging: restore level everything for level all In-Reply-To: References: Message-ID: Keith Whyte has abandoned this change. ( https://gerrit.osmocom.org/4313 ) Change subject: vty logging: restore level everything for level all ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/4313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Idd9933e0e1c06fd217866e2d4dbe6cae63296a16 Gerrit-Change-Number: 4313 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte Gerrit-Reviewer: Max -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon May 28 15:10:06 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 15:10:06 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#137?= In-Reply-To: <1883654278.195.1527433807000.JavaMail.jenkins@jenkins.osmocom.org> References: <1883654278.195.1527433807000.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <791644301.224.1527520206948.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.92 KB...] checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs mkdir .libs mkdir .libs mkdir .libs mkdir: cannot create directory '.libs': File exists mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o mkdir: cannot create directory '.libs': File exists gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Mon May 28 15:13:34 2018 From: gerrit-no-reply at lists.osmocom.org (Keith Whyte) Date: Mon, 28 May 2018 15:13:34 +0000 Subject: Change in libosmocore[master]: Add enum gsm48_progress_desc In-Reply-To: References: Message-ID: Keith Whyte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9352 ) Change subject: Add enum gsm48_progress_desc ...................................................................... Add enum gsm48_progress_desc >From GSM 04.08 Section 10.5.4.21 / Table 10.5.127 Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 0bb2dce..4c98ff2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -1372,6 +1372,18 @@ #define GSM48_IE_FOLLOW_ON_PROC 0xa1 #define GSM48_IE_CTS_PERMISSION 0xa2 +/* Section 10.5.4.21 / Table 10.5.127 */ + +enum gsm48_progress_desc { + GSM48_PROGR_NOT_E2E = 0x00, + GSM48_PROGR_DEST_NOT_PLMN = 0x02, + GSM48_PROGR_ORIG_NOT_PLMN = 0x03, + GSM48_PROGR_RETURNED = 0x04, + GSM48_PROGR_IN_BAND_AVAIL = 0x08, + GSM48_PROGR_CALL_E2E = 0x20, + GSM48_PROGR_QUEUEING = 0x40, +}; + /* Section 10.5.4.23 / Table 10.5.130 */ enum gsm48_signal_val { GSM48_SIGNAL_DIALTONE = 0x00, -- To view, visit https://gerrit.osmocom.org/9352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6574e8808aaf39fad8026290aa2cc657734e18b5 Gerrit-Change-Number: 9352 Gerrit-PatchSet: 2 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:20:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:20:47 +0000 Subject: Change in openbsc[master]: acc_ramp: Increase log level of some messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9351 ) Change subject: acc_ramp: Increase log level of some messages ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iec10c2be7aa5efeadd6b0706916678acc5461111 Gerrit-Change-Number: 9351 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 15:20:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:20:48 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:20:48 +0000 Subject: Change in openbsc[master]: acc_ramp: Increase log level of some messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9351 ) Change subject: acc_ramp: Increase log level of some messages ...................................................................... acc_ramp: Increase log level of some messages Right now, it's impossible to see any ACC Ramping information unless RSL category is set to DEBUG. Barring and Allowing Access Control Class is an important event which should be printed in most cases. Increase log levels of messages printed during some error conditions to be handled as errors. Backport of osmo-bsc.git commit 67f20bc356a4908bdb71b5dfc6a1932e6c1fac68. Change-Id: Iec10c2be7aa5efeadd6b0706916678acc5461111 --- M openbsc/src/libbsc/acc_ramp.c 1 file changed, 4 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libbsc/acc_ramp.c b/openbsc/src/libbsc/acc_ramp.c index c90d087..0c4dbac 100644 --- a/openbsc/src/libbsc/acc_ramp.c +++ b/openbsc/src/libbsc/acc_ramp.c @@ -46,7 +46,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if (acc_ramp->barred_accs & (1 << acc)) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: allowing Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs &= ~(1 << acc); } @@ -54,7 +54,7 @@ { OSMO_ASSERT(acc >= 0 && acc <= 9); if ((acc_ramp->barred_accs & (1 << acc)) == 0) - LOGP(DRSL, LOGL_DEBUG, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: barring Access Control Class %u\n", acc_ramp->bts->nr, acc); acc_ramp->barred_accs |= (1 << acc); } @@ -210,7 +210,7 @@ break; case NM_STATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized administrative state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -249,7 +249,7 @@ break; case NM_OPSTATE_NULL: default: - LOGP(DRSL, LOGL_NOTICE, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " + LOGP(DRSL, LOGL_ERROR, "(bts=%d) ACC RAMP: unrecognized operational state '0x%x' " "reported for TRX 0\n", acc_ramp->bts->nr, nsd->new_state->administrative); break; } @@ -361,4 +361,3 @@ allow_all_accs(acc_ramp); } - -- To view, visit https://gerrit.osmocom.org/9351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iec10c2be7aa5efeadd6b0706916678acc5461111 Gerrit-Change-Number: 9351 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun May 27 20:03:25 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:03:25 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/i586 In-Reply-To: References: Message-ID: <5b0b0f232b4b6_449dfda6885829e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_d.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_4.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_1.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_9.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_f.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_5.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_10.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/nomatches.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_2.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_3.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_b.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_2.js exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/defines_0.html exists in debian/tmp but is not installed to anywhere [ 209s] dh_install: missing files, aborting [ 209s] debian/rules:21: recipe for target 'override_dh_install' failed [ 209s] make[1]: *** [override_dh_install] Error 2 [ 209s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 209s] debian/rules:15: recipe for target 'binary' failed [ 209s] make: *** [binary] Error 2 [ 209s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 209s] [ 209s] lamb71 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:10 UTC 2018. [ 209s] [ 209s] ### VM INTERACTION START ### [ 212s] [ 204.527073] reboot: Power down [ 212s] ### VM INTERACTION END ### [ 212s] [ 212s] lamb71 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:13 UTC 2018. [ 212s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:02:17 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:02:17 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_17.04/x86_64 In-Reply-To: References: Message-ID: <5b0b0ee83125e_449dfda68858268c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_17.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_4.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/searchdata.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_b.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_0.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_16.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_5.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_11.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_13.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/sh[ 188.832263] serial8250: too much work for irq4 [ 197s] are/doc/libosmocore/ctrl/html/search/classes_4.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_5.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_8.js exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_2.html exists in debian/tmp but is not installed to anywhere [ 197s] dh_install: missing files, aborting [ 197s] debian/rules:21: recipe for target 'override_dh_install' failed [ 197s] make[1]: *** [override_dh_install] Error 2 [ 197s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 197s] debian/rules:15: recipe for target 'binary' failed [ 197s] make: *** [binary] Error 2 [ 197s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 197s] [ 197s] lamb67 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:02:03 UTC 2018. [ 197s] [ 197s] ### VM INTERACTION START ### [ 200s] [ 192.302958] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] lamb67 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:02:07 UTC 2018. [ 200s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 19:56:51 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 19:56:51 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/x86_64 In-Reply-To: References: Message-ID: <5b0b0d9db15ce_449dfda6885819b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 291s] are/doc/libosmocore/ctrl/html/search/functions_b.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_8.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_2.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enumvalues_1.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/defines_0.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_a.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/close.png exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_1.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_9.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_5.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_5.js exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_a.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_d.html exists in debian/tmp but is not installed to anywhere [ 291s] dh_install: missing files, aborting [ 291s] debian/rules:21: recipe for target 'override_dh_install' failed [ 291s] make[1]: *** [override_dh_install] Error 2 [ 291s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 291s] debian/rules:15: recipe for target 'binary' failed [ 291s] make: *** [binary] Error 2 [ 291s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 291s] [ 291s] cloud103 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:56:38 UTC 2018. [ 291s] [ 291s] ### VM INTERACTION START ### [ 294s] [ 259.766819] reboot: Power down [ 299s] ### VM INTERACTION END ### [ 299s] [ 299s] cloud103 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:56:47 UTC 2018. [ 299s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 19:55:43 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 19:55:43 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/armv7l In-Reply-To: References: Message-ID: <5b0b0d40c0ff9_449dfda688581872@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_12.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_c.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/defines_2.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_14.js exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_f.js exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_9.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_7.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_9.js exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_e.js exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_9.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_6.js exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_3.html exists in debian/tmp but is not installed to anywhere [ 366s] dh_install: missing files, aborting [ 366s] debian/rules:21: recipe for target 'override_dh_install' failed [ 366s] make[1]: *** [override_dh_install] Error 2 [ 366s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 366s] debian/rules:15: recipe for target 'binary' failed [ 366s] make: *** [binary] Error 2 [ 366s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 366s] [ 366s] armbuild22 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:55:31 UTC 2018. [ 366s] [ 366s] ### VM INTERACTION START ### [ 369s] [ 357.576084] SysRq : Power Off [ 369s] [ 357.577189] reboot: Power down [ 369s] ### VM INTERACTION END ### [ 369s] [ 369s] armbuild22 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:55:34 UTC 2018. [ 369s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 19:55:08 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 19:55:08 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/i586 In-Reply-To: References: Message-ID: <5b0b0d259bd19_449dfda6885815b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_3.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_e.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_d.html exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_d.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_12.html exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_0.html exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_c.html exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_15.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_0.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_11.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_f.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_5.js exists in debian/tmp but is not installed to anywhere [ 210s] dh_install: missing files, aborting [ 210s] debian/rules:21: recipe for target 'override_dh_install' failed [ 210s] make[1]: *** [override_dh_install] Error 2 [ 210s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 210s] debian/rules:15: recipe for target 'binary' failed [ 210s] make: *** [binary] Error 2 [ 210s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 210s] [ 210s] lamb14 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:52 UTC 2018. [ 210s] [ 210s] ### VM INTERACTION START ### [ 211s] Powering off. [ 211s] [ 203.401095] reboot: Power down [ 211s] ### VM INTERACTION END ### [ 211s] [ 211s] lamb14 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:53 UTC 2018. [ 211s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From laforge at gnumonks.org Mon May 28 15:50:53 2018 From: laforge at gnumonks.org (Harald Welte) Date: Mon, 28 May 2018 17:50:53 +0200 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/i586 In-Reply-To: <5b0b0f232b4b6_449dfda6885829e1@build.opensuse.org> References: <5b0b0f232b4b6_449dfda6885829e1@build.opensuse.org> Message-ID: <20180528155053.GC5680@nataraja> Hi Lynxis, this is my fault (no libosmoctrl-doc sub-package), will fix it. -- - Harald Welte http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6) From admin at opensuse.org Sun May 27 19:54:51 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 19:54:51 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_17.04/i586 In-Reply-To: References: Message-ID: <5b0b0d254b014_449dfda688581459@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_17.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_2.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_1.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_5.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_15.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_e.html exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_a.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_6.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_9.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_insta[ 205.476236] serial8250: too much work for irq4 [ 214s] ll: usr/share/doc/libosmocore/ctrl/html/search/all_4.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_7.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_11.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_f.js exists in debian/tmp but is not installed to anywhere [ 214s] dh_install: missing files, aborting [ 214s] debian/rules:21: recipe for target 'override_dh_install' failed [ 214s] make[1]: *** [override_dh_install] Error 2 [ 214s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 214s] debian/rules:15: recipe for target 'binary' failed [ 214s] make: *** [binary] Error 2 [ 214s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 214s] [ 214s] lamb03 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:45 UTC 2018. [ 214s] [ 214s] ### VM INTERACTION START ### [ 217s] [ 208.986234] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] lamb03 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:48 UTC 2018. [ 217s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 19:55:08 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 19:55:08 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.10/i586 In-Reply-To: References: Message-ID: <5b0b0d2633a99_449dfda688581639@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.10/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_2.js exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_7.js exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_8.js exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_1.js exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_1.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_0.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_3.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_7.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/shar[ 209.524315] serial8250: too much work for irq4 [ 218s] e/doc/libosmocore/ctrl/html/search/mag_sel.png exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_a.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_8.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_8.html exists in debian/tmp but is not installed to anywhere [ 218s] dh_install: missing files, aborting [ 218s] debian/rules:21: recipe for target 'override_dh_install' failed [ 218s] make[1]: *** [override_dh_install] Error 2 [ 218s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 218s] debian/rules:15: recipe for target 'binary' failed [ 218s] make: *** [binary] Error 2 [ 218s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 218s] [ 218s] lamb07 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:55 UTC 2018. [ 218s] [ 218s] ### VM INTERACTION START ### [ 221s] [ 213.117887] reboot: Power down [ 221s] ### VM INTERACTION END ### [ 221s] [ 221s] lamb07 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 19:54:58 UTC 2018. [ 221s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:03:59 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:03:59 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/x86_64 In-Reply-To: References: Message-ID: <5b0b0f3e38a99_449dfda6885831da@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_7.html exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_13.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_11.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_c.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/defines_0.html exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_8.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_5.html exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_0.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_6.html exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_14.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_8.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_b.html exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_3.js exists in debian/tmp but is not installed to anywhere [ 213s] dh_install: missing files, aborting [ 213s] debian/rules:21: recipe for target 'override_dh_install' failed [ 213s] make[1]: *** [override_dh_install] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] debian/rules:15: recipe for target 'binary' failed [ 213s] make: *** [binary] Error 2 [ 213s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 213s] [ 214s] lamb19 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:53 UTC 2018. [ 214s] [ 214s] ### VM INTERACTION START ### [ 217s] [ 209.794915] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] lamb19 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:57 UTC 2018. [ 217s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:01:43 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:01:43 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_8.0/x86_64 In-Reply-To: References: Message-ID: <5b0b0eaa4655a_449dfda688582586@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmocore failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_4.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_c.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enumvalues_2.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_0.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_6.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_0.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_e.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_15.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_f.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_4.html exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_9.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_14.js exists in debian/tmp but is not installed to anywhere [ 118s] dh_install: missing files, aborting [ 118s] debian/rules:21: recipe for target 'override_dh_install' failed [ 118s] make[1]: *** [override_dh_install] Error 2 [ 118s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 118s] debian/rules:15: recipe for target 'binary' failed [ 118s] make: *** [binary] Error 2 [ 118s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 118s] [ 118s] build77 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:01:38 UTC 2018. [ 118s] [ 118s] ### VM INTERACTION START ### [ 119s] Powering off. [ 119s] [ 114.676838] reboot: Power down [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] build77 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:01:41 UTC 2018. [ 120s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:07:43 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:07:43 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in Debian_9.0/i586 In-Reply-To: References: Message-ID: <5b0b102f65c50_449dfda68858398@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Debian_9.0/i586 Package network:osmocom:nightly/libosmocore failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/classes_5.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_2.js exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_b.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_7.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_5.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_15.js exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_6.js exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/typedefs_3.js exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_10.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_c.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_4.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_c.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_a.html exists in debian/tmp but is not installed to anywhere [ 206s] dh_install: missing files, aborting [ 206s] debian/rules:21: recipe for target 'override_dh_install' failed [ 206s] make[1]: *** [override_dh_install] Error 2 [ 206s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 206s] debian/rules:15: recipe for target 'binary' failed [ 206s] make: *** [binary] Error 2 [ 206s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 206s] [ 206s] lamb74 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:07:25 UTC 2018. [ 206s] [ 206s] ### VM INTERACTION START ### [ 209s] [ 201.197566] reboot: Power down [ 209s] ### VM INTERACTION END ### [ 209s] [ 209s] lamb74 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:07:29 UTC 2018. [ 209s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:03:42 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:03:42 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_17.10/x86_64 In-Reply-To: References: Message-ID: <5b0b0f23ab31a_449dfda68858305b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 193s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/all_12.js exists in debian/tmp but is not installed to anywhere [ 193s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/nomatches.html exists in debian/tmp but is not installed to anywhere [ 193s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/all_6.html exists in debian/tmp but is not installed to anywhere [ 193s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/groups_5.html exists in debian/tmp but is not installed to anywhere [ 193s] dh_missing: missing files, aborting [ 193s] The following debhelper tools have reported what they installed (with files per package) [ 193s] * dh_install: libosmocodec-doc (1), libosmocodec0 (2), libosmocoding-doc (1), libosmocoding0 (2), libosmocore (0), libosmocore-dbg (0), libosmocore-dev (35), libosmocore-doc (1), libosmocore-utils (2), libosmocore10 (2), libosmoctrl0 (2), libosmogb-doc (1), libosmogb6 (2), libosmogsm-doc (1), libosmogsm9 (2), libosmosim0 (2), libosmovty-doc (1), libosmovty4 (2) [ 193s] If the missing files are installed by another tool, please file a bug against it. [ 193s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 193s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 193s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 193s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 193s] For a short-term work-around: Add the files to debian/not-installed [ 193s] dh_install: dh_missing --fail-missing returned exit code 2 [ 193s] debian/rules:21: recipe for target 'override_dh_install' failed [ 193s] make[1]: *** [override_dh_install] Error 25 [ 193s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 193s] debian/rules:15: recipe for target 'binary' failed [ 193s] make: *** [binary] Error 2 [ 193s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 193s] [ 193s] lamb67 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:21 UTC 2018. [ 193s] [ 193s] ### VM INTERACTION START ### [ 196s] [ 188.391172] reboot: Power down [ 196s] ### VM INTERACTION END ### [ 196s] [ 196s] lamb67 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:03:25 UTC 2018. [ 196s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon May 28 15:54:14 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:54:14 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9353 Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... debian: Add libosmoctrl-doc sub-package This fixes the debian package builds for libosmocore.git Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f --- M debian/control A debian/libosmoctrl-doc.doc-base A debian/libosmoctrl-doc.install M debian/rules 4 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/9353/1 diff --git a/debian/control b/debian/control index 912582b..ff73f6c 100644 --- a/debian/control +++ b/debian/control @@ -261,6 +261,21 @@ . The libosmoctrl library in particular contains an SNMP-like status interface. +Package: libosmoctrl-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmocoding0, + libjs-jquery +Description: Documentation for the Osmocom CTRL library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmoctrl library. + Package: libosmosim0 Section: libs Architecture: any diff --git a/debian/libosmoctrl-doc.doc-base b/debian/libosmoctrl-doc.doc-base new file mode 100644 index 0000000..173d157 --- /dev/null +++ b/debian/libosmoctrl-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmoctrl-doc +Title: Documentation for the libosmoctrl library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/ctrl/html/index.html +Files: /usr/share/doc/libosmocore/ctrl/html/*.html diff --git a/debian/libosmoctrl-doc.install b/debian/libosmoctrl-doc.install new file mode 100644 index 0000000..c7afaf1 --- /dev/null +++ b/debian/libosmoctrl-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/ctrl/ diff --git a/debian/rules b/debian/rules index 2399b01..6eb7346 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,7 @@ $(RM) tests/testsuite $(RM) -r doc/codec/ $(RM) -r doc/core/ + $(RM) -r doc/ctrl/ $(RM) -r doc/gsm/ $(RM) -r doc/gb/ $(RM) -r doc/vty/html/ -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Sun May 27 20:02:17 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:02:17 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.10/x86_64 In-Reply-To: References: Message-ID: <5b0b0ee8c071e_449dfda6885827f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.10/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_4.js exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/search.js exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_5.js exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_10.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/functions_d.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_8.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_5.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/groups_2.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_2.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/enums_1.js exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/variables_a.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/all_f.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: usr/share/doc/libosmocore/ctrl/html/search/files_f.html exists in debian/tmp but is not installed to anywhere [ 203s] dh_install: missing files, aborting [ 203s] debian/rules:21: recipe for target 'override_dh_install' failed [ 203s] make[1]: *** [override_dh_install] Error 2 [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 203s] debian/rules:15: recipe for target 'binary' failed [ 203s] make: *** [binary] Error 2 [ 203s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 203s] [ 203s] lamb08 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:02:11 UTC 2018. [ 203s] [ 203s] ### VM INTERACTION START ### [ 207s] [ 198.416261] reboot: Power down [ 207s] ### VM INTERACTION END ### [ 207s] [ 207s] lamb08 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:02:15 UTC 2018. [ 207s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From admin at opensuse.org Sun May 27 20:06:00 2018 From: admin at opensuse.org (OBS Notification) Date: Sun, 27 May 2018 20:06:00 +0000 Subject: Build failure of network:osmocom:nightly/libosmocore in xUbuntu_18.04/x86_64 In-Reply-To: References: Message-ID: <5b0b0fb5e504a_449dfda68858331e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_18.04/x86_64 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_18.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 276s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/groups_2.js exists in debian/tmp but is not installed to anywhere [ 276s] dh_missing: usr/share/doc/libosmocore/ctrl/html/sea[ 256.093167] serial8250: too much work for irq4 [ 276s] rch/classes_8.html exists in debian/tmp but is not installed to anywhere [ 276s] dh_missing: usr/share/doc/libosmocore/ctrl/html/search/files_f.js exists in debian/tmp but is not installed to anywhere [ 276s] dh_missing: missing files, aborting [ 276s] The following debhelper tools have reported what they installed (with files per package) [ 276s] * dh_install: libosmocodec-doc (1), libosmocodec0 (2), libosmocoding-doc (1), libosmocoding0 (2), libosmocore (0), libosmocore-dbg (0), libosmocore-dev (35), libosmocore-doc (1), libosmocore-utils (2), libosmocore10 (2), libosmoctrl0 (2), libosmogb-doc (1), libosmogb6 (2), libosmogsm-doc (1), libosmogsm9 (2), libosmosim0 (2), libosmovty-doc (1), libosmovty4 (2) [ 276s] If the missing files are installed by another tool, please file a bug against it. [ 276s] When filing the report, if the tool is not part of debhelper itself, please reference the [ 276s] "Logging helpers and dh_missing" section from the "PROGRAMMING" guide for debhelper (10.6.3+). [ 276s] (in the debhelper package: /usr/share/doc/debhelper/PROGRAMMING.gz) [ 276s] Be sure to test with dpkg-buildpackage -A/-B as the results may vary when only a subset is built [ 276s] For a short-term work-around: Add the files to debian/not-installed [ 276s] dh_install: dh_missing --fail-missing returned exit code 2 [ 276s] debian/rules:21: recipe for target 'override_dh_install' failed [ 276s] make[1]: *** [override_dh_install] Error 25 [ 276s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 276s] debian/rules:15: recipe for target 'binary' failed [ 276s] make: *** [binary] Error 2 [ 276s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 276s] [ 276s] cloud108 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:05:37 UTC 2018. [ 276s] [ 276s] ### VM INTERACTION START ### [ 279s] [ 259.047369] reboot: Power down [ 284s] ### VM INTERACTION END ### [ 284s] [ 284s] cloud108 failed "build libosmocore_0.11.0.26.b418.dsc" at Sun May 27 20:05:46 UTC 2018. [ 284s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon May 28 15:55:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:55:09 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9353 ) Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 15:55:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:56:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:56:05 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package In-Reply-To: References: Message-ID: Harald Welte has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/9353 ) Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... debian: Add libosmoctrl-doc sub-package This fixes the debian package builds for libosmocore.git Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f --- M debian/control A debian/libosmoctrl-doc.doc-base A debian/libosmoctrl-doc.install M debian/rules 4 files changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/53/9353/2 -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 15:56:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 15:56:19 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9353 ) Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9353/1/debian/control File debian/control: https://gerrit.osmocom.org/#/c/9353/1/debian/control at 268 PS1, Line 268: libosmocoding0, copy+paste error -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 15:56:19 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:00:23 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 May 2018 16:00:23 +0000 Subject: Change in osmo-bsc[master]: doc: add msc charts on Assignment/Handover internals In-Reply-To: References: Message-ID: Neels Hofmeyr has posted comments on this change. ( https://gerrit.osmocom.org/9350 ) Change subject: doc: add msc charts on Assignment/Handover internals ...................................................................... Patch Set 3: I started with this in osmo-gsm-manuals, actually, but since the charts include ultra detailed in-code references that no user could ever care about, and since I am intending to modify the charts as the code changes, I decided to instead add it here -- To view, visit https://gerrit.osmocom.org/9350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I20999e938441d4fed2d37462b262b74a696f616d Gerrit-Change-Number: 9350 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Mon, 28 May 2018 16:00:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:00:48 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 May 2018 16:00:48 +0000 Subject: Change in osmo-bsc[master]: doc: add msc charts on Assignment/Handover internals In-Reply-To: References: Message-ID: Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/9350 ) Change subject: doc: add msc charts on Assignment/Handover internals ...................................................................... doc: add msc charts on Assignment/Handover internals In doc/, add two message sequence charts with lots of implementation specifics, to clarify the current code state. Mark various problems in red notes. This chart and others should help to illustrate future code changes as I go along refactoring handover, lchan allocation and adding inter-BSC handover. Change-Id: I20999e938441d4fed2d37462b262b74a696f616d --- M doc/Makefile.am A doc/assignment.msc A doc/handover.msc 3 files changed, 357 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/Makefile.am b/doc/Makefile.am index 5a23107..cc2e277 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,15 @@ SUBDIRS = \ examples \ $(NULL) + +msc: \ + $(builddir)/handover.png \ + $(builddir)/assignment.png \ + $(NULL) + +$(builddir)/%.png: $(srcdir)/%.msc + mscgen -T png -o $@ $< + +.PHONY: poll +poll: + while true; do $(MAKE) msc; sleep 1; done diff --git a/doc/assignment.msc b/doc/assignment.msc new file mode 100644 index 0000000..e2bdf84 --- /dev/null +++ b/doc/assignment.msc @@ -0,0 +1,181 @@ +msc { + hscale=3; + ms [label="MS"], bts [label="BTS"], bsc[label="BSC"], bsc_gscon[label="BSC conn FSM"], bsc_mgcp[label="BSC mgcp FSM"], mgw[label="MGW"], msc_[label="MSC"]; + + ms note msc_ [label="lchan allocation sequence for BSSMAP Assignment Request"]; + + bsc <= msc_ [label="BSSMAP Assignment Request"]; + bsc box bsc [label="bssmap_handle_assignm_req()"]; + bsc -> bsc_gscon [label="GSCON_EV_A_ASSIGNMENT_CMD"]; + + --- [label="is the chan_mode a speech mode?"]; + + bsc_gscon abox bsc_gscon [label="ST_WAIT_CRCX_BTS (MGCP_MGW_TIMEOUT = 4s)"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_create()"]; + bsc_mgcp => mgw [label="CRCX (for BTS)"]; + bsc_mgcp abox bsc_mgcp [label="ST_CRCX (MGCP_MGW_TIMEOUT = 4s)"]; + bsc_gscon note bsc_mgcp [label="two timeouts running in parallel"]; + bsc_gscon note bsc_mgcp [label="note: #define MGCP_MGW_TIMEOUT exists twice, + once in libosmo-mgcp-client, + once in bsc_subscr_conn_fsm.c"]; + bsc_mgcp -> bsc_gscon [label="mgcp_conn_create() exits"]; + bsc_gscon -> bsc [label="bssmap_handle_assignm_req() exits"]; + ...; + --- [label="On Timeout"]; + bsc_gscon note bsc_gscon [label="The conn FSM likely timeouts first"]; + bsc_gscon => msc_ [label="BSSMAP Assignment Failure"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc_mgcp note bsc_mgcp [label="The MGCP FSM will timeout right after that, and terminate itself, + emitting the parent_term event set upon mgcp_conn_create():"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_FAIL_BTS"]; + bsc_gscon note bsc_gscon [label="GSCON_EV_MGW_FAIL_BTS is handled by the conn FSM allstate + handler. It sets conn->user_plane.fi_bts = NULL. There is code + that would emit a BSSMAP Assignment Failure, but not in + ST_ACTIVE"]; + --- [label="end: 'On Timeout'"]; + ...; + + bsc_mgcp <= mgw [label="CRCX OK (for BTS)"]; + bsc_mgcp box bsc_mgcp [label="libosmo-mgcp-client fsm_crcx_resp_cb()"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_CRCX_RESP_BTS"]; + --- [label="end: 'is the chan_mode a speech mode?'"]; + + bsc_gscon note bsc_gscon [label="for mode=sign, we're still handling GSCON_EV_A_ASSIGNMENT_CMD; + for speech mode, we're handling GSCON_EV_MGW_CRCX_RESP_BTS"]; + bsc <- bsc_gscon [label="gsm0808_assign_req()"]; + + bsc box bsc [label="lchan_alloc(): pick available lchan"]; + bsc box bsc [label="rsl_chan_activate_lchan()"]; + + --- [label="is the chosen lchan on dynamic timeslot that is currently used as PDCH?"]; + bts <= bsc [label="i) RSL RF Chan Release of PDCH (Osmocom dyn TS)"]; + bts <= bsc [label="OR ii) RSL PDCH Deact (ip.access dyn TS)"]; + bsc -> bsc_gscon [label="gsm0808_assign_req() returns early"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"]; + ...; + bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"]; + bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"]; + bsc box bsc [label="rsl_chan_activate_lchan() re-invoked"]; + bts <= bsc [label="RSL Chan Activ"]; + --- [label="else (no dyn TS switchover)"]; + + bts <= bsc [label="RSL Chan Activ"]; + bsc -> bsc_gscon [label="gsm0808_assign_req() returns"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"]; + ---; + + ...; + --- [label="On Timeout"]; + bsc_gscon => msc_ [label="BSSMAP Assignment Failure"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc_gscon note bsc_mgcp [linecolor="red", + label="The mgcp FSM from CRCX above apparently lacks a cleanup action for this case. + It should be cleaned up eventually when the conn is torn down, but we should + release RTP endpoints as soon as possible."]; + --- [label="end: 'On Timeout'"]; + ...; + + bts => bsc [label="RSL Chan Activ ACK"]; + bsc box bsc [label="bsc_api.c handle_chan_ack()"]; + ms <= bsc [label="RR Assignment Command"]; + + ...; + ms note bsc_gscon [label="We rely on the overall conn FSM ST_WAIT_ASS_COMPL timeout."]; + ...; + + ms => bsc [label="RR Assignment Complete"]; + bsc box bsc [label="handle_ass_compl()"]; + --- [label="Release old lchan"]; + bsc box bsc [label="_lchan_handle_release(sacch_deact=0)"]; + bsc box bsc [label="rsl_release_sapis_from(start=1)"]; + bts <= bsc [label="RSL Release Request (Local End)..."]; + bts <= bsc [label="...for each SAPI except link_id=0"]; + bsc box bsc [label="rsl_release_request(link_id=0)"]; + bts <= bsc [label="RSL Release Request (Local End) for link_id=0"]; + bsc box bsc [label="_lchan_handle_release() returns here, the remaining release is asynchronous; + see `End: 'Release old lchan'` below."]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over RSL Release Request!"]; + ...; + bts => bsc [label="RSL Release Confirm..."]; + bts => bsc [label="...for each SAPI and link_id=0"]; + bsc abox bsc [label="start T3111"]; + ...; + bsc box bsc [label="T3111 expires"]; + bsc abox bsc [label="Start lchan->act_timer with lchan_deact_tmr_cb"]; + bts <= bsc [label="RSL RF Channel Release"]; + ...; + --- [label="On timeout"]; + bsc box bsc [label="lchan_deact_tmr_cb()"]; + bsc box bsc [label="rsl_lchan_mark_broken(): state=LCHAN_S_BROKEN"]; + bsc box bsc [label="lchan_free()"]; + bsc -> bsc [label="S_LCHAN_UNEXPECTED_RELEASE"]; + bsc box bsc [label="bsc_api.c handle_release()"]; + bsc box bsc [label="bsc->assign_fail()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_FAIL"]; + bsc note bsc_gscon [linecolor="orange", + label="The name 'RR_ASS_FAIL' might suggest the event means an actual RR Assignment + Failure message being received. Maybe this should be called GSCON_EV_ASSIGNMENT_ERROR."]; + ...; + bsc box bsc [label="bsc->clear_request()"]; + bsc box bsc [label="bsc_clear_request encodes a BSSMAP Clear Request message and passes it on + to the conn FSM as data argument via:"]; + bsc -> bsc_gscon [label="GSCON_EV_TX_SCCP"]; + bsc_gscon => msc_ [label="BSSMAP Clear Request"]; + bsc note bsc_gscon [linecolor="red", + label="Instead of sending an arbitrary message, the conn FSM should + be explicitly instructed to clear the connection, to be able + to notice if the MSC failed to respond to the Clear Request. + Currently, this relies on the MSC responding with a Clear + Command, hopefully, some time later."]; + --- [label="End: 'On timeout'"]; + ...; + bts => bsc [label="RSL RF Channel Release Ack"]; + --- [label="End: 'Release old lchan'"]; + bsc box bsc [label="still in handle_ass_compl()"]; + bsc note bsc [label="officially take over new lchan: conn->lchan = conn->secondary_lchan"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access)"]; + bts <= bsc [label="IPACC CRCX"]; + ---; + bsc -> bsc [label="handle_ass_compl() calls bsc_api->assign_compl()"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access) && conn->user_plane.rtp_ip"]; + bsc box bsc [label="bsc_assign_compl()"]; + bsc note bsc [label="set ass_compl.valid = true, + postponing GSCON_EV_RR_ASS_COMPL until after the + IPACC MDCX ACK received in osmo_bsc_audio.c"]; + bsc box bsc [label="exit early: bsc_assign_compl()"]; + bsc box bsc [label="exit early: handle_ass_compl()"]; + bsc box bsc [label="osmo_bsc_audio.c"]; + bts => bsc [label="IPACC CRCX ACK"]; + bts <= bsc [label="IPACC MDCX"]; + bts => bsc [label="IPACC MDCX ACK"]; + bsc box bsc [label="handle_abisip_signal()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_COMPL"]; + --- [label="else"]; + bsc box bsc [label="bsc_assign_compl()"]; + bsc -> bsc_gscon [label="GSCON_EV_RR_ASS_COMPL"]; + --- ; + + --- [label="is chan_mode a speech mode?"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_MDCX_BTS"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_modify()"]; + bsc_mgcp note bsc_mgcp [label="same mgcp FSM as above, for BTS side"]; + bsc_mgcp => mgw [label="MDCX (for BTS)"]; + bsc_mgcp <= mgw [label="MDCX OK"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_MDCX_RESP_BTS"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_CRCX_MSC"]; + bsc_gscon -> bsc_mgcp [label="mgcp_conn_create()"]; + bsc_mgcp note bsc_mgcp [label="second mgcp FSM for MSC side"]; + bsc_mgcp => mgw [label="CRCX (for MSC)"]; + bsc_mgcp <= mgw [label="CRCX OK (for MSC)"]; + bsc_gscon <- bsc_mgcp [label="GSCON_EV_MGW_CRCX_RESP_MSC"]; + ---; + + bsc_gscon => msc_ [label="BSSMAP Assignment Complete"]; + + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; +} diff --git a/doc/handover.msc b/doc/handover.msc new file mode 100644 index 0000000..e5e787c --- /dev/null +++ b/doc/handover.msc @@ -0,0 +1,164 @@ +# Handover between cells, intra-BSC +msc { + hscale=3; + ms [label="MS"], bts [label="BTS"], bsc[label="BSC"], bsc_gscon[label="BSC conn FSM"], bsc_mgcp[label="BSC mgcp FSM"], mgw[label="MGW"]; + + ms note mgw [label="intra-BSC Handover sequence"]; + + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; + bsc box bsc [label="bsc_handover_start(): init conn->ho"]; + bsc -> bsc_gscon [label="GSCON_EV_HO_START"]; + bsc <- bsc_gscon [label="bsc_handover_start_gscon()"]; + + bsc box bsc [label="lchan_alloc(): pick available lchan"]; + bsc box bsc [label="rsl_chan_activate_lchan()"]; + + --- [label="is the chosen lchan on dynamic timeslot that is currently used as PDCH?"]; + bts <= bsc [label="i) RSL RF Chan Release of PDCH (Osmocom dyn TS)"]; + bts <= bsc [label="OR ii) RSL PDCH Deact (ip.access dyn TS)"]; + bsc -> bsc_gscon [label="bsc_handover_start_gscon() returns early"]; + bsc_gscon abox bsc_gscon [label="ST_WAIT_HO_COMPL (no timeout, relies on T3103 below)"]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"]; + ...; + bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"]; + bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"]; + bsc box bsc [label="rsl_chan_activate_lchan() re-invoked"]; + bts <= bsc [label="RSL Chan Activ"]; + --- [label="else (no dyn TS switchover)"]; + + bts <= bsc [label="RSL Chan Activ"]; + bsc -> bsc_gscon [label="bsc_handover_start_gscon() returns"]; + ---; + bsc_gscon abox bsc_gscon [label="ST_WAIT_HO_COMPL (no timeout, relies on T3103 below)"]; + + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching out for RSL Chan Activ ACK/NACK!"]; + ...; + bts => bsc [label="RSL Chan Activ ACK"]; + bsc -> bsc [label="S_LCHAN_ACTIVATE_ACK"]; + bsc box bsc [label="handover_logic.c ho_logic_sig_cb()"]; + bsc box bsc [label="ho_chan_activ_ack()"]; + bsc note bsc [label="gsm48_send_ho_cmd()"]; + ms <= bsc [label="RR Handover Command"]; + bsc abox bsc [label="start T3103"]; + --- [label="is BTS using IPA Abis? (osmo-bts, ip.access)"]; + bts <= bsc [label="IPACC CRCX"]; + bsc -> bsc [label="ho_chan_activ_ack() returns"]; + bts note bsc [linecolor="red", + label="There seems to be no timer watching over IPACC CRCX ACK/NACK! + If no response is received, we simply ignore that fact and carry on as if + everything was fine."]; + ...; + bts note bsc [label="The IPACC CRCX and MDCX ACKs may come back at any time: + before or after the Handover Detect, before or after Handover Complete."]; + bts note bsc_mgcp [linecolor="red", + label="The CRCX ACK contains vital information for routing the RTP stream. + If the CRCX ACK were very slow, we would not know which RTP/RTPC ports + to point the MGW at, below at mgcp_conn_modify()! + Even though this being unrealistic, we must make sure to receive a CRCX ACK."]; + ...; + bsc box bsc [label="osmo_bsc_audio.c"]; + bts => bsc [label="IPACC CRCX ACK"]; + bts <= bsc [label="IPACC MDCX"]; + ...; + bts note bsc [linecolor="red", + label="There seems to be no timer watching over IPACC MDCX ACK/NACK! + If no response is received, we simply ignore that fact and carry on as if + everything was fine."]; + ...; + bts => bsc [label="IPACC MDCX ACK"]; + bts note bsc [label="IPACC MDCX ACK triggers no events or actions"]; + ---; + + ...; + ms => bsc [label="RR Handover Detect"]; + bsc -> bsc [label="S_LCHAN_HANDOVER_DETECT"]; + bsc box bsc [label="ho_rsl_detect(): no action, only logging"]; + bsc note bsc_gscon [label="Handover Detect triggers no events or actions"]; + bsc note bsc_gscon [linecolor="red", + label="upon Handover Detect, we should already start re-routing the RTP! + Instead we wait for Handover Complete."]; + + ...; + ms => bsc [label="RR Handover Complete"]; + bsc -> bsc [label="S_LCHAN_HANDOVER_COMPL"]; + bsc box bsc [label="handover_logic.c ho_logic_sig_cb()"]; + bsc box bsc [label="ho_gsm48_ho_compl()"]; + bsc box bsc [label="stop T3103"]; + bts note bsc_gscon [label="If anything goes wrong from this point on, we will not move back + to the old lchan: would be pointless after Handover Complete."]; + bsc note bsc [label="officially take over new lchan: conn->lchan = ho->new_lchan"]; + + --- [label="Release old lchan"]; + bsc box bsc [label="_lchan_handle_release(sacch_deact=0)"]; + bsc box bsc [label="rsl_release_sapis_from(start=1)"]; + bts <= bsc [label="RSL Release Request (Local End)..."]; + bts <= bsc [label="...for each SAPI except link_id=0"]; + bsc box bsc [label="rsl_release_request(link_id=0)"]; + bts <= bsc [label="RSL Release Request (Local End) for link_id=0"]; + bsc box bsc [label="_lchan_handle_release() returns here, the remaining release is asynchronous; + see `End: 'Release old lchan'` below."]; + ...; + bts note bsc_gscon [linecolor="red", + label="There seems to be no timer watching over RSL Release Request!"]; + ...; + bts => bsc [label="RSL Release Confirm..."]; + bts => bsc [label="...for each SAPI and link_id=0"]; + bsc abox bsc [label="start T3111"]; + ...; + bsc box bsc [label="T3111 expires"]; + bsc abox bsc [label="Start lchan->act_timer with lchan_deact_tmr_cb"]; + bts <= bsc [label="RSL RF Channel Release"]; + ...; + --- [label="On timeout"]; + bsc box bsc [label="lchan_deact_tmr_cb()"]; + bsc box bsc [label="rsl_lchan_mark_broken(): state=LCHAN_S_BROKEN"]; + bsc box bsc [label="lchan_free()"]; + bsc -> bsc [label="S_LCHAN_UNEXPECTED_RELEASE"]; + bsc box bsc [label="bsc_api.c handle_release()"]; + bsc box bsc [label="bsc->clear_request()"]; + bsc box bsc [label="bsc_clear_request encodes a BSSMAP Clear Request message and passes it on + to the conn FSM as data argument via:"]; + bsc -> bsc_gscon [label="GSCON_EV_TX_SCCP"]; + bsc_gscon rbox bsc_gscon [label="BSSMAP Clear Request to MSC"]; + bsc note bsc_gscon [linecolor="red", + label="During Handover, we actually release the entire conn just because we failed to + gracefully release the old lchan. That is obviously nonsense."]; + bsc note bsc [label="Stop T3101 (but was not active in this code path)"]; + bsc -> bsc [label="S_CHALLOC_FREED"]; + --- [label="End: 'On timeout'"]; + ...; + bts => bsc [label="RSL RF Channel Release Ack"]; + ---; + + bsc box bsc [label="still in ho_gsm48_ho_compl()"]; + bsc note bsc [label="handover_free(), conn->ho = NULL"]; + bsc -> bsc_gscon [label="GSCON_EV_HO_COMPL"]; + bsc note bsc_gscon [linecolor="orange", + label="Handover information is cleared before signalling the conn FSM. + That means the conn FSM cannot possibly log sensible information about exactly + which Handover has just completed."]; + + bsc_gscon abox bsc_gscon [label="ST_WAIT_MDCX_BTS_HO + (MGCP_MGW_TIMEOUT=4s with MGCP_MGW_HO_TIMEOUT_TIMER_NR)"]; + + bsc_gscon -> bsc_mgcp [label="mgcp_conn_modify()"]; + bsc_mgcp note bsc_mgcp [label="mgcp FSM that was established for old lchan, for BTS side"]; + bsc_mgcp => mgw [label="MDCX (for BTS)"]; + ...; + bsc_gscon note mgw [ + label="If we get no MDCX ACK, the MGCP FSM terminates, and emits GSCON_EV_MGW_FAIL_BTS. + Besides invalidating the MGCP FSM pointer, this event has no + effect in ST_WAIT_MDCX_BTS_HO, and we rely on above conn FSM + timeout instead."]; + bsc_gscon note bsc_gscon [linecolor="red", + label="A timeout of ST_WAIT_MDCX_BTS_HO simply transitions back to ST_ACTIVE! + Even though the MGW failed, we carry on as if everything were fine."]; + ...; + bsc_mgcp <= mgw [label="MDCX OK"]; + bsc_mgcp -> bsc_gscon [label="GSCON_EV_MGW_MDCX_RESP_BTS"]; + bsc_gscon abox bsc_gscon [label="ST_ACTIVE"]; +} -- To view, visit https://gerrit.osmocom.org/9350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I20999e938441d4fed2d37462b262b74a696f616d Gerrit-Change-Number: 9350 Gerrit-PatchSet: 3 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:01:00 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 May 2018 16:01:00 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9354 Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... ggsn: fix misinterpreted length field in ipcp_contains_option() The abort condition of the while loop in ipcp_contains_option() is accessing ipcp->len directly. Unfortunately this field is an uint16_t which as to be interpreted as little endian value. If it is used without prior conversion the value may appear larger than actually intended and the loop will then not stop at the end of end of the buffer. This can cause unpredictable results when the value given with the parameter enum ipcp_options opt is not found. The loop will then eventually cause a segmentation fauld or is likely to hang as soon as cur_opt->len points to a zero byte in memory. - Make sure that ipcp->len interpreted correctly by accessing it through ntohs() Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Related: OS#3288 --- M ggsn/ggsn.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/54/9354/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 72bf61c..3a8c4be 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -418,7 +418,7 @@ uint8_t *cur = ipcp->options; /* iterate over Options and check if protocol contained */ - while (cur + 2 <= ((uint8_t *)ipcp) + ipcp->len) { + while (cur + 2 <= ((uint8_t *)ipcp) + ntohs(ipcp->len)) { struct ipcp_option_hdr *cur_opt = (struct ipcp_option_hdr *) cur; if (cur_opt->type == opt) return cur_opt; -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:01:01 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 28 May 2018 16:01:01 +0000 Subject: Change in osmo-ggsn[master]: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9355 Change subject: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed ...................................................................... ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed struct ipcp_option_hdr and struct ipcp_hdr are not declared as packed explicitly, but they are used to parse memory blobs by casting pointers. Add __attribute__((packed)) to ensure that those structs are stored packed. Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Related: OS#3288 --- M ggsn/ggsn.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/55/9355/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 3a8c4be..14bf04f 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -403,14 +403,14 @@ uint8_t type; uint8_t len; uint8_t data[0]; -}; +} __attribute__ ((packed)); struct ipcp_hdr { uint8_t code; uint8_t id; uint16_t len; uint8_t options[0]; -}; +} __attribute__ ((packed)); /* determine if IPCP contains given option */ static struct ipcp_option_hdr *ipcp_contains_option(struct ipcp_hdr *ipcp, enum ipcp_options opt) -- To view, visit https://gerrit.osmocom.org/9355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Gerrit-Change-Number: 9355 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:16:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 16:16:46 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9354 ) Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 16:16:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:17:07 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Mon, 28 May 2018 16:17:07 +0000 Subject: Change in osmo-ggsn[master]: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9355 ) Change subject: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Gerrit-Change-Number: 9355 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 16:17:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:20:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:20:42 +0000 Subject: Change in osmo-sip-connector[master]: Add Cause to DISCONNECT and RELEASE Requests In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9270 ) Change subject: Add Cause to DISCONNECT and RELEASE Requests ...................................................................... Add Cause to DISCONNECT and RELEASE Requests GSM 04.08 10.5.4.11 (Table 10.85) states: Coding standards other than the standard defined for the GSM PLMNS shall not be used if the cause can be represented with the GSM standardized coding. This patch adds cause coding GSM PLMS (3) and sets cause location to "public network serving the local user" (2) This prevents UE that pay attention to this from treating all call termination as an error and paves the way to adding correct cause mapping from Table 10.86 Also replaces use of magic numbers with enum constants. Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 --- M src/mncc.c 1 file changed, 12 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/mncc.c b/src/mncc.c index 3b9f0f4..b2c4abb 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -107,6 +107,11 @@ { mncc->msg_type = msg_type; mncc->callref = callref; + if (MNCC_DISC_REQ == msg_type || MNCC_REL_REQ == msg_type) { + mncc->fields |= MNCC_F_CAUSE; + mncc->cause.coding = GSM48_CAUSE_CODING_GSM; + mncc->cause.location = GSM48_CAUSE_LOC_PUN_S_LU; + } } static void mncc_write(struct mncc_connection *conn, struct gsm_mncc *mncc, uint32_t callref) @@ -208,9 +213,9 @@ mncc_fill_header(&out_mncc, MNCC_ALERT_REQ, leg->callref); /* GSM 04.08 10.5.4.21 */ out_mncc.fields |= MNCC_F_PROGRESS; - out_mncc.progress.coding = 3; /* Standard defined for the GSM?PLMNS */ - out_mncc.progress.location = 1; /* Private network serving the local user */ - out_mncc.progress.descr = 8; /* In-band information or appropriate pattern now available */ + out_mncc.progress.coding = GSM48_CAUSE_CODING_GSM; /* Standard defined for the GSM?PLMNS */ + out_mncc.progress.location = GSM48_CAUSE_LOC_PRN_S_LU; /* Private network serving the local user */ + out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */ mncc_write(leg->conn, &out_mncc, leg->callref); @@ -749,16 +754,16 @@ mncc.callref = leg->callref; mncc.fields |= MNCC_F_CALLING; - mncc.calling.plan = 1; - mncc.calling.type = 0x0; + mncc.calling.plan = GSM48_NPI_ISDN_E164; + mncc.calling.type = GSM48_TON_UNKNOWN; osmo_strlcpy(mncc.calling.number, call->source, sizeof(mncc.calling.number)); if (conn->app->use_imsi_as_id) { snprintf(mncc.imsi, 15, "%s", call->dest); } else { mncc.fields |= MNCC_F_CALLED; - mncc.called.plan = 1; - mncc.called.type = 0x0; + mncc.called.plan = GSM48_NPI_ISDN_E164; + mncc.called.type = GSM48_TON_UNKNOWN; osmo_strlcpy(mncc.called.number, call->dest, sizeof(mncc.called.number)); } -- To view, visit https://gerrit.osmocom.org/9270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d3fe3f0c9e8de26dd0c73b10b7e4fc63dff3952 Gerrit-Change-Number: 9270 Gerrit-PatchSet: 3 Gerrit-Owner: Keith Whyte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Keith Whyte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:21:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:21:50 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9354 ) Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 16:21:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:23:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:23:01 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9354 ) Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... Patch Set 1: as indicated in the redmine ticket, please provide a test that reproducs the problem. Also, there's a security issue here, as we're blindly assuming the "length" stays within bounds of the packet. The function needs to be extended with the overall length of the input buffer/memory, so that it doesn't de-reference any out-of-bounds memory. That should be a separate (but urgently needed) patch. -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 16:23:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:23:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:23:16 +0000 Subject: Change in osmo-ggsn[master]: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9355 ) Change subject: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Gerrit-Change-Number: 9355 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Mon, 28 May 2018 16:23:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:23:22 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:23:22 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9353 ) Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 28 May 2018 16:23:22 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:23:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Mon, 28 May 2018 16:23:23 +0000 Subject: Change in libosmocore[master]: debian: Add libosmoctrl-doc sub-package In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9353 ) Change subject: debian: Add libosmoctrl-doc sub-package ...................................................................... debian: Add libosmoctrl-doc sub-package This fixes the debian package builds for libosmocore.git Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f --- M debian/control A debian/libosmoctrl-doc.doc-base A debian/libosmoctrl-doc.install M debian/rules 4 files changed, 24 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/control b/debian/control index 912582b..1de0ceb 100644 --- a/debian/control +++ b/debian/control @@ -261,6 +261,21 @@ . The libosmoctrl library in particular contains an SNMP-like status interface. +Package: libosmoctrl-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + libosmoctrl0, + libjs-jquery +Description: Documentation for the Osmocom CTRL library + This is part of the libosmocore "meta"-library. The libosmocore library + contains various utility functions that were originally developed as part of + the OpenBSC project, but which are of a more generic nature and thus useful to + (at least) other programs that are developed in the sphere of Free Software / + Open Source mobile communication. + . + This package contains the documentation for the libosmoctrl library. + Package: libosmosim0 Section: libs Architecture: any diff --git a/debian/libosmoctrl-doc.doc-base b/debian/libosmoctrl-doc.doc-base new file mode 100644 index 0000000..173d157 --- /dev/null +++ b/debian/libosmoctrl-doc.doc-base @@ -0,0 +1,7 @@ +Document: libosmoctrl-doc +Title: Documentation for the libosmoctrl library +Section: Programming + +Format: HTML +Index: /usr/share/doc/libosmocore/ctrl/html/index.html +Files: /usr/share/doc/libosmocore/ctrl/html/*.html diff --git a/debian/libosmoctrl-doc.install b/debian/libosmoctrl-doc.install new file mode 100644 index 0000000..c7afaf1 --- /dev/null +++ b/debian/libosmoctrl-doc.install @@ -0,0 +1 @@ +usr/share/doc/libosmocore/ctrl/ diff --git a/debian/rules b/debian/rules index 2399b01..6eb7346 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,7 @@ $(RM) tests/testsuite $(RM) -r doc/codec/ $(RM) -r doc/core/ + $(RM) -r doc/ctrl/ $(RM) -r doc/gsm/ $(RM) -r doc/gb/ $(RM) -r doc/vty/html/ -- To view, visit https://gerrit.osmocom.org/9353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I454e3c0175ab5a89e8925e036a3644299367df0f Gerrit-Change-Number: 9353 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon May 28 16:30:04 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Mon, 28 May 2018 16:30:04 +0000 Subject: Change in osmo-bsc[master]: add bsc_stubs.h to workaround linking hell for utils and tests In-Reply-To: References: Message-ID: Neels Hofmeyr has abandoned this change. ( https://gerrit.osmocom.org/9279 ) Change subject: add bsc_stubs.h to workaround linking hell for utils and tests ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/9279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I000be689ed071aced1a085284f924a7e77e5656d Gerrit-Change-Number: 9279 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Mon May 28 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Mon, 28 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#50?= In-Reply-To: <1567831691.201.1527460880827.JavaMail.jenkins@jenkins.osmocom.org> References: <1567831691.201.1527460880827.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <168644816.227.1527547281131.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-16144/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-16144/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-16144/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-16144/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-16144/ libtool: install: (cd /tmp/am-dc-16144/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-16144/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-16144/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-16144/ libtool: install: chmod 644 /tmp/am-dc-16144/ libtool: install: ranlib /tmp/am-dc-16144/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-16144/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-16144/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-16144/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-16144/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-16144/ /bin/mkdir -p '/tmp/am-dc-16144/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-16144/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-16144/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-16144/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-16144/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-16144/ libtool: uninstall: rm -f /tmp/am-dc-16144/ /tmp/am-dc-16144/ /tmp/am-dc-16144/ /tmp/am-dc-16144/ /tmp/am-dc-16144/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-16144/ && rm -f html.tar ) ( cd '/tmp/am-dc-16144/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-16144/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Tue May 29 00:14:26 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 00:14:26 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-iuh_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1250?= Message-ID: <523189641.228.1527552866233.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 1.18 MB...] from ../../../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../../../include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h:18, from ../../../../include/osmocom/ranap/ranap_common.h:8, from ../../../../src/tests/test-helpers.c:24: ../../../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:23: warning: ?struct Member? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct Member { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_GA-Polygon.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct Member { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:23: warning: ?struct MemberC? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberC { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_AuthorisedPLMNs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberC { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:23: warning: ?struct MemberF? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberF { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberF { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:23: warning: ?struct MemberG? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberG { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h:28:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberG { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:23: warning: ?struct MemberH? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberH { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_DataVolumeList.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberH { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:23: warning: ?struct MemberJ? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberJ { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_EUTRANFrequencies.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberJ { ^~~~~~~~~~~~~ In file included from :8:0, from ../../../../include/osmocom/ranap/RANAP_IE-Extensions.h:15, from ../../../../include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h:18, from ../../../../include/osmocom/ranap/ranap_common.h:8, from ../../../../src/tests/test-helpers.c:24: ../../../../include/osmocom/ranap/RANAP_LA-LIST.h:27:23: warning: ?struct MemberA? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberA { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_LA-LIST.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberA { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:23: warning: ?struct MemberK? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberK { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h:26:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberK { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_MessageStructure.h:27:23: warning: ?struct MemberL? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberL { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_MessageStructure.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberL { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:23: warning: ?struct MemberM? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberM { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberM { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:23: warning: ?struct MemberN? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberN { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_RABDataVolumeReport.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberN { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_RABParametersList.h:29:23: warning: ?struct MemberB? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberB { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_RABParametersList.h:29:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberB { ^~~~~~~~~~~~~ ../../../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:23: warning: ?struct MemberD? declared inside parameter list will not be visible outside of this definition or declaration A_SEQUENCE_OF(struct MemberD { ^ :17:16: note: in definition of macro ?A_SET_OF? void (*free)(type *); \ ^~~~ ../../../../include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h:27:2: note: in expansion of macro ?A_SEQUENCE_OF? A_SEQUENCE_OF(struct MemberD { ^~~~~~~~~~~~~ In file included from ../../../../include/osmocom/ranap/ranap_common.h:592:0, from ../../../../src/tests/test-helpers.c:24: ../../../../include/osmocom/ranap/ranap_ies_defs.h:126:0: warning: "ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT" redefined #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 1) ../../../../include/osmocom/ranap/ranap_ies_defs.h:125:0: note: this is the location of the previous definition #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 0) ../../../../include/osmocom/ranap/ranap_ies_defs.h:436:0: warning: "RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT" redefined #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT (1 << 2) ../../../../include/osmocom/ranap/ranap_ies_defs.h:434:0: note: this is the location of the previous definition #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT (1 << 0) ../../../../include/osmocom/ranap/ranap_ies_defs.h:437:0: warning: "RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT" redefined #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT (1 << 3) ../../../../include/osmocom/ranap/ranap_ies_defs.h:435:0: note: this is the location of the previous definition #define RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_GLOBALCN_ID_PRESENT (1 << 1) ../../../../src/tests/test-helpers.c:67:9: warning: pointer targets in initialization differ in signedness [-Wpointer-sign] .buf = "0123456789012345", ^~~~~~~~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:67:9: note: (near initialization for ?text1.buf?) ../../../../src/tests/test-helpers.c:72:9: warning: pointer targets in initialization differ in signedness [-Wpointer-sign] .buf = "01234567890123456789012345678901234567890", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:72:9: note: (near initialization for ?text2.buf?) ../../../../src/tests/test-helpers.c: In function ?test_ranap_common?: ../../../../src/tests/test-helpers.c:148:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf("PLMN-Id [ %s]", osmo_hexdump((char*)lai.pLMNidentity.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:150:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf(", LAC [ %s]\n", osmo_hexdump((char*)lai.lAC.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:167:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf("PLMN-Id [ %s]", osmo_hexdump((char*)lai.pLMNidentity.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:169:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf(", LAC [ %s]\n", osmo_hexdump((char*)lai.lAC.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:185:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf("PLMN-Id [ %s]", osmo_hexdump((char*)lai.pLMNidentity.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:187:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf(", LAC [ %s]\n", osmo_hexdump((char*)lai.lAC.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:199:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf("PLMN-Id [ %s]", osmo_hexdump((char*)lai.pLMNidentity.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ ../../../../src/tests/test-helpers.c:201:39: warning: pointer targets in passing argument 1 of ?osmo_hexdump? differ in signedness [-Wpointer-sign] printf(", LAC [ %s]\n", osmo_hexdump((char*)lai.lAC.buf, ^ In file included from ../../../../include/osmocom/ranap/ranap_common.h:591:0, from ../../../../src/tests/test-helpers.c:24: :55:7: note: expected ?const unsigned char *? but argument is of type ?char *? char *osmo_hexdump(const unsigned char *buf, int len); ^~~~~~~~~~~~ CCLD test-helpers CC hnbap_common.o ../../../../src/hnbap_common.c:24:31: fatal error: osmocom/core/msgb.h: No such file or directory #include ^ compilation terminated. Makefile:466: recipe for target 'hnbap_common.o' failed make[6]: *** [hnbap_common.o] Error 1 make[6]: Leaving directory ' Makefile:652: recipe for target 'check-am' failed make[5]: *** [check-am] Error 2 make[5]: Leaving directory ' Makefile:641: recipe for target 'check-recursive' failed make[4]: *** [check-recursive] Error 1 make[4]: Leaving directory ' Makefile:790: recipe for target 'check' failed make[3]: *** [check] Error 2 make[3]: Leaving directory ' Makefile:454: recipe for target 'check-recursive' failed make[2]: *** [check-recursive] Error 1 make[2]: Leaving directory ' Makefile:745: recipe for target 'check' failed make[1]: *** [check] Error 2 make[1]: Leaving directory ' Makefile:662: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh find: ?./deps/libosmo-sccp/doc/examples?: No such file or directory Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue May 29 00:14:30 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 00:14:30 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2254?= Message-ID: <242962464.229.1527552870087.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 930.20 KB...] lr-x------ 1 build build 64 May 29 00:13 4 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5335 0.2 0.0 35536 12348 ? S 00:13 0:00 python2 ../../tests/vty_test_runner.py -w /build/osmo-bsc-1.2.1.23-71e5a/_build -v build 5386 0.0 0.0 51880 7092 ? S 00:13 0:00 ./src/osmo-bsc/osmo-bsc -c /build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg build 5393 0.0 0.0 4336 744 ? S 00:13 0:00 /bin/sh -c ps xua | grep osmo build 5395 0.0 0.0 11128 992 ? S 00:13 0:00 grep osmo build 32584 0.0 0.0 20076 3020 ? S 00:12 0:00 /bin/bash -c test -d osmo-bsc-1.2.1.23-71e5a/_build || exit 0; \ dc_install_base=`CDPATH="${ZSH_VERSION+.}:" && cd osmo-bsc-1.2.1.23-71e5a/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="${TMPDIR-/tmp}/am-dc-$$/" \ && am__cwd=`pwd` \ && CDPATH="${ZSH_VERSION+.}:" && cd osmo-bsc-1.2.1.23-71e5a/_build \ && ../configure \ \ --enable-vty-tests --enable-external-tests --enable-werror \ --srcdir=.. --prefix="$dc_install_base" \ && make \ && make dvi \ && make check \ && make install \ && make installcheck \ && make uninstall \ && make distuninstallcheck_dir="$dc_install_base" \ distuninstallcheck \ && chmod -R a-w "$dc_install_base" \ && ({ \ (cd ../.. && umask 077 && mkdir "$dc_destdir") \ && make DESTDIR="$dc_destdir" install \ && make DESTDIR="$dc_destdir" uninstall \ && make DESTDIR="$dc_destdir" \ distuninstallcheck_dir="$dc_destdir" distuninstallcheck; \ } || { rm -rf "$dc_destdir"; exit 1; }) \ && rm -rf "$dc_destdir" \ && make dist \ && rm -rf osmo-bsc-1.2.1.23-71e5a.tar.gz osmo-bsc-1.2.1.23-71e5a.tar.bz2 \ && make distcleancheck \ && cd "$am__cwd" \ || exit 1 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s ok testVtyTree (__main__.TestVTYBSC) ... Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' > ls -l /proc/5335/fd total 0 lr-x------ 1 build build 64 May 29 00:13 0 -> pipe:[856813364] l-wx------ 1 build build 64 May 29 00:13 1 -> pipe:[856813365] l-wx------ 1 build build 64 May 29 00:13 2 -> pipe:[856813366] l-wx------ 1 build build 64 May 29 00:13 3 -> /dev/null lr-x------ 1 build build 64 May 29 00:13 4 -> /dev/urandom > ss -tn State Recv-Q Send-Q Local Address:Port Peer Address:Port > ss -tln State Recv-Q Send-Q Local Address:Port Peer Address:Port LISTEN 0 10 127.0.0.1:4242 *:* LISTEN 0 10 127.0.0.1:4249 *:* LISTEN 0 10 *:3002 *:* LISTEN 0 10 *:3003 *:* > ps xua | grep osmo build 5335 0.1 0.0 35536 12352 ? S 00:13 0:00 python2 ../../tests/vty_test_runner.py -w /build/osmo-bsc-1.2.1.23-71e5a/_build -v build 5396 0.0 0.0 51880 6976 ? S 00:13 0:00 ./src/osmo-bsc/osmo-bsc -c /build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg build 5403 0.0 0.0 4336 724 ? S 00:13 0:00 /bin/sh -c ps xua | grep osmo build 5405 0.0 0.0 11128 1032 ? S 00:13 0:00 grep osmo build 32584 0.0 0.0 20076 3020 ? S 00:12 0:00 /bin/bash -c test -d osmo-bsc-1.2.1.23-71e5a/_build || exit 0; \ dc_install_base=`CDPATH="${ZSH_VERSION+.}:" && cd osmo-bsc-1.2.1.23-71e5a/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="${TMPDIR-/tmp}/am-dc-$$/" \ && am__cwd=`pwd` \ && CDPATH="${ZSH_VERSION+.}:" && cd osmo-bsc-1.2.1.23-71e5a/_build \ && ../configure \ \ --enable-vty-tests --enable-external-tests --enable-werror \ --srcdir=.. --prefix="$dc_install_base" \ && make \ && make dvi \ && make check \ && make install \ && make installcheck \ && make uninstall \ && make distuninstallcheck_dir="$dc_install_base" \ distuninstallcheck \ && chmod -R a-w "$dc_install_base" \ && ({ \ (cd ../.. && umask 077 && mkdir "$dc_destdir") \ && make DESTDIR="$dc_destdir" install \ && make DESTDIR="$dc_destdir" uninstall \ && make DESTDIR="$dc_destdir" \ distuninstallcheck_dir="$dc_destdir" distuninstallcheck; \ } || { rm -rf "$dc_destdir"; exit 1; }) \ && rm -rf "$dc_destdir" \ && make dist \ && rm -rf osmo-bsc-1.2.1.23-71e5a.tar.gz osmo-bsc-1.2.1.23-71e5a.tar.bz2 \ && make distcleancheck \ && cd "$am__cwd" \ || exit 1 Socket: in 1 tries, connected to 127.0.0.1:4242 (1 sockets open) Socket: closing 127.0.0.1:4242 (0 sockets open) Terminating took 2.679s ok ---------------------------------------------------------------------- Ran 7 tests in 23.941s OK ../../tests/ctrl_test_runner.py -w /build/osmo-bsc-1.2.1.23-71e5a/_build -v testBtsChannelLoad (__main__.TestCtrlBSC) ... ok testBtsCi (__main__.TestCtrlBSC) ... ok testBtsGenerateSystemInformation (__main__.TestCtrlBSC) ... ok testBtsLac (__main__.TestCtrlBSC) ... ok testBtsOmlConnectionState (__main__.TestCtrlBSC) Check OML state. It will not be connected ... confpath /build/osmo-bsc-1.2.1.23-71e5a/tests/.., workdir /build/osmo-bsc-1.2.1.23-71e5a/_build Running tests for specific control commands Skipping the NAT test Skipping the SGSN test Opening /dev/null Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 bts.0.channel-load 1" Got message: ERROR 1000 Read Only attribute Decoded replies: {1000: {'mtype': 'ERROR', 'id': 1000, 'error': 'Read Only attribute'}} Sending "GET 1001 bts.0.channel-load" Got message: GET_REPLY 1001 bts.0.channel-load CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0 SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0 Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'bts.0.channel-load', 'id': 1001, 'value': 'CCCH+SDCCH4,0,0 TCH/F,0,0 TCH/H,0,0 SDCCH8,0,0 TCH/F_PDCH,0,0 CCCH+SDCCH4+CBCH,0,0 SDCCH8+CBCH,0,0 TCH/F_TCH/H_PDCH,0,0'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.cell-identity" Got message: GET_REPLY 1000 bts.0.cell-identity 0 Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'bts.0.cell-identity', 'id': 1000, 'value': '0'}} Sending "SET 1001 bts.0.cell-identity 23" Got message: SET_REPLY 1001 bts.0.cell-identity 23 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'bts.0.cell-identity', 'id': 1001, 'value': '23'}} Sending "GET 1002 bts.0.cell-identity" Got message: GET_REPLY 1002 bts.0.cell-identity 23 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.cell-identity', 'id': 1002, 'value': '23'}} Sending "SET 1003 bts.0.cell-identity -1" Got message: ERROR 1003 Input not within the range Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Input not within the range'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.send-new-system-informations" Got message: ERROR 1000 Write Only attribute Decoded replies: {1000: {'mtype': 'ERROR', 'id': 1000, 'error': 'Write Only attribute'}} Sending "SET 1001 bts.0.send-new-system-informations 1" Got message: ERROR 1001 Failed to generate SI Decoded replies: {1001: {'mtype': 'ERROR', 'id': 1001, 'error': 'Failed to generate SI'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 bts.0.location-area-code" Got message: GET_REPLY 1000 bts.0.location-area-code 1 Decoded replies: {1000: {'mtype': 'GET_REPLY', 'var': 'bts.0.location-area-code', 'id': 1000, 'value': '1'}} Sending "SET 1001 bts.0.location-area-code 23" Got message: SET_REPLY 1001 bts.0.location-area-code 23 Decoded replies: {1001: {'mtype': 'SET_REPLY', 'var': 'bts.0.location-area-code', 'id': 1001, 'value': '23'}} Sending "GET 1002 bts.0.location-area-code" Got message: GET_REPLY 1002 bts.0.location-area-code 23 Decoded replies: {1002: {'mtype': 'GET_REPLY', 'var': 'bts.0.location-area-code', 'id': 1002, 'value': '23'}} Sending "SET 1003 bts.0.location-area-code -1" Got message: ERROR 1003 Input not within the range Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Input not within the range'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 bts.0.oml-connection-state 1" Got message: ERROR 1000 Read Only attribute Decoded replies: {1000: {'mtypeok testCtrlErrs (__main__.TestCtrlBSC) ... ok testMcc (__main__.TestCtrlBSC) ... ERROR testMccMncApply (__main__.TestCtrlBSC) ... ERROR testMnc (__main__.TestCtrlBSC) ... ERROR testRfLock (__main__.TestCtrlBSC) ... ERROR testTimezone (__main__.TestCtrlBSC) ... ERROR testTrxArfcn (__main__.TestCtrlBSC) ... ERROR testTrxPowerRed (__main__.TestCtrlBSC) ... ERROR ====================================================================== ERROR: testMcc (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 151, in tearDown OSError: [Errno 2] No such file or directory: 'tmp_dummy_sock' ====================================================================== ERROR: testMccMncApply (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ====================================================================== ERROR: testMnc (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ====================================================================== ERROR: testRfLock (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ====================================================================== ERROR: testTimezone (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ====================================================================== ERROR: testTrxArfcn (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ====================================================================== ERROR: testTrxPowerRed (__main__.TestCtrlBSC) ---------------------------------------------------------------------- Traceback (most recent call last): File "../../tests/ctrl_test_runner.py", line 56, in setUp OSError: [Errno 2] No such file or directory ---------------------------------------------------------------------- Ran 13 tests in 37.873s FAILED (errors=7) ': 'ERROR', 'id': 1000, 'error': 'Read Only attribute'}} Sending "GET 1001 bts.0.oml-connection-state" Got message: GET_REPLY 1001 bts.0.oml-connection-state disconnected Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'bts.0.oml-connection-state', 'id': 1001, 'value': 'disconnected'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "GET 1000 invalid" Got message: ERROR 1000 Command not found Decoded replies: {1000: {'mtype': 'ERROR', 'id': 1000, 'error': 'Command not found'}} Sending "SET 1001 rf_locked 999" Got message: ERROR 1001 Value failed verification. Decoded replies: {1001: {'mtype': 'ERROR', 'id': 1001, 'error': 'Value failed verification.'}} Sending "GET 1002 bts" Got message: ERROR 1002 Error while parsing the index. Decoded replies: {1002: {'mtype': 'ERROR', 'id': 1002, 'error': 'Error while parsing the index.'}} Sending "GET 1003 bts.999" Got message: ERROR 1003 Error while resolving object Decoded replies: {1003: {'mtype': 'ERROR', 'id': 1003, 'error': 'Error while resolving object'}} Terminating took 2.679s Launching: PWD=/build/osmo-bsc-1.2.1.23-71e5a/_build './src/osmo-bsc/osmo-bsc' '-r' 'tmp_dummy_sock' '-c' '/build/osmo-bsc-1.2.1.23-71e5a/tests/../doc/examples/osmo-bsc/osmo-bsc.cfg' Connecting to host 127.0.0.1:4249 Sending "SET 1000 mcc 23" Got message: SET_REPLY 1000 mcc 023 Decoded replies: {1000: {'mtype': 'SET_REPLY', 'var': 'mcc', 'id': 1000, 'value': '023'}} Sending "GET 1001 mcc" Got message: GET_REPLY 1001 mcc 023 Decoded replies: {1001: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1001, 'value': '023'}} Sending "SET 1002 mcc 023" Got message: SET_REPLY 1002 mcc 023 Decoded replies: {1002: {'mtype': 'SET_REPLY', 'var': 'mcc', 'id': 1002, 'value': '023'}} Sending "GET 1003 mcc" Got message: GET_REPLY 1003 mcc 023 Decoded replies: {1003: {'mtype': 'GET_REPLY', 'var': 'mcc', 'id': 1003, 'value': '023'}} Terminating took 2.679s Makefile:683: recipe for target 'python-tests' failed make[6]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build/tests' make[6]: *** [python-tests] Error 7 Makefile:702: recipe for target 'check-local' failed make[5]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build/tests' make[5]: *** [check-local] Error 2 Makefile:545: recipe for target 'check-am' failed make[4]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build/tests' make[4]: *** [check-am] Error 2 Makefile:397: recipe for target 'check-recursive' failed make[3]: *** [check-recursive] Error 1 make[3]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build/tests' make[2]: *** [check-recursive] Error 1 Makefile:429: recipe for target 'check-recursive' failed make[2]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build' Makefile:720: recipe for target 'check' failed make[1]: Leaving directory '/build/osmo-bsc-1.2.1.23-71e5a/_build' make[1]: *** [check] Error 2 Makefile:637: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Tue May 29 00:17:39 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 00:17:39 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2255?= In-Reply-To: <242962464.229.1527552870087.JavaMail.jenkins@jenkins.osmocom.org> References: <242962464.229.1527552870087.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1791022202.230.1527553059587.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Tue May 29 00:57:37 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 00:57:37 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-iuh_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#1251?= In-Reply-To: <523189641.228.1527552866233.JavaMail.jenkins@jenkins.osmocom.org> References: <523189641.228.1527552866233.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <793242098.231.1527555457894.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Tue May 29 07:59:20 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 May 2018 07:59:20 +0000 Subject: Change in osmo-mgw[master]: client: do not start connections in loopback mode Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9356 Change subject: client: do not start connections in loopback mode ...................................................................... client: do not start connections in loopback mode Starting connections in loopback bode may cause confusion at the receiving end when the connection is switched from looback into an actual send-receive connection. The reason for this is by this the SSRC of the RTP stream will suddenly change. For the majority of usecases it is not necessary to loopback the incomming packets back to the receiver in the beginning. So lets use receive-only as a safe default. - use MGCP_CONN_RECV_ONLY instead of MGCP_CONN_RECV_LOOPBACK Change-Id: I44178434ee497bc1d5e9d5f6d92c13c1a09ae241 Related: OS#3104 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/56/9356/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 6e1e7b8..07a65e6 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -112,7 +112,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->conn_peer_local.call_id, - .conn_mode = MGCP_CONN_LOOPBACK, + .conn_mode = MGCP_CONN_RECV_ONLY, }; osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); -- To view, visit https://gerrit.osmocom.org/9356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I44178434ee497bc1d5e9d5f6d92c13c1a09ae241 Gerrit-Change-Number: 9356 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 10:06:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 May 2018 10:06:45 +0000 Subject: Change in osmo-msc[master]: mgcp: do not start connections in loopback mode Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9357 Change subject: mgcp: do not start connections in loopback mode ...................................................................... mgcp: do not start connections in loopback mode When the MSC creates the connections for the BSS side and for the PBX Change-Id: If9a81d057f73150e483286472e73c45e7a453a6d --- M src/libmsc/msc_mgcp.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/9357/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 7c49c6e..67a2142 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -294,7 +294,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->call_id, - .conn_mode = MGCP_CONN_LOOPBACK + .conn_mode = MGCP_CONN_RECV_ONLY }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { @@ -397,7 +397,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->call_id, - .conn_mode = MGCP_CONN_LOOPBACK + .conn_mode = MGCP_CONN_RECV_ONLY }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { -- To view, visit https://gerrit.osmocom.org/9357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If9a81d057f73150e483286472e73c45e7a453a6d Gerrit-Change-Number: 9357 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 10:06:46 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 May 2018 10:06:46 +0000 Subject: Change in osmo-msc[master]: mgcp: hack to keep IuUP working Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9358 Change subject: mgcp: hack to keep IuUP working ...................................................................... mgcp: hack to keep IuUP working Since change If9a81d057f73150e483286472e73c45e7a453a6d removes the RTP loopback at the beginning. This also means that the Hack we do to run the IuUP negotiation via looping back the first few RTP packets will not work anymore. However, we should keep that hack as long as we do not have IuUP support in the MGW. - Start RTP connection in loopback mode for IuUP Change-Id: I4c7d90de4dc87e8baf7cf4a0c69d0e9e8c92e27b --- M src/libmsc/msc_mgcp.c 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/58/9358/1 diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 67a2142..c77e389 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -278,10 +278,22 @@ struct msgb *msg; int rc; +#ifdef BUILD_IU + struct gsm_trans *trans; + struct gsm_subscriber_connection *conn; +#endif + OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); +#ifdef BUILD_IU + trans = mgcp_ctx->trans; + OSMO_ASSERT(trans); + conn = trans->conn; + OSMO_ASSERT(conn); +#endif + /* NOTE: In case of error, we will not be able to perform any DLCX * operation because until this point we do not have requested any * endpoint yet. */ @@ -302,6 +314,14 @@ return; } + /* HACK: We put the connection in loopback mode at the beginnig to + * trick the NodeB into doing the IuUP negotiation with itsself. + * this is a hack we need because osmo-mgw does not support IuUP yet */ +#ifdef BUILD_IU + if (conn->via_ran == RAN_UTRAN_IU) + mgcp_msg.conn_mode = MGCP_CONN_LOOPBACK; +#endif + msg = mgcp_msg_gen(mgcp, &mgcp_msg); OSMO_ASSERT(msg); @@ -377,10 +397,22 @@ struct msgb *msg; int rc; +#ifdef BUILD_IU + struct gsm_trans *trans; + struct gsm_subscriber_connection *conn; +#endif + OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); +#ifdef BUILD_IU + trans = mgcp_ctx->trans; + OSMO_ASSERT(trans); + conn = trans->conn; + OSMO_ASSERT(conn); +#endif + switch (event) { case EV_CRCX_RAN_RESP: break; @@ -405,6 +437,14 @@ return; } + /* HACK: We put the connection in loopback mode at the beginnig to + * trick the NodeB into doing the IuUP negotiation with itsself. + * this is a hack we need because osmo-mgw does not support IuUP yet */ +#ifdef BUILD_IU + if (conn->via_ran == RAN_UTRAN_IU) + mgcp_msg.conn_mode = MGCP_CONN_LOOPBACK; +#endif + msg = mgcp_msg_gen(mgcp, &mgcp_msg); OSMO_ASSERT(msg); -- To view, visit https://gerrit.osmocom.org/9358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4c7d90de4dc87e8baf7cf4a0c69d0e9e8c92e27b Gerrit-Change-Number: 9358 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 12:11:45 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 May 2018 12:11:45 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: do not log destination invalid ip/port as error Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9359 Change subject: mgcp_network: do not log destination invalid ip/port as error ...................................................................... mgcp_network: do not log destination invalid ip/port as error It is legal to create connection without setting the destination ip and port (this usually done later through MDCX). However, if some other connection tries to deliver an RTP packet through a a half open connection, then the fact that no destination ip is set is logged as error even if it is a pretty normal situation. - Check if destination ip and port are set to zero. If yes, we assume that the destination connection details are intentionally not set yet. Only when one value is set and the other one not, we log an error. Otherweise we log a message to debug. Change-Id: If96e5a60b8ab92259d3bddaa143121893bb6c525 Related OS#3104 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/9359/1 diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 4144382..2da37b4 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -867,6 +867,15 @@ struct mgcp_endpoint *endp; endp = conn->conn->endp; + /* Note: it is legal to create a connection but never setting a port + * and IP-address for outgoing data. */ + if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { + LOGP(DRTP, LOGL_DEBUG, + "endpoint:0x%x destination IP-address and rtp port is (not yet) known\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x destination IP-address is invalid\n", -- To view, visit https://gerrit.osmocom.org/9359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If96e5a60b8ab92259d3bddaa143121893bb6c525 Gerrit-Change-Number: 9359 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:09:25 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 29 May 2018 14:09:25 +0000 Subject: Change in libosmo-abis[master]: ortp: make sure the ortp scheduler is started Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9360 Change subject: ortp: make sure the ortp scheduler is started ...................................................................... ortp: make sure the ortp scheduler is started the function osmo_rtp_init() is initializing ortp at the start of the application. However, it does not start the scheduler of ortp, which leads into error log messages in some situatios. - make sure that ortp_scheduler_init() is called with osmo_rtp_init() Change-Id: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Related: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/60/9360/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 8ea05e4..18a6123 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -290,6 +290,7 @@ ortp_set_log_handler(my_ortp_logfn); create_payload_types(); + ortp_scheduler_init(); } /*! \brief Set Osmocom RTP socket parameters -- To view, visit https://gerrit.osmocom.org/9360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Gerrit-Change-Number: 9360 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:13:50 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 29 May 2018 14:13:50 +0000 Subject: Change in docker-playground[master]: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9361 Change subject: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins ...................................................................... fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins The osmo-bsc configuration file used on Jenkins assigned wrong location area codes to BTS 1 and 2. This fix should make TC_paging_imsi_nochan_lac and TC_paging_imsi_nochan_lai pass on Jenkins. Change-Id: Id35a85804c4a07f6c4136ef4570b4e21e250b9cd --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/61/9361/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 9d5a9c3..29d05eb 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -166,7 +166,7 @@ type sysmobts band DCS1800 cell_identity 1 - location_area_code 2 + location_area_code 1 dtx uplink force dtx downlink base_station_id_code 11 @@ -256,7 +256,7 @@ type sysmobts band DCS1800 cell_identity 1 - location_area_code 1 + location_area_code 2 dtx uplink force dtx downlink base_station_id_code 12 -- To view, visit https://gerrit.osmocom.org/9361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id35a85804c4a07f6c4136ef4570b4e21e250b9cd Gerrit-Change-Number: 9361 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:24:33 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 29 May 2018 14:24:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9251 to look at the new patch set (#5). Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... SGSN: add TC_hlr_location_cancel_request_update MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/9251/5 -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:32:39 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 29 May 2018 14:32:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: tr_GMM_DET_REQ_MT: use * instead of omit for `cause` Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/9362 Change subject: L3_Templates: tr_GMM_DET_REQ_MT: use * instead of omit for `cause` ...................................................................... L3_Templates: tr_GMM_DET_REQ_MT: use * instead of omit for `cause` The omit force this field to be not present, while a * allows to be present or not. As user of this tr I would expect to ignore this field rather than an explicit omit. Change-Id: Iae91f752789273934a6382bdd474594c3c50bbe9 --- M library/L3_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/9362/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 824dbf2..e814cd1 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1866,7 +1866,7 @@ template PDU_L3_SGSN_MS tr_GMM_DET_REQ_MT( template BIT3 dtt := *, template BIT3 forceToStandby := ?, - template OCT1 cause := omit) := { + template OCT1 cause := *) := { discriminator := '1000'B, tiOrSkip := { skipIndicator := '0000'B -- To view, visit https://gerrit.osmocom.org/9362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iae91f752789273934a6382bdd474594c3c50bbe9 Gerrit-Change-Number: 9362 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:41:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:41:55 +0000 Subject: Change in osmo-sgsn[master]: gprs_gmm: Cancel Location: use detach type IMSI In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9254 ) Change subject: gprs_gmm: Cancel Location: use detach type IMSI ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9254 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I27da6dc5165819cccd1ae0a98b132b45a01f38bb Gerrit-Change-Number: 9254 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:41:55 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:42:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:42:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: tr_GMM_DET_REQ_MT: use * instead of omit for `cause` In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9362 ) Change subject: L3_Templates: tr_GMM_DET_REQ_MT: use * instead of omit for `cause` ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iae91f752789273934a6382bdd474594c3c50bbe9 Gerrit-Change-Number: 9362 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:42:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:43:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:43:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9251 ) Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:43:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:43:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:43:41 +0000 Subject: Change in docker-playground[master]: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9361 ) Change subject: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id35a85804c4a07f6c4136ef4570b4e21e250b9cd Gerrit-Change-Number: 9361 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 29 May 2018 14:43:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:43:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:43:42 +0000 Subject: Change in docker-playground[master]: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9361 ) Change subject: fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins ...................................................................... fix location area codes in BSC_Tests osmo-bsc.cfg for jenkins The osmo-bsc configuration file used on Jenkins assigned wrong location area codes to BTS 1 and 2. This fix should make TC_paging_imsi_nochan_lac and TC_paging_imsi_nochan_lai pass on Jenkins. Change-Id: Id35a85804c4a07f6c4136ef4570b4e21e250b9cd --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 9d5a9c3..29d05eb 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -166,7 +166,7 @@ type sysmobts band DCS1800 cell_identity 1 - location_area_code 2 + location_area_code 1 dtx uplink force dtx downlink base_station_id_code 11 @@ -256,7 +256,7 @@ type sysmobts band DCS1800 cell_identity 1 - location_area_code 1 + location_area_code 2 dtx uplink force dtx downlink base_station_id_code 12 -- To view, visit https://gerrit.osmocom.org/9361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id35a85804c4a07f6c4136ef4570b4e21e250b9cd Gerrit-Change-Number: 9361 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:44:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:44:01 +0000 Subject: Change in libosmo-abis[master]: ortp: make sure the ortp scheduler is started In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9360 ) Change subject: ortp: make sure the ortp scheduler is started ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Gerrit-Change-Number: 9360 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:44:01 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:46:04 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:46:04 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: do not log destination invalid ip/port as error In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9359 ) Change subject: mgcp_network: do not log destination invalid ip/port as error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If96e5a60b8ab92259d3bddaa143121893bb6c525 Gerrit-Change-Number: 9359 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:46:04 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:46:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:46:09 +0000 Subject: Change in osmo-mgw[master]: client: do not start connections in loopback mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9356 ) Change subject: client: do not start connections in loopback mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I44178434ee497bc1d5e9d5f6d92c13c1a09ae241 Gerrit-Change-Number: 9356 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:46:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:46:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:46:31 +0000 Subject: Change in osmo-msc[master]: mgcp: do not start connections in loopback mode In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9357 ) Change subject: mgcp: do not start connections in loopback mode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If9a81d057f73150e483286472e73c45e7a453a6d Gerrit-Change-Number: 9357 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:46:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 14:47:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 14:47:08 +0000 Subject: Change in osmo-msc[master]: mgcp: hack to keep IuUP working In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9358 ) Change subject: mgcp: hack to keep IuUP working ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4c7d90de4dc87e8baf7cf4a0c69d0e9e8c92e27b Gerrit-Change-Number: 9358 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 14:47:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 15:10:04 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 29 May 2018 15:10:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sync local osmo-bsc.cfg with that used by jenkins Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9363 Change subject: sync local osmo-bsc.cfg with that used by jenkins ...................................................................... sync local osmo-bsc.cfg with that used by jenkins The osmo-bsc.cfg file in docker-playground/ttcn3-bsc-test contains codec, encryption, and ipaccess settings which were missing from the corresponding configuration file in this repository. This caused spurious test failures when running BSC_Tests outside of Jenkins. Change-Id: If392dcd42fb741c7ab8ae204bbefde89f05f0afe --- M bsc/osmo-bsc.cfg 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/9363/1 diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index fcf7179..aa3edf1 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -54,7 +54,7 @@ network network country code 1 mobile network code 1 - encryption a5 0 + encryption a5 0 1 3 neci 1 paging any use tch 0 handover 0 @@ -93,7 +93,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -183,7 +183,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -273,7 +273,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -338,6 +338,7 @@ phys_chan_config PDCH hopping enabled 0 msc 0 + ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text @@ -352,7 +353,7 @@ amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden - codec-list fr1 fr2 fr3 + codec-list fr1 fr2 fr3 hr1 hr3 bsc mid-call-timeout 0 no missing-msc-text -- To view, visit https://gerrit.osmocom.org/9363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If392dcd42fb741c7ab8ae204bbefde89f05f0afe Gerrit-Change-Number: 9363 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue May 29 15:10:07 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 15:10:07 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-asn1c_=C2=BB_a1=3Ddefault?= =?UTF-8?Q?,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#138?= In-Reply-To: <791644301.224.1527520206948.JavaMail.jenkins@jenkins.osmocom.org> References: <791644301.224.1527520206948.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1262627680.242.1527606607106.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 3.67 KB...] + ./configure checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether to enable maintainer-specific portions of Makefiles... no checking for style of include used by make... GNU checking for gcc... gcc checking for C compiler default output file name... a.out checking whether the C compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking dependency style of gcc... gcc3 checking for a sed that does not truncate output... /bin/sed checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ld used by gcc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for /usr/bin/ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... gcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... gcc3 checking how to run the C++ preprocessor... g++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from gcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if gcc supports -fno-rtti -fno-exceptions... no checking for gcc option to produce PIC... -fPIC checking if gcc PIC flag -fPIC works... yes checking if gcc static flag -static works... yes checking if gcc supports -c -o file.o... yes checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking whether -lc should be explicitly linked in... no checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by g++... /usr/bin/ld -m elf_x86_64 checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking for g++ option to produce PIC... -fPIC checking if g++ PIC flag -fPIC works... yes checking if g++ static flag -static works... yes checking if g++ supports -c -o file.o... yes checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool checking for autoconf... /usr/bin/autoconf checking for autoheader... /usr/bin/autoheader checking for gcc... (cached) gcc checking whether we are using the GNU C compiler... (cached) yes checking whether gcc accepts -g... (cached) yes checking for gcc option to accept ISO C89... (cached) none needed checking dependency style of gcc... (cached) gcc3 checking how to run the C preprocessor... gcc -E checking for a BSD-compatible install... /usr/bin/install -c checking whether ln -s works... yes checking whether make sets $(MAKE)... (cached) yes checking for bison... bison -y checking for flex... flex checking for yywrap in -lfl... yes checking lex output file root... lex.yy checking whether yytext is a pointer... yes checking for ar... /usr/bin/ar checking for ANSI C header files... (cached) yes checking sys/param.h usability... yes checking sys/param.h presence... yes checking for sys/param.h... yes checking whether byte ordering is bigendian... no checking for off_t... yes checking for size_t... yes checking whether struct tm is in sys/time.h or time.h... time.h checking for intmax_t... yes checking for library containing getopt... none required checking for strtoimax... yes checking for strtoll... yes checking for mergesort... no checking for mkstemps... yes configure: creating ./config.status config.status: creating skeletons/standard-modules/Makefile config.status: creating skeletons/tests/Makefile config.status: creating libasn1compiler/Makefile config.status: creating libasn1parser/Makefile config.status: creating libasn1print/Makefile config.status: creating asn1c/webcgi/Makefile config.status: creating asn1c/tests/Makefile config.status: creating libasn1fix/Makefile config.status: creating skeletons/Makefile config.status: creating examples/Makefile config.status: creating tests/Makefile config.status: creating asn1c/Makefile config.status: creating doc/Makefile config.status: creating asn1c.spec config.status: creating Makefile config.status: creating config.h config.status: executing depfiles commands + make -j 8 make all-recursive make[1]: Entering directory ' Making all in libasn1parser make[2]: Entering directory ' if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF ".deps/asn1parser.Tpo" -c -o asn1parser.lo asn1parser.c; \ then mv -f ".deps/asn1parser.Tpo" ".deps/asn1parser.Plo"; else rm -f ".deps/asn1parser.Tpo"; exit 1; fi bison -y -p asn1p_ -d asn1p_y.y if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF ".deps/asn1p_l.Tpo" -c -o asn1p_l.lo asn1p_l.c; \ then mv -f ".deps/asn1p_l.Tpo" ".deps/asn1p_l.Plo"; else rm -f ".deps/asn1p_l.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF ".deps/asn1p_module.Tpo" -c -o asn1p_module.lo asn1p_module.c; \ then mv -f ".deps/asn1p_module.Tpo" ".deps/asn1p_module.Plo"; else rm -f ".deps/asn1p_module.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF ".deps/asn1p_oid.Tpo" -c -o asn1p_oid.lo asn1p_oid.c; \ then mv -f ".deps/asn1p_oid.Tpo" ".deps/asn1p_oid.Plo"; else rm -f ".deps/asn1p_oid.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF ".deps/asn1p_value.Tpo" -c -o asn1p_value.lo asn1p_value.c; \ then mv -f ".deps/asn1p_value.Tpo" ".deps/asn1p_value.Plo"; else rm -f ".deps/asn1p_value.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF ".deps/asn1p_expr.Tpo" -c -o asn1p_expr.lo asn1p_expr.c; \ then mv -f ".deps/asn1p_expr.Tpo" ".deps/asn1p_expr.Plo"; else rm -f ".deps/asn1p_expr.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF ".deps/asn1p_xports.Tpo" -c -o asn1p_xports.lo asn1p_xports.c; \ then mv -f ".deps/asn1p_xports.Tpo" ".deps/asn1p_xports.Plo"; else rm -f ".deps/asn1p_xports.Tpo"; exit 1; fi asn1p_y.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr] mkdir .libs gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -fPIC -DPIC -o .libs/asn1p_module.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -fPIC -DPIC -o .libs/asn1p_xports.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -fPIC -DPIC -o .libs/asn1p_expr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -fPIC -DPIC -o .libs/asn1p_oid.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -fPIC -DPIC -o .libs/asn1p_value.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -fPIC -DPIC -o .libs/asn1parser.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -fPIC -DPIC -o .libs/asn1p_l.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_xports.lo -MD -MP -MF .deps/asn1p_xports.Tpo -c asn1p_xports.c -o asn1p_xports.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_module.lo -MD -MP -MF .deps/asn1p_module.Tpo -c asn1p_module.c -o asn1p_module.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_oid.lo -MD -MP -MF .deps/asn1p_oid.Tpo -c asn1p_oid.c -o asn1p_oid.o >/dev/null 2>&1 asn1p_l.c:3521:12: warning: 'input' defined but not used [-Wunused-function] static int input() ^~~~~ gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1parser.lo -MD -MP -MF .deps/asn1parser.Tpo -c asn1parser.c -o asn1parser.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF ".deps/asn1p_constr.Tpo" -c -o asn1p_constr.lo asn1p_constr.c; \ then mv -f ".deps/asn1p_constr.Tpo" ".deps/asn1p_constr.Plo"; else rm -f ".deps/asn1p_constr.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_value.lo -MD -MP -MF .deps/asn1p_value.Tpo -c asn1p_value.c -o asn1p_value.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF ".deps/asn1p_param.Tpo" -c -o asn1p_param.lo asn1p_param.c; \ then mv -f ".deps/asn1p_param.Tpo" ".deps/asn1p_param.Plo"; else rm -f ".deps/asn1p_param.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_expr.lo -MD -MP -MF .deps/asn1p_expr.Tpo -c asn1p_expr.c -o asn1p_expr.o >/dev/null 2>&1 if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF ".deps/asn1p_class.Tpo" -c -o asn1p_class.lo asn1p_class.c; \ then mv -f ".deps/asn1p_class.Tpo" ".deps/asn1p_class.Plo"; else rm -f ".deps/asn1p_class.Tpo"; exit 1; fi if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF ".deps/asn1p_ref.Tpo" -c -o asn1p_ref.lo asn1p_ref.c; \ then mv -f ".deps/asn1p_ref.Tpo" ".deps/asn1p_ref.Plo"; else rm -f ".deps/asn1p_ref.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -fPIC -DPIC -o .libs/asn1p_constr.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -fPIC -DPIC -o .libs/asn1p_param.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -fPIC -DPIC -o .libs/asn1p_class.o if test -f y.tab.h; then \ to=`echo "asn1p_y_H" | sed \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \ sed -e "/^#/!b" -e "s/Y_TAB_H/$to/g" -e "s|y\.tab\.h|asn1p_y.h|" \ y.tab.h >asn1p_y.ht; \ rm -f y.tab.h; \ if cmp -s asn1p_y.ht asn1p_y.h; then \ rm -f asn1p_y.ht ;\ else \ mv asn1p_y.ht asn1p_y.h; \ fi; \ fi if test -f y.output; then \ mv y.output asn1p_y.output; \ fi sed '/^#/ s|y\.tab\.c|asn1p_y.c|' y.tab.c >asn1p_y.ct && mv asn1p_y.ct asn1p_y.c rm -f y.tab.c if /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF ".deps/asn1p_y.Tpo" -c -o asn1p_y.lo asn1p_y.c; \ then mv -f ".deps/asn1p_y.Tpo" ".deps/asn1p_y.Plo"; else rm -f ".deps/asn1p_y.Tpo"; exit 1; fi gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -fPIC -DPIC -o .libs/asn1p_ref.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_param.lo -MD -MP -MF .deps/asn1p_param.Tpo -c asn1p_param.c -o asn1p_param.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_constr.lo -MD -MP -MF .deps/asn1p_constr.Tpo -c asn1p_constr.c -o asn1p_constr.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_y.lo -MD -MP -MF .deps/asn1p_y.Tpo -c asn1p_y.c -fPIC -DPIC -o .libs/asn1p_y.o gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_class.lo -MD -MP -MF .deps/asn1p_class.Tpo -c asn1p_class.c -o asn1p_class.o >/dev/null 2>&1 gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_ref.lo -MD -MP -MF .deps/asn1p_ref.Tpo -c asn1p_ref.c -o asn1p_ref.o >/dev/null 2>&1 asn1p_y.y: In function 'asn1p_parse': asn1p_y.y:357:13: error: 'param' undeclared (first use in this function) *(void **)param = $1; ^~~~~ asn1p_y.y:357:13: note: each undeclared identifier is reported only once for each function it appears in gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -O2 -Wall -Wshadow -Wcast-qual -Wcast-align -Wchar-subscripts -Wmissing-prototypes -Wmissing-declarations -MT asn1p_l.lo -MD -MP -MF .deps/asn1p_l.Tpo -c asn1p_l.c -o asn1p_l.o >/dev/null 2>&1 Makefile:299: recipe for target 'asn1p_y.lo' failed make[2]: *** [asn1p_y.lo] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory ' Makefile:302: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory ' Makefile:212: recipe for target 'all' failed make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From gerrit-no-reply at lists.osmocom.org Tue May 29 15:16:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 29 May 2018 15:16:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expect previously failing paging tests to pass Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9364 Change subject: expect previously failing paging tests to pass ...................................................................... expect previously failing paging tests to pass Two paging tests were failing in Jenkins due to a configuration problem. This has now been fixed so we can expect these two tests to pass: TC_paging_imsi_nochan_lac TC_paging_imsi_nochan_lai Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c --- M bsc/expected-results.xml 1 file changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/9364/1 diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 3aa7983..a6f59fd 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -51,15 +51,8 @@ - - Timeout expecting { msg_disc := { msg_group := RSL_MDISC_CCHAN (6), transparent := false }, msg_type := RSL_MT_PAGING_CMD (21), ies := { { iei := ?, body := { chan_nr := { u := { ch0 := RSL_CHAN_NR_PCH_AGCH (18) }, tn := ? } } }, { iei := ?, body := { paging_group := ? } }, { iei := ?, body := { ms_identity := { len := ?, payload := ? } } }, * } } - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_paging_imsi_nochan_lai testcase - - - - - + + -- To view, visit https://gerrit.osmocom.org/9364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c Gerrit-Change-Number: 9364 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 15:19:31 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 29 May 2018 15:19:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expect previously failing paging tests to pass In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9364 to look at the new patch set (#2). Change subject: expect previously failing paging tests to pass ...................................................................... expect previously failing paging tests to pass Two paging tests were failing in Jenkins due to a configuration problem. This has now been fixed so we can expect these two tests to pass: TC_paging_imsi_nochan_lac TC_paging_imsi_nochan_lai Related: g#9361 Related: docker-playground 4147adabb9917fd852cc49c93603f379ec810c6b Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c --- M bsc/expected-results.xml 1 file changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/9364/2 -- To view, visit https://gerrit.osmocom.org/9364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c Gerrit-Change-Number: 9364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:46 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sync local osmo-bsc.cfg with that used by jenkins In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9363 ) Change subject: sync local osmo-bsc.cfg with that used by jenkins ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If392dcd42fb741c7ab8ae204bbefde89f05f0afe Gerrit-Change-Number: 9363 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 16:07:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:47 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sync local osmo-bsc.cfg with that used by jenkins In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9363 ) Change subject: sync local osmo-bsc.cfg with that used by jenkins ...................................................................... sync local osmo-bsc.cfg with that used by jenkins The osmo-bsc.cfg file in docker-playground/ttcn3-bsc-test contains codec, encryption, and ipaccess settings which were missing from the corresponding configuration file in this repository. This caused spurious test failures when running BSC_Tests outside of Jenkins. Change-Id: If392dcd42fb741c7ab8ae204bbefde89f05f0afe --- M bsc/osmo-bsc.cfg 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index fcf7179..aa3edf1 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -54,7 +54,7 @@ network network country code 1 mobile network code 1 - encryption a5 0 + encryption a5 0 1 3 neci 1 paging any use tch 0 handover 0 @@ -93,7 +93,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -183,7 +183,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -273,7 +273,7 @@ neighbor-list add arfcn 200 si5 neighbor-list add arfcn 10 si5 neighbor-list add arfcn 20 - codec-support fr + codec-support fr hr efr amr gprs mode gprs gprs 11bit_rach_support_for_egprs 0 gprs routing area 0 @@ -338,6 +338,7 @@ phys_chan_config PDCH hopping enabled 0 msc 0 + ip.access rtp-base 4000 no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text @@ -352,7 +353,7 @@ amr-config 5_90k allowed amr-config 5_15k forbidden amr-config 4_75k forbidden - codec-list fr1 fr2 fr3 + codec-list fr1 fr2 fr3 hr1 hr3 bsc mid-call-timeout 0 no missing-msc-text -- To view, visit https://gerrit.osmocom.org/9363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If392dcd42fb741c7ab8ae204bbefde89f05f0afe Gerrit-Change-Number: 9363 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:53 +0000 Subject: Change in osmo-msc[master]: mgcp: do not start connections in loopback mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9357 ) Change subject: mgcp: do not start connections in loopback mode ...................................................................... mgcp: do not start connections in loopback mode When the MSC creates the connections for the BSS side and for the PBX Change-Id: If9a81d057f73150e483286472e73c45e7a453a6d --- M src/libmsc/msc_mgcp.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 7c49c6e..67a2142 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -294,7 +294,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->call_id, - .conn_mode = MGCP_CONN_LOOPBACK + .conn_mode = MGCP_CONN_RECV_ONLY }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { @@ -397,7 +397,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->call_id, - .conn_mode = MGCP_CONN_LOOPBACK + .conn_mode = MGCP_CONN_RECV_ONLY }; if (osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->rtp_endpoint, sizeof(mgcp_msg.endpoint)) >= MGCP_ENDPOINT_MAXLEN) { -- To view, visit https://gerrit.osmocom.org/9357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If9a81d057f73150e483286472e73c45e7a453a6d Gerrit-Change-Number: 9357 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:54 +0000 Subject: Change in osmo-msc[master]: mgcp: hack to keep IuUP working In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9358 ) Change subject: mgcp: hack to keep IuUP working ...................................................................... mgcp: hack to keep IuUP working Since change If9a81d057f73150e483286472e73c45e7a453a6d removes the RTP loopback at the beginning. This also means that the Hack we do to run the IuUP negotiation via looping back the first few RTP packets will not work anymore. However, we should keep that hack as long as we do not have IuUP support in the MGW. - Start RTP connection in loopback mode for IuUP Change-Id: I4c7d90de4dc87e8baf7cf4a0c69d0e9e8c92e27b --- M src/libmsc/msc_mgcp.c 1 file changed, 40 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c index 67a2142..c77e389 100644 --- a/src/libmsc/msc_mgcp.c +++ b/src/libmsc/msc_mgcp.c @@ -278,10 +278,22 @@ struct msgb *msg; int rc; +#ifdef BUILD_IU + struct gsm_trans *trans; + struct gsm_subscriber_connection *conn; +#endif + OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); +#ifdef BUILD_IU + trans = mgcp_ctx->trans; + OSMO_ASSERT(trans); + conn = trans->conn; + OSMO_ASSERT(conn); +#endif + /* NOTE: In case of error, we will not be able to perform any DLCX * operation because until this point we do not have requested any * endpoint yet. */ @@ -302,6 +314,14 @@ return; } + /* HACK: We put the connection in loopback mode at the beginnig to + * trick the NodeB into doing the IuUP negotiation with itsself. + * this is a hack we need because osmo-mgw does not support IuUP yet */ +#ifdef BUILD_IU + if (conn->via_ran == RAN_UTRAN_IU) + mgcp_msg.conn_mode = MGCP_CONN_LOOPBACK; +#endif + msg = mgcp_msg_gen(mgcp, &mgcp_msg); OSMO_ASSERT(msg); @@ -377,10 +397,22 @@ struct msgb *msg; int rc; +#ifdef BUILD_IU + struct gsm_trans *trans; + struct gsm_subscriber_connection *conn; +#endif + OSMO_ASSERT(mgcp_ctx); mgcp = mgcp_ctx->mgcp; OSMO_ASSERT(mgcp); +#ifdef BUILD_IU + trans = mgcp_ctx->trans; + OSMO_ASSERT(trans); + conn = trans->conn; + OSMO_ASSERT(conn); +#endif + switch (event) { case EV_CRCX_RAN_RESP: break; @@ -405,6 +437,14 @@ return; } + /* HACK: We put the connection in loopback mode at the beginnig to + * trick the NodeB into doing the IuUP negotiation with itsself. + * this is a hack we need because osmo-mgw does not support IuUP yet */ +#ifdef BUILD_IU + if (conn->via_ran == RAN_UTRAN_IU) + mgcp_msg.conn_mode = MGCP_CONN_LOOPBACK; +#endif + msg = mgcp_msg_gen(mgcp, &mgcp_msg); OSMO_ASSERT(msg); -- To view, visit https://gerrit.osmocom.org/9358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4c7d90de4dc87e8baf7cf4a0c69d0e9e8c92e27b Gerrit-Change-Number: 9358 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:59 +0000 Subject: Change in osmo-mgw[master]: client: do not start connections in loopback mode In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9356 ) Change subject: client: do not start connections in loopback mode ...................................................................... client: do not start connections in loopback mode Starting connections in loopback bode may cause confusion at the receiving end when the connection is switched from looback into an actual send-receive connection. The reason for this is by this the SSRC of the RTP stream will suddenly change. For the majority of usecases it is not necessary to loopback the incomming packets back to the receiver in the beginning. So lets use receive-only as a safe default. - use MGCP_CONN_RECV_ONLY instead of MGCP_CONN_RECV_LOOPBACK Change-Id: I44178434ee497bc1d5e9d5f6d92c13c1a09ae241 Related: OS#3104 --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c index 6e1e7b8..07a65e6 100644 --- a/src/libosmo-mgcp-client/mgcp_client_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c @@ -112,7 +112,7 @@ .verb = MGCP_VERB_CRCX, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_MODE), .call_id = mgcp_ctx->conn_peer_local.call_id, - .conn_mode = MGCP_CONN_LOOPBACK, + .conn_mode = MGCP_CONN_RECV_ONLY, }; osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_local.endpoint, MGCP_ENDPOINT_MAXLEN); -- To view, visit https://gerrit.osmocom.org/9356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I44178434ee497bc1d5e9d5f6d92c13c1a09ae241 Gerrit-Change-Number: 9356 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:07:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:07:59 +0000 Subject: Change in osmo-mgw[master]: mgcp_network: do not log destination invalid ip/port as error In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9359 ) Change subject: mgcp_network: do not log destination invalid ip/port as error ...................................................................... mgcp_network: do not log destination invalid ip/port as error It is legal to create connection without setting the destination ip and port (this usually done later through MDCX). However, if some other connection tries to deliver an RTP packet through a a half open connection, then the fact that no destination ip is set is logged as error even if it is a pretty normal situation. - Check if destination ip and port are set to zero. If yes, we assume that the destination connection details are intentionally not set yet. Only when one value is set and the other one not, we log an error. Otherweise we log a message to debug. Change-Id: If96e5a60b8ab92259d3bddaa143121893bb6c525 Related OS#3104 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 4144382..2da37b4 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -867,6 +867,15 @@ struct mgcp_endpoint *endp; endp = conn->conn->endp; + /* Note: it is legal to create a connection but never setting a port + * and IP-address for outgoing data. */ + if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) { + LOGP(DRTP, LOGL_DEBUG, + "endpoint:0x%x destination IP-address and rtp port is (not yet) known\n", + ENDPOINT_NUMBER(endp)); + return -1; + } + if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) { LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x destination IP-address is invalid\n", -- To view, visit https://gerrit.osmocom.org/9359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If96e5a60b8ab92259d3bddaa143121893bb6c525 Gerrit-Change-Number: 9359 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:08:13 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:08:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expect previously failing paging tests to pass In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9364 ) Change subject: expect previously failing paging tests to pass ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c Gerrit-Change-Number: 9364 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 16:08:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:08:15 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:08:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: expect previously failing paging tests to pass In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9364 ) Change subject: expect previously failing paging tests to pass ...................................................................... expect previously failing paging tests to pass Two paging tests were failing in Jenkins due to a configuration problem. This has now been fixed so we can expect these two tests to pass: TC_paging_imsi_nochan_lac TC_paging_imsi_nochan_lai Related: g#9361 Related: docker-playground 4147adabb9917fd852cc49c93603f379ec810c6b Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c --- M bsc/expected-results.xml 1 file changed, 2 insertions(+), 9 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml index 3aa7983..a6f59fd 100644 --- a/bsc/expected-results.xml +++ b/bsc/expected-results.xml @@ -51,15 +51,8 @@ - - Timeout expecting { msg_disc := { msg_group := RSL_MDISC_CCHAN (6), transparent := false }, msg_type := RSL_MT_PAGING_CMD (21), ies := { { iei := ?, body := { chan_nr := { u := { ch0 := RSL_CHAN_NR_PCH_AGCH (18) }, tn := ? } } }, { iei := ?, body := { paging_group := ? } }, { iei := ?, body := { ms_identity := { len := ?, payload := ? } } }, * } } - BSC_Tests.ttcn:MASKED BSC_Tests control part - BSC_Tests.ttcn:MASKED TC_paging_imsi_nochan_lai testcase - - - - - + + -- To view, visit https://gerrit.osmocom.org/9364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1a3dc5fb13385549bb9ec523271a5da5dc6aaa8c Gerrit-Change-Number: 9364 Gerrit-PatchSet: 3 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:08:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 16:08:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: SGSN: add TC_hlr_location_cancel_request_update In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9251 ) Change subject: SGSN: add TC_hlr_location_cancel_request_update ...................................................................... SGSN: add TC_hlr_location_cancel_request_update MS <-> SGSN: GMM Attach HLR -> SGSN: Cancel Location Request HLR <- SGSN: Cancel Location Ack Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0685e30..f8ce5e7 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -1249,6 +1249,46 @@ } +private function f_TC_hlr_location_cancel_request_update(charstring id) runs on BSSGP_ConnHdlr { + /* MS: perform regular attach */ + f_TC_attach(id); + + /* HLR: cancel the location request */ + GSUP.send(ts_GSUP_CL_REQ(g_pars.imsi, OSMO_GSUP_CANCEL_TYPE_UPDATE)); + GSUP.receive(tr_GSUP_CL_RES(g_pars.imsi)); + GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); + + /* ensure no Detach Request got received */ + timer T := 5.0; + T.start; + alt { + [] BSSGP.receive(tr_BD_L3_MT(tr_GMM_DET_REQ_MT(*, *, *))) { + T.stop; + setverdict(fail, "Unexpected GMM Detach Request"); + } + [] T.timeout { + setverdict(pass); + self.stop; + } + [] BSSGP.receive { + repeat; + } + } +} + +testcase TC_hlr_location_cancel_request_update() runs on test_CT { + /* MS <-> SGSN: GMM Attach + * HLR -> SGSN: Cancel Location Request + * HLR <- SGSN: Cancel Location Ack + */ + var BSSGP_ConnHdlr vc_conn; + f_init(); + f_sleep(1.0); + vc_conn := f_start_handler(refers(f_TC_hlr_location_cancel_request_update), testcasename(), g_gb[0], 31); + vc_conn.done; +} + + private function f_TC_hlr_location_cancel_request_withdraw(charstring id) runs on BSSGP_ConnHdlr { /* MS: perform regular attach */ f_TC_attach(id); @@ -1340,6 +1380,7 @@ execute( TC_attach_combined() ); execute( TC_attach_accept_all() ); execute( TC_attach_closed() ); + execute( TC_hlr_location_cancel_request_update(), 10.0 ); execute( TC_hlr_location_cancel_request_withdraw(), 5.0 ); execute( TC_hlr_location_cancel_request_unknown_subscriber_withdraw(), 5.0 ); execute( TC_hlr_location_cancel_request_unknown_subscriber_update(), 5.0 ); -- To view, visit https://gerrit.osmocom.org/9251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I5d3a818eb0a4eb3b0d4bd7bd88874bd2ac6adb11 Gerrit-Change-Number: 9251 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 16:47:13 2018 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 29 May 2018 16:47:13 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/9245 ) Change subject: L3_Templates: rename tr_GMM_DET_ACCEPT_MT -> tr_GMM_DET_ACCEPT_MO ...................................................................... Abandoned does not follow the naming style. abandon. -- To view, visit https://gerrit.osmocom.org/9245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4b5e2d43c9754d34b3749bff43b7df7196b9bb9c Gerrit-Change-Number: 9245 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:03:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Add Encoder/Decoder for Supplementary Services Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9365 Change subject: msc: Add Encoder/Decoder for Supplementary Services ...................................................................... msc: Add Encoder/Decoder for Supplementary Services The many SS_* types depend on MAP, whcih in turn depends on ROSE. Add all of this to the MSC testsuite so we can do SS related testing. Change-Id: If5084decb5391736ab5cadd86adb2ffa78e7140f --- M msc/gen_links.sh M msc/regen_makefile.sh 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/9365/1 diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a5444db..0ceed43 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -49,8 +49,18 @@ FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.ROSE/src +FILES="Remote_Operations_Generic_ROS_PDUs.asn Remote_Operations_Information_Objects.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MAP/src +FILES="MAP_ApplicationContexts.asn MAP_CH_DataTypes.asn MAP_CallHandlingOperations.asn MAP_CommonDataTypes.asn MAP_DialogueInformation.asn MAP_ER_DataTypes.asn MAP_EncDec.cc MAP_Errors.asn MAP_GR_DataTypes.asn MAP_Group_Call_Operations.asn MAP_LCS_DataTypes.asn MAP_LocationServiceOperations.asn MAP_MS_DataTypes.asn MAP_MobileServiceOperations.asn MAP_OM_DataTypes.asn MAP_OperationAndMaintenanceOperations.asn MAP_PDU_Defs.asn MAP_Protocol.asn MAP_SM_DataTypes.asn MAP_SS_Code.asn MAP_SS_DataTypes.asn MAP_ShortMessageServiceOperations.asn MAP_SupplementaryServiceOperations.asn MAP_TS_Code.asn MAP_Types.ttcn " +FILES+="MAP_BS_Code.asn MAP_ExtensionDataTypes.asn MobileDomainDefinitions.asn" +gen_links $DIR $FILES + DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src -FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn" +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" gen_links $DIR $FILES DIR=$BASEDIR/titan.ProtocolModules.SDP/src diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index fc4a29d..5798f8a 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc *.c" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc *.c *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/9365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If5084decb5391736ab5cadd86adb2ffa78e7140f Gerrit-Change-Number: 9365 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:03:58 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:03:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: Add templates related to Supplementaryt Services Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9366 Change subject: L3_Templates: Add templates related to Supplementaryt Services ...................................................................... L3_Templates: Add templates related to Supplementaryt Services Change-Id: I919fa542a2e037b3fcf8cd5b0b9d7599b8c09070 --- M library/L3_Templates.ttcn 1 file changed, 208 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/9366/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 824dbf2..593c990 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1295,6 +1295,214 @@ } /*********************************************************************** + * Supplementary Services + ***********************************************************************/ + +private template (value) Facility_TLV ts_FacTLV(OCTN facility) := { + elementIdentifier := '1C'O, + lengthIndicator := lengthof(facility), + facilityInformation := facility +} +private template Facility_TLV tr_FacTLV(template OCTN facility) := { + elementIdentifier := '1C'O, + lengthIndicator := ?, + facilityInformation := facility +} + +private template (value) Facility_LV ts_FacLV(OCTN facility) := { + lengthIndicator := lengthof(facility), + facilityInformation := facility +} +private template Facility_LV tr_FacLV(template OCTN facility) := { + lengthIndicator := ?, + facilityInformation := facility +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_REGISTER( + uint3_t tid, BIT1 ti_flag, + OCTN facility, + template (omit) SS_VersionIndicator ss_ver := omit +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := ts_FacTLV(facility), + ss_version := ss_ver + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_REGISTER( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility, + template SS_VersionIndicator ss_ver := omit +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := tr_FacTLV(facility), + ss_version := ss_ver + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_REGISTER( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := ts_FacTLV(facility) + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_REGISTER( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := tr_FacTLV(facility) + } + } + } +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := ts_FacLV(facility) + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := tr_FacLV(facility) + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := ts_FacLV(facility) + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := tr_FacLV(facility) + } + } + } +} + +/*********************************************************************** * GPRS Mobility Management ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/9366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I919fa542a2e037b3fcf8cd5b0b9d7599b8c09070 Gerrit-Change-Number: 9366 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:03:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add GSM 04.80 RELEASE_COMPLETE message Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9367 Change subject: L3_Templates: add GSM 04.80 RELEASE_COMPLETE message ...................................................................... L3_Templates: add GSM 04.80 RELEASE_COMPLETE message Change-Id: Iaf295aeb4ef475d41d0eeddcca5e864016fd91cc --- M library/L3_Templates.ttcn 1 file changed, 184 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/9367/1 diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 593c990..f169a33 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1502,6 +1502,190 @@ } } +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_RELEASE_COMPLETE( + uint3_t tid, BIT1 ti_flag +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_MS_NW := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := omit + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_RELEASE_COMPLETE( + template uint3_t tid, template BIT1 ti_flag +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_MS_NW := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := omit + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_RELEASE_COMPLETE( + uint3_t tid, BIT1 ti_flag +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_NW_MS := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := omit + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_RELEASE_COMPLETE( + template uint3_t tid, template BIT1 ti_flag +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_NW_MS := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := omit + } + } + } +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_RELEASE_COMPLETE_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_MS_NW := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := ts_FacTLV(facility) + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_RELEASE_COMPLETE_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_MS_NW := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := tr_FacTLV(facility) + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_RELEASE_COMPLETE_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_NW_MS := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := ts_FacTLV(facility) + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_RELEASE_COMPLETE_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + releaseComplete_NW_MS := { + messageType := '101010'B, + nsd := '00'B, + cause := omit, + facility := tr_FacTLV(facility) + } + } + } +} + /*********************************************************************** * GPRS Mobility Management ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/9367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf295aeb4ef475d41d0eeddcca5e864016fd91cc Gerrit-Change-Number: 9367 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:03:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:03:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: introduce Facility IE templates for USSD Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9368 Change subject: library: introduce Facility IE templates for USSD ...................................................................... library: introduce Facility IE templates for USSD Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de --- A library/USSD_Templates.ttcn 1 file changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/9368/1 diff --git a/library/USSD_Templates.ttcn b/library/USSD_Templates.ttcn new file mode 100644 index 0000000..3a1accc --- /dev/null +++ b/library/USSD_Templates.ttcn @@ -0,0 +1,73 @@ +module USSD_Templates { + +/* USSD Facility IE templates, building on top of SS_Types. + * + * (C) 2018 by Vadim Yanitskiy + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from General_Types all; +import from SS_Types all; + +template SS_FacilityInformation ts_ML3_FACILITY_USSD_INVOKE( + integer invoke_id := 1, + integer op_code := 59, // (Process)UnstructuredSS-Request (59 or 60) + octetstring ussd_dcs := '0F'O, // GSM 7 bit default alphabet + octetstring ussd_string := 'AA180C3602'O // *#100# +) := { + { + invoke := { + invokeId := { present_ := invoke_id }, + linkedId := omit, + opcode := { local := op_code }, + argument := { + uSSD_Arg := { + ussd_DataCodingScheme := ussd_dcs, + ussd_String := ussd_string, + alertingPattern := omit, + msisdn := omit + } + } + } + } +} + +template SS_FacilityInformation ts_ML3_FACILITY_USSD_RETURN_RESULT( + integer invoke_id := 1, + integer op_code := 59, // (Process)UnstructuredSS-Request (59 or 60) + octetstring ussd_dcs := '0F'O, // GSM 7-bit default alphabet + octetstring ussd_string // 7-bit encoded string +) := { + { + returnResult := { + invokeId := { present_ := invoke_id }, + result := { + opcode := { local := op_code }, + result := { + uSSD_Res := { + ussd_DataCodingScheme := ussd_dcs, + ussd_String := ussd_string + } + } + } + } + } +} + +template SS_FacilityInformation ts_ML3_FACILITY_USSD_RETURN_ERROR( + integer invoke_id := 1, + integer errcode := 71 // Unknown alphabet +) := { + { + returnError := { + invokeId := { present_ := invoke_id }, + errcode := { local := 71 }, + parameter := omit + } + } +} + +} -- To view, visit https://gerrit.osmocom.org/9368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de Gerrit-Change-Number: 9368 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:04:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:04:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: import GSM 7-bit coding functions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9369 Change subject: msc: import GSM 7-bit coding functions ...................................................................... msc: import GSM 7-bit coding functions Change-Id: Ie8dd865d0c4c64827284c737d431e6c87b3d0847 --- M msc/gen_links.sh M msc/regen_makefile.sh 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/9369/1 diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 0ceed43..1fe5d6e 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -10,6 +10,7 @@ DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # GSM 7-bit coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 5798f8a..556d69e 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc *.c *.asn" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc *.c *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/9369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8dd865d0c4c64827284c737d431e6c87b3d0847 Gerrit-Change-Number: 9369 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:04:00 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:04:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce USSD helper functions Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9370 Change subject: msc: introduce USSD helper functions ...................................................................... msc: introduce USSD helper functions Change-Id: Ic528b968a9bc7c12e8395364e895400aa016c8f5 --- A msc/USSD_Helpers.ttcn M msc/gen_links.sh 2 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/9370/1 diff --git a/msc/USSD_Helpers.ttcn b/msc/USSD_Helpers.ttcn new file mode 100644 index 0000000..d9f05a8 --- /dev/null +++ b/msc/USSD_Helpers.ttcn @@ -0,0 +1,61 @@ +module USSD_Helpers { + +/* USSD helpers for composing messages, building on top + * of both L3_Templates and USSD_Templates. + * + * (C) 2018 by Vadim Yanitskiy + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from General_Types all; +import from TCCEncoding_Functions all; + +import from USSD_Templates all; +import from SS_Types all; + +function f_USSD_FACILITY_IE_INVOKE( + integer invoke_id := 1, + integer op_code := 59, // (Process)UnstructuredSS-Request (59 or 60) + charstring ussd_string // ASCII string +) return octetstring { + var SS_FacilityInformation facility_ie; + var octetstring ussd_string_enc; + + /* Encode input string with GSM 7-bit encoding */ + ussd_string_enc := f_encGSM7bit(ussd_string); + + /* Encode Facility IE */ + facility_ie := valueof(ts_ML3_FACILITY_USSD_INVOKE( + invoke_id := invoke_id, + op_code := op_code, + ussd_string := ussd_string_enc + )); + + return enc_SS_FacilityInformation(facility_ie); +} + +function f_USSD_FACILITY_IE_RETURN_RESULT( + integer invoke_id := 1, + integer op_code := 59, // (Process)UnstructuredSS-Request (59 or 60) + charstring ussd_string // ASCII string +) return octetstring { + var SS_FacilityInformation facility_ie; + var octetstring ussd_string_enc; + + /* Encode input string with GSM 7-bit encoding */ + ussd_string_enc := f_encGSM7bit(ussd_string); + + /* Encode Facility IE */ + facility_ie := valueof(ts_ML3_FACILITY_USSD_RETURN_RESULT( + invoke_id := invoke_id, + op_code := op_code, + ussd_string := ussd_string_enc + )); + + return enc_SS_FacilityInformation(facility_ie); +} + +} diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 1fe5d6e..5f3024b 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -90,6 +90,7 @@ FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " +FILES+="USSD_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/9370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic528b968a9bc7c12e8395364e895400aa016c8f5 Gerrit-Change-Number: 9370 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:04:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/BSC_ConnectionHandler.ttcn: add EST_TYPE_SS_ACT for SS/USSD Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9371 Change subject: msc/BSC_ConnectionHandler.ttcn: add EST_TYPE_SS_ACT for SS/USSD ...................................................................... msc/BSC_ConnectionHandler.ttcn: add EST_TYPE_SS_ACT for SS/USSD Change-Id: If439e7c082b435d7f668065c9f8e3bdfa941dcc5 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/9371/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index b7a4f50..803cb4d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -192,7 +192,8 @@ EST_TYPE_MO_CALL, EST_TYPE_EMERG_CALL, EST_TYPE_PAG_RESP, - EST_TYPE_MO_SMS + EST_TYPE_MO_SMS, + EST_TYPE_SS_ACT }; /* helper function to fully establish a dedicated channel */ @@ -221,6 +222,9 @@ case (EST_TYPE_MO_SMS) { l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_SMS, mi)); } + case (EST_TYPE_SS_ACT) { + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_SS_ACT, mi)); + } } /* Send BSSAP_Conn_Req with COMPL L3 INFO to MSC */ -- To view, visit https://gerrit.osmocom.org/9371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If439e7c082b435d7f668065c9f8e3bdfa941dcc5 Gerrit-Change-Number: 9371 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:04:01 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 17:04:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/USSD: add single *#100# request testcase Message-ID: Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/9372 Change subject: msc/USSD: add single *#100# request testcase ...................................................................... msc/USSD: add single *#100# request testcase Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/9372/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index f843839..cb29bc1 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -51,6 +51,10 @@ import from SMPP_Templates all; import from SMPP_Emulation all; +import from SS_Types all; +import from USSD_Templates all; +import from USSD_Helpers all; + const integer NUM_BSC := 2; type record of BSSAP_Configuration BSSAP_Configurations; @@ -2101,6 +2105,70 @@ vc_conn.done; } +/*********************************************************************** + * USSD Testing + ***********************************************************************/ + +private function f_tc_lu_and_ussd_single_req(charstring id, BSC_ConnHdlrPars pars) +runs on BSC_ConnHdlr { + f_init_handler(pars); + + /* Perform location update */ + f_perform_lu(); + + /* Send CM Service Request for SS/USSD */ + f_establish_fully(EST_TYPE_SS_ACT); + + /* Compose a new SS/REGISTER message with request */ + var template PDU_ML3_MS_NW ussd_req := ts_ML3_MO_SS_REGISTER( + tid := 1, /* We just need a single transaction */ + ti_flag := c_TIF_ORIG, /* Sent from the side that originates the TI */ + facility := f_USSD_FACILITY_IE_INVOKE( + op_code := 59, /* ProcessUnstructuredSS-Request */ + ussd_string := "*#100#" + ) + ); + + /* Compose SS/RELEASE_COMPLETE template with expected response */ + var template PDU_ML3_NW_MS ussd_rsp := tr_ML3_MT_SS_RELEASE_COMPLETE_FACILITY( + tid := 1, /* Response should arrive within the same transaction */ + ti_flag := c_TIF_REPL, /* Sent to the side that originates the TI */ + facility := ? /* Any Facility IE is acceptable */ + ); + + /* Compose SS/RELEASE_COMPLETE without Facility IE */ + var template PDU_ML3_NW_MS ussd_rsp_empty := tr_ML3_MT_SS_RELEASE_COMPLETE( + tid := 1, /* Response should arrive within the same transaction */ + ti_flag := c_TIF_REPL /* Sent to the side that originates the TI */ + ); + + /* Request own number request */ + BSSAP.send(ts_PDU_DTAP_MO(ussd_req)); + alt { + /* We expect RELEASE_COMPLETE message with the response */ + [] BSSAP.receive(tr_PDU_DTAP_MT(ussd_rsp)) { + /* TODO: decode Facility IE and check our number */ + setverdict(pass); + } + /* Incorrect: RELEASE_COMPLETE without Facility IE? */ + [] BSSAP.receive(tr_PDU_DTAP_MT(ussd_rsp_empty)) { + setverdict(fail, "RELEASE_COMPLETE without Facility IE?"); + } + [] BSSAP.receive { + setverdict(fail, "Unknown/unexpected BSSAP received"); + self.stop; + } + } + + f_expect_clear(); +} +testcase TC_lu_and_ussd_single_req() runs on MTC_CT { + var BSC_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_tc_lu_and_ussd_single_req), 46); + vc_conn.done; +} + /* TODO (SMS): * different user data lengths * SMPP transaction mode with unsuccessful delivery @@ -2182,6 +2250,8 @@ execute( TC_smpp_mo_sms() ); execute( TC_smpp_mt_sms() ); + execute( TC_lu_and_ussd_single_req() ); + /* Run this last: at the time of writing this test crashes the MSC */ execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() ); } diff --git a/msc/expected-results.xml b/msc/expected-results.xml index 0b192d0..af2d97f 100644 --- a/msc/expected-results.xml +++ b/msc/expected-results.xml @@ -76,4 +76,5 @@ + -- To view, visit https://gerrit.osmocom.org/9372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad Gerrit-Change-Number: 9372 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 17:21:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 17:21:59 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9373 Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... gsm_08_08.h: Add enum for LCLS config, control and status Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/9373/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 60b9681..5d2bf13 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -536,3 +536,31 @@ uint16_t id_list_lac[CELL_ID_LIST_LAC_MAXLEN]; unsigned int id_list_len; }; + +/* TS 48.008 3.2.2.116 */ +enum gsm0808_lcls_config { + GSM0808_LCLS_CFG_BOTH_WAY = 0x00, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL = 0x01, + GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL = 0x02, + GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL_BLOCK_LOCAL_DL = 0x03, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL = 0x04, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL = 0x05, +}; + +/* TS 48.008 3.2.2.117 */ +enum gsm0808_lcls_control { + GSM0808_LCLS_CSC_CONNET = 0x00, + GSM0808_LCLS_CSC_DO_NOT_CONNET = 0x01, + GSM0808_LCLS_CSC_RELEASE_LCLS = 0x02, + GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER = 0x03, + GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER = 0x04, +}; + +/* TS 48.008 3.2.2.119 */ +enum gsm0808_lcls_status { + GSM0808_LCLS_STS_NOT_YET_LS = 0x00, + GSM0808_LCLS_STS_NOT_POSSIBLE_LS = 0x01, + GSM0808_LCLS_STS_NO_LONER_LS = 0x02, + GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP = 0x03, + GSM0808_LCLS_STS_LOCALLY_SWITCHED = 0x04, +}; -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 18:55:44 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Tue, 29 May 2018 18:55:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9374 Change subject: start implementing the TC_paging() PCU test ...................................................................... start implementing the TC_paging() PCU test Implement a basic paging test for the PCU. This test currently does not verify the payload of the paging sent by osmo-pcu. However, it does verify that the frame type is "PAGING REQUEST 1". Previously, the test contained a debugging loop which never terminated. Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Related: OS#2404 --- M pcu/PCU_Tests.ttcn 1 file changed, 32 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/9374/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 6e36f68..8aafedf 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -194,6 +194,26 @@ log("BSSGP successfully initialized"); } + function f_wait_paging_req_type1() runs on dummy_CT { + var LAPDm_ph_data ph_data; + var GsmRrMessage rr; + timer T := 5.0; + + T.start; + alt { + [] L1.receive(LAPDm_ph_data:{sacch:=?,sapi:=0,lapdm:={bbis:=?}}) -> value ph_data { + rr := dec_GsmRrMessage(ph_data.lapdm.bbis.payload); + if (match(rr.header, t_RrHeader(PAGING_REQUEST_TYPE_1, ?))) { + /* TODO: verify PTIMSI in payload */ + return; + } + repeat; + } + [] L1.receive { repeat; } + [] T.timeout { setverdict(fail); } + } + } + /* Send PS-PAGING via BSSGP to PCU, expect it to show up on L1/Um */ testcase TC_paging() runs on dummy_CT { var GsmTmsi tmsi := hex2int('01234567'H); @@ -201,20 +221,19 @@ g_mmctx.tlli := f_random_tlli(); f_init(); - /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); - BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + var BCCH_tune_req tune_req := { { false, 871 }, true }; + L1.send(tune_req); + /* FIXME: wait for confirm */ - while (true) { - var BssgpDecoded bd; - alt { - [] BSSGP.receive(tr_BD_L3_MT(?)) -> value bd { - log("BSSGP Rx: ", bd); - } - [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } - [] BSSGP.receive { repeat; } - } - } + /* Send paging on signalling BVCI 0 since osmo-pcu does not support paging on PTP yet. */ + + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_IMSI(0, g_mmctx.imsi)); + f_wait_paging_req_type1(); + + BSSGP_SIG.send(ts_BSSGP_PS_PAGING_PTMSI(0, g_mmctx.imsi, tmsi)); + f_wait_paging_req_type1(); + + setverdict(pass); } /* Establish an UL TBF: Tune to ARFCN, send RACH, receive AGCH, enable TBF Rx */ -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:01:49 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 29 May 2018 19:01:49 +0000 Subject: Change in osmo-gsm-manuals[master]: port_numbers: Add osmo-gbproxy ctrl interface port Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/9375 Change subject: port_numbers: Add osmo-gbproxy ctrl interface port ...................................................................... port_numbers: Add osmo-gbproxy ctrl interface port Change-Id: I2307a86c7c377ea3e6e8bf1333e283d5d3f67beb --- M common/chapters/port_numbers.adoc 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/75/9375/1 diff --git a/common/chapters/port_numbers.adoc b/common/chapters/port_numbers.adoc index 3efa179..6309c66 100644 --- a/common/chapters/port_numbers.adoc +++ b/common/chapters/port_numbers.adoc @@ -40,6 +40,7 @@ |TCP|4260|telnet (VTY)|osmo-ggsn |TCP|4261|telnet (VTY)|osmo-hnbgw |TCP|4262|Control Interface|osmo-hnbgw +|TCP|4263|Control Interface|osmo-gbproxy |UDP|4729|GSMTAP|Almost every osmocom project |TCP|5000|A/IP|osmo-bsc, osmo-bsc_nat |UDP|2427|GSMTAP|osmo-pcu, osmo-bts -- To view, visit https://gerrit.osmocom.org/9375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2307a86c7c377ea3e6e8bf1333e283d5d3f67beb Gerrit-Change-Number: 9375 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:02:38 2018 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Tue, 29 May 2018 19:02:38 +0000 Subject: Change in libosmocore[master]: ports.h: Add ctrl port for osmo-gbproxy Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/9376 Change subject: ports.h: Add ctrl port for osmo-gbproxy ...................................................................... ports.h: Add ctrl port for osmo-gbproxy Change-Id: I46a1cef3013c9bbf9b5a6d64e83cd84568f2523c --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/76/9376/1 diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index d6b5394..b65bd00 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -21,4 +21,5 @@ #define OSMO_CTRL_PORT_GGSN 4257 #define OSMO_CTRL_PORT_HLR 4259 #define OSMO_CTRL_PORT_HNBGW 4262 +#define OSMO_CTRL_PORT_GBPROXY 4263 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 5e7e655..5a8faed 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -32,5 +32,5 @@ /* 4259 used by control interface */ #define OSMO_VTY_PORT_GGSN 4260 #define OSMO_VTY_PORT_HNBGW 4261 -/* 4262 used by control interface */ +/* 4262-4263 used by control interface */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/9376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I46a1cef3013c9bbf9b5a6d64e83cd84568f2523c Gerrit-Change-Number: 9376 Gerrit-PatchSet: 1 Gerrit-Owner: daniel -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:14:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:14:57 +0000 Subject: Change in libosmocore[master]: ctrl: Make 'struct ctrl_connection' non-public Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9377 Change subject: ctrl: Make 'struct ctrl_connection' non-public ...................................................................... ctrl: Make 'struct ctrl_connection' non-public The ctrl_connection is always dynamically allocated by API functions exported by libosmoctrl, and users simply pass pointers to it back into other API functions. As such, there's no need to expose the detailed intenals of this structure to the user. Change-Id: I3fb9fb19eb057a40fcda139066f04f1096944755 --- M include/osmocom/ctrl/control_cmd.h M include/osmocom/gsm/protocol/gsm_08_08.h M src/ctrl/Makefile.am M src/ctrl/control_cmd.c M src/ctrl/control_if.c A src/ctrl/ctrl_internal.h M tests/Makefile.am M tests/ctrl/ctrl_test.c 8 files changed, 36 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/9377/1 diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index 08376f3..29425e1 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -41,25 +41,7 @@ extern const struct value_string ctrl_type_vals[]; /*! Represents a single ctrl connection */ -struct ctrl_connection { - struct llist_head list_entry; - - /*! The queue for sending data back */ - struct osmo_wqueue write_queue; - - /*! Buffer for partial input data */ - struct msgb *pending_msg; - - /*! Callback if the connection was closed */ - void (*closed_cb)(struct ctrl_connection *conn); - - /*! Pending commands for this connection */ - struct llist_head cmds; - - /*! Pending deferred command responses for this connection */ - struct llist_head def_cmds; -}; - +struct ctrl_connection; struct ctrl_cmd_def; /*! Represents a single ctrl command after parsing */ diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 5d2bf13..0a5e299 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -549,8 +549,8 @@ /* TS 48.008 3.2.2.117 */ enum gsm0808_lcls_control { - GSM0808_LCLS_CSC_CONNET = 0x00, - GSM0808_LCLS_CSC_DO_NOT_CONNET = 0x01, + GSM0808_LCLS_CSC_CONNECT = 0x00, + GSM0808_LCLS_CSC_DO_NOT_CONNECT = 0x01, GSM0808_LCLS_CSC_RELEASE_LCLS = 0x02, GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER = 0x03, GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER = 0x04, diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index a51ae05..0a401c8 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -20,6 +20,6 @@ libosmoctrl_la_SOURCES += control_vty.c endif -EXTRA_DIST = libosmoctrl.map +EXTRA_DIST = libosmoctrl.map ctrl_internal.h endif diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index bff4d17..e6bc073 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -42,6 +42,8 @@ #include #include +#include "ctrl_internal.h" + extern vector ctrl_node_vec; const struct value_string ctrl_type_vals[] = { diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index d3e6fac..8eadf7e 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -64,6 +64,8 @@ #include #include +#include "ctrl_internal.h" + extern int osmo_fsm_ctrl_cmds_install(void); vector ctrl_node_vec; diff --git a/src/ctrl/ctrl_internal.h b/src/ctrl/ctrl_internal.h new file mode 100644 index 0000000..d2911be --- /dev/null +++ b/src/ctrl/ctrl_internal.h @@ -0,0 +1,25 @@ +#pragma once + +#include +#include +#include +#include + +struct ctrl_connection { + struct llist_head list_entry; + + /*! The queue for sending data back */ + struct osmo_wqueue write_queue; + + /*! Buffer for partial input data */ + struct msgb *pending_msg; + + /*! Callback if the connection was closed */ + void (*closed_cb)(struct ctrl_connection *conn); + + /*! Pending commands for this connection */ + struct llist_head cmds; + + /*! Pending deferred command responses for this connection */ + struct llist_head def_cmds; +}; diff --git a/tests/Makefile.am b/tests/Makefile.am index 70b5cb8..a2ace2c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -75,6 +75,7 @@ abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la ctrl_ctrl_test_SOURCES = ctrl/ctrl_test.c +ctrl_ctrl_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/ctrl ctrl_ctrl_test_LDADD = $(LDADD) $(top_builddir)/src/ctrl/libosmoctrl.la gea_gea_test_SOURCES = gea/gea_test.c diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c index 8bb917b..a0f5973 100644 --- a/tests/ctrl/ctrl_test.c +++ b/tests/ctrl/ctrl_test.c @@ -12,6 +12,8 @@ #include #include +#include "ctrl_internal.h" + static void check_type(enum ctrl_type c) { const char *t = get_value_string(ctrl_type_vals, c); -- To view, visit https://gerrit.osmocom.org/9377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3fb9fb19eb057a40fcda139066f04f1096944755 Gerrit-Change-Number: 9377 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:14:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:14:58 +0000 Subject: Change in libosmocore[master]: gsm0808: Add encoding functions for LCLS BSSMAP messages Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9378 Change subject: gsm0808: Add encoding functions for LCLS BSSMAP messages ...................................................................... gsm0808: Add encoding functions for LCLS BSSMAP messages Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c 2 files changed, 65 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/9378/1 diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 5c03400..8402957 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -80,6 +80,11 @@ const struct gsm0808_cell_id_list *cil, const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, + enum gsm0808_lcls_control *control); +struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status); +struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req); + /*! 3GPP TS 48.008 ?3.2.2.5.8 Old BSS to New BSS information */ struct gsm0808_old_bss_to_new_bss_info { diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 5af53ee..347e985 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -282,6 +282,66 @@ return msg; } +/*! Create BSSMAP LCLS CONNECT CONTROL message (TS 48.008 3.2.1.91). + * \param[in] config LCLS Configuration + * \param[in] control LCLS Connection Status Control + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, + enum gsm0808_lcls_control *control) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS CONN CTRL"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL); + if (config) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *config); + if (control) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *control); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + +/*! Create BSSMAP LCLS CONNECT CONTROL ACK message (TS 48.008 3.2.1.92). + * \param[in] status LCLS BSS Status + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS CONN CTRL ACK"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL_ACK); + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + +/*! Create BSSMAP LCLS NOTIFICATION message (TS 48.008 3.2.1.93). + * \param[in] status LCLS BSS Status + * \param[in] break_req Include the LCLS BREAK REQ IE (true) or not (false) + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS NOTIFICATION"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_NOTIFICATION); + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); + if (break_req) + msgb_v_put(msg, GSM0808_IE_LCLS_BREAK_REQ); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + + /*! Create BSSMAP Classmark Update message * \param[in] cm2 Classmark 2 * \param[in] cm2_len length (in octets) of \a cm2 -- To view, visit https://gerrit.osmocom.org/9378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f Gerrit-Change-Number: 9378 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:16:07 +0000 Subject: Change in libosmocore[master]: ctrl: Make 'struct ctrl_connection' non-public In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9377 ) Change subject: ctrl: Make 'struct ctrl_connection' non-public ...................................................................... Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/9377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3fb9fb19eb057a40fcda139066f04f1096944755 Gerrit-Change-Number: 9377 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 29 May 2018 19:16:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:16:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:16:33 +0000 Subject: Change in libosmocore[master]: ports.h: Add ctrl port for osmo-gbproxy In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9376 ) Change subject: ports.h: Add ctrl port for osmo-gbproxy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I46a1cef3013c9bbf9b5a6d64e83cd84568f2523c Gerrit-Change-Number: 9376 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:16:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:16:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:16:40 +0000 Subject: Change in osmo-gsm-manuals[master]: port_numbers: Add osmo-gbproxy ctrl interface port In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9375 ) Change subject: port_numbers: Add osmo-gbproxy ctrl interface port ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2307a86c7c377ea3e6e8bf1333e283d5d3f67beb Gerrit-Change-Number: 9375 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:16:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:16:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:16:41 +0000 Subject: Change in osmo-gsm-manuals[master]: port_numbers: Add osmo-gbproxy ctrl interface port In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9375 ) Change subject: port_numbers: Add osmo-gbproxy ctrl interface port ...................................................................... port_numbers: Add osmo-gbproxy ctrl interface port Change-Id: I2307a86c7c377ea3e6e8bf1333e283d5d3f67beb --- M common/chapters/port_numbers.adoc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/common/chapters/port_numbers.adoc b/common/chapters/port_numbers.adoc index 3efa179..6309c66 100644 --- a/common/chapters/port_numbers.adoc +++ b/common/chapters/port_numbers.adoc @@ -40,6 +40,7 @@ |TCP|4260|telnet (VTY)|osmo-ggsn |TCP|4261|telnet (VTY)|osmo-hnbgw |TCP|4262|Control Interface|osmo-hnbgw +|TCP|4263|Control Interface|osmo-gbproxy |UDP|4729|GSMTAP|Almost every osmocom project |TCP|5000|A/IP|osmo-bsc, osmo-bsc_nat |UDP|2427|GSMTAP|osmo-pcu, osmo-bts -- To view, visit https://gerrit.osmocom.org/9375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2307a86c7c377ea3e6e8bf1333e283d5d3f67beb Gerrit-Change-Number: 9375 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:16:45 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:16:45 +0000 Subject: Change in libosmocore[master]: ports.h: Add ctrl port for osmo-gbproxy In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9376 ) Change subject: ports.h: Add ctrl port for osmo-gbproxy ...................................................................... ports.h: Add ctrl port for osmo-gbproxy Change-Id: I46a1cef3013c9bbf9b5a6d64e83cd84568f2523c --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index d6b5394..b65bd00 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -21,4 +21,5 @@ #define OSMO_CTRL_PORT_GGSN 4257 #define OSMO_CTRL_PORT_HLR 4259 #define OSMO_CTRL_PORT_HNBGW 4262 +#define OSMO_CTRL_PORT_GBPROXY 4263 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 5e7e655..5a8faed 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -32,5 +32,5 @@ /* 4259 used by control interface */ #define OSMO_VTY_PORT_GGSN 4260 #define OSMO_VTY_PORT_HNBGW 4261 -/* 4262 used by control interface */ +/* 4262-4263 used by control interface */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/9376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I46a1cef3013c9bbf9b5a6d64e83cd84568f2523c Gerrit-Change-Number: 9376 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:17:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:17:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: start implementing the TC_paging() PCU test In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9374 ) Change subject: start implementing the TC_paging() PCU test ...................................................................... Patch Set 1: I think we should kee this as WIP until the PTMSI / IMSI is verified. -- To view, visit https://gerrit.osmocom.org/9374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id0384e0742ab91983615e4f1c883bb044c1c8b18 Gerrit-Change-Number: 9374 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 May 2018 19:17:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:18:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:18:09 +0000 Subject: Change in libosmocore[master]: gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7631 ) Change subject: gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I0c85292222749a48ca0c4b2e93f4fa2d61468c18 Gerrit-Change-Number: 7631 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:18:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:18:37 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:18:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Add Encoder/Decoder for Supplementary Services In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9365 ) Change subject: msc: Add Encoder/Decoder for Supplementary Services ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If5084decb5391736ab5cadd86adb2ffa78e7140f Gerrit-Change-Number: 9365 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:18:37 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:19:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:19:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: import GSM 7-bit coding functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9369 ) Change subject: msc: import GSM 7-bit coding functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie8dd865d0c4c64827284c737d431e6c87b3d0847 Gerrit-Change-Number: 9369 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:19:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:23:30 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:23:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/USSD: add single *#100# request testcase In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9372 ) Change subject: msc/USSD: add single *#100# request testcase ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9372/1/msc/MSC_Tests.ttcn File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/9372/1/msc/MSC_Tests.ttcn at 2123 PS1, Line 2123: var template PDU_ML3_MS_NW ussd_req := ts_ML3_MO_SS_REGISTER( for "send" templates it is good style to say "template (value)" rather than just "template". This helps the compiler to catch errors at compile time rather than only at runtime. -- To view, visit https://gerrit.osmocom.org/9372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad Gerrit-Change-Number: 9372 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:23:30 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:23:42 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:23:42 +0000 Subject: Change in libosmocore[master]: gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7631 ) Change subject: gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE ...................................................................... gsm0480: fix: don't overwrite the data of RELEASE_COMPLETE According to the 3GPP TS 04.80, table 2.5 'Release complete', a RELEASE_COMPLETE message may containg optional FACILITY element. Meanwhile, the 0xff byte is used to indicate that there is no decoded message (legacy field). Let's avoid overwriting of a decoded message. Change-Id: I0c85292222749a48ca0c4b2e93f4fa2d61468c18 --- M src/gsm/gsm0480.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c index 636f267..5c73e5b 100644 --- a/src/gsm/gsm0480.c +++ b/src/gsm/gsm0480.c @@ -296,11 +296,15 @@ case GSM0480_MTYPE_RELEASE_COMPLETE: LOGP(0, LOGL_DEBUG, "SS Release Complete\n"); + /** + * Indicates that there is no decoded message. + * To be overwriten by the message otherwise. + */ + req->ussd_text[0] = 0xFF; + /* Parse optional Cause and/or Facility data */ if (len >= 2) rc &= parse_ss_info_elements(&hdr->data[0], len, req); - - req->ussd_text[0] = 0xFF; break; case GSM0480_MTYPE_REGISTER: rc &= parse_ss_info_elements(&hdr->data[0], len, req); -- To view, visit https://gerrit.osmocom.org/7631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0c85292222749a48ca0c4b2e93f4fa2d61468c18 Gerrit-Change-Number: 7631 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:40:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:40:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: introduce Facility IE templates for USSD In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9368 ) Change subject: library: introduce Facility IE templates for USSD ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/#/c/9368/1/library/USSD_Templates.ttcn File library/USSD_Templates.ttcn: https://gerrit.osmocom.org/#/c/9368/1/library/USSD_Templates.ttcn at 41 PS1, Line 41: octetstring ussd_dcs := '0F'O, // GSM 7-bit default alphabet I recommend adding either "const" definitions for this, or add an enumerated and then use enum2int() here. Same for op_code as well as for ussd_dcs. https://gerrit.osmocom.org/#/c/9368/1/library/USSD_Templates.ttcn at 60 PS1, Line 60: template SS_FacilityInformation ts_ML3_FACILITY_USSD_RETURN_ERROR( is this a general FACILITY_RETURN_ERORR template that can also be used for structured SS? Then the naming might be different. https://gerrit.osmocom.org/#/c/9368/1/library/USSD_Templates.ttcn at 62 PS1, Line 62: integer errcode := 71 // Unknown alphabet same here for the error code. It's sad that the ASN1 compiler apparently doesn't generate enums for that, so you have to repeat those :/ https://gerrit.osmocom.org/#/c/9368/1/library/USSD_Templates.ttcn at 67 PS1, Line 67: errcode := { local := 71 }, i think you want "local := errcode" here? -- To view, visit https://gerrit.osmocom.org/9368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de Gerrit-Change-Number: 9368 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Tue, 29 May 2018 19:40:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:40:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/BSC_ConnectionHandler.ttcn: add EST_TYPE_SS_ACT for SS/USSD In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9371 ) Change subject: msc/BSC_ConnectionHandler.ttcn: add EST_TYPE_SS_ACT for SS/USSD ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If439e7c082b435d7f668065c9f8e3bdfa941dcc5 Gerrit-Change-Number: 9371 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:40:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 19:41:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 19:41:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: Add templates related to Supplementaryt Services In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9366 ) Change subject: L3_Templates: Add templates related to Supplementaryt Services ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I919fa542a2e037b3fcf8cd5b0b9d7599b8c09070 Gerrit-Change-Number: 9366 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 19:41:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Tue May 29 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Tue, 29 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#51?= In-Reply-To: <168644816.227.1527547281131.JavaMail.jenkins@jenkins.osmocom.org> References: <168644816.227.1527547281131.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <646053405.244.1527633680813.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-29699/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-29699/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-29699/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-29699/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-29699/ libtool: install: (cd /tmp/am-dc-29699/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-29699/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-29699/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-29699/ libtool: install: chmod 644 /tmp/am-dc-29699/ libtool: install: ranlib /tmp/am-dc-29699/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-29699/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-29699/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-29699/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-29699/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-29699/ /bin/mkdir -p '/tmp/am-dc-29699/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-29699/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-29699/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-29699/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-29699/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-29699/ libtool: uninstall: rm -f /tmp/am-dc-29699/ /tmp/am-dc-29699/ /tmp/am-dc-29699/ /tmp/am-dc-29699/ /tmp/am-dc-29699/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-29699/ && rm -f html.tar ) ( cd '/tmp/am-dc-29699/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-29699/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From gerrit-no-reply at lists.osmocom.org Tue May 29 22:57:01 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 22:57:01 +0000 Subject: Change in libosmocore[master]: gsm0808: Add encoding functions for LCLS BSSMAP messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9378 to look at the new patch set (#3). Change subject: gsm0808: Add encoding functions for LCLS BSSMAP messages ...................................................................... gsm0808: Add encoding functions for LCLS BSSMAP messages Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 68 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/9378/3 -- To view, visit https://gerrit.osmocom.org/9378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f Gerrit-Change-Number: 9378 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:03:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:03:18 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9373 to look at the new patch set (#2). Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... gsm_08_08.h: Add enum for LCLS config, control and status Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/9373/2 -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:03:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:03:18 +0000 Subject: Change in libosmocore[master]: gsm0808: Add encoding functions for LCLS BSSMAP messages In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9378 to look at the new patch set (#4). Change subject: gsm0808: Add encoding functions for LCLS BSSMAP messages ...................................................................... gsm0808: Add encoding functions for LCLS BSSMAP messages Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 68 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/9378/4 -- To view, visit https://gerrit.osmocom.org/9378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f Gerrit-Change-Number: 9378 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:03:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:03:43 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9373 ) Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 23:03:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:03:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:03:50 +0000 Subject: Change in libosmocore[master]: gsm0808: Add encoding functions for LCLS BSSMAP messages In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9378 ) Change subject: gsm0808: Add encoding functions for LCLS BSSMAP messages ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f Gerrit-Change-Number: 9378 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 23:03:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:36:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:36:32 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9373 to look at the new patch set (#3). Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... gsm_08_08.h: Add enum for LCLS config, control and status Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/9373/3 -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:48:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:48:49 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9373 ) Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 29 May 2018 23:48:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:48:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:48:52 +0000 Subject: Change in libosmocore[master]: gsm_08_08.h: Add enum for LCLS config, control and status In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9373 ) Change subject: gsm_08_08.h: Add enum for LCLS config, control and status ...................................................................... gsm_08_08.h: Add enum for LCLS config, control and status Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 60b9681..db5f7fa 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -536,3 +536,31 @@ uint16_t id_list_lac[CELL_ID_LIST_LAC_MAXLEN]; unsigned int id_list_len; }; + +/* TS 48.008 3.2.2.116 */ +enum gsm0808_lcls_config { + GSM0808_LCLS_CFG_BOTH_WAY = 0x00, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL = 0x01, + GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL = 0x02, + GSM0808_LCLS_CFG_BOTH_WAY_AND_SEND_DL_BLOCK_LOCAL_DL = 0x03, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL = 0x04, + GSM0808_LCLS_CFG_BOTH_WAY_AND_BICAST_UL_SEND_DL_BLOCK_LOCAL_DL = 0x05, +}; + +/* TS 48.008 3.2.2.117 */ +enum gsm0808_lcls_control { + GSM0808_LCLS_CSC_CONNECT = 0x00, + GSM0808_LCLS_CSC_DO_NOT_CONNECT = 0x01, + GSM0808_LCLS_CSC_RELEASE_LCLS = 0x02, + GSM0808_LCLS_CSC_BICAST_UL_AT_HANDOVER = 0x03, + GSM0808_LCLS_CSC_BICAST_UL_AND_RECV_DL_AT_HANDOVER = 0x04, +}; + +/* TS 48.008 3.2.2.119 */ +enum gsm0808_lcls_status { + GSM0808_LCLS_STS_NOT_YET_LS = 0x00, + GSM0808_LCLS_STS_NOT_POSSIBLE_LS = 0x01, + GSM0808_LCLS_STS_NO_LONGER_LS = 0x02, + GSM0808_LCLS_STS_REQ_LCLS_NOT_SUPP = 0x03, + GSM0808_LCLS_STS_LOCALLY_SWITCHED = 0x04, +}; -- To view, visit https://gerrit.osmocom.org/9373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I775aba59942fb6f34fb31b71d2f0f2ac5c3ae831 Gerrit-Change-Number: 9373 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:48:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Tue, 29 May 2018 23:48:53 +0000 Subject: Change in libosmocore[master]: gsm0808: Add encoding functions for LCLS BSSMAP messages In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9378 ) Change subject: gsm0808: Add encoding functions for LCLS BSSMAP messages ...................................................................... gsm0808: Add encoding functions for LCLS BSSMAP messages Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f --- M include/osmocom/gsm/gsm0808.h M src/gsm/gsm0808.c M src/gsm/libosmogsm.map 3 files changed, 68 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 5c03400..8402957 100644 --- a/include/osmocom/gsm/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h @@ -80,6 +80,11 @@ const struct gsm0808_cell_id_list *cil, const uint8_t *chan_needed) OSMO_DEPRECATED("use gsm0808_create_paging2 instead"); +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, + enum gsm0808_lcls_control *control); +struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status); +struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req); + /*! 3GPP TS 48.008 ?3.2.2.5.8 Old BSS to New BSS information */ struct gsm0808_old_bss_to_new_bss_info { diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 5af53ee..347e985 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -282,6 +282,66 @@ return msg; } +/*! Create BSSMAP LCLS CONNECT CONTROL message (TS 48.008 3.2.1.91). + * \param[in] config LCLS Configuration + * \param[in] control LCLS Connection Status Control + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_conn_ctrl(enum gsm0808_lcls_config *config, + enum gsm0808_lcls_control *control) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS CONN CTRL"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL); + if (config) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *config); + if (control) + msgb_tv_put(msg, GSM0808_IE_LCLS_CONFIG, *control); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + +/*! Create BSSMAP LCLS CONNECT CONTROL ACK message (TS 48.008 3.2.1.92). + * \param[in] status LCLS BSS Status + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_conn_ctrl_ack(enum gsm0808_lcls_status status) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS CONN CTRL ACK"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_CONNECT_CTRL_ACK); + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + +/*! Create BSSMAP LCLS NOTIFICATION message (TS 48.008 3.2.1.93). + * \param[in] status LCLS BSS Status + * \param[in] break_req Include the LCLS BREAK REQ IE (true) or not (false) + * \returns callee-allocated msgb with BSSMAP LCLS NOTIFICATION */ +struct msgb *gsm0808_create_lcls_notification(enum gsm0808_lcls_status status, bool break_req) +{ + struct msgb *msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, + "bssmap: LCLS NOTIFICATION"); + if (!msg) + return NULL; + + msgb_v_put(msg, BSS_MAP_MSG_LCLS_NOTIFICATION); + msgb_tv_put(msg, GSM0808_IE_LCLS_BSS_STATUS, status); + if (break_req) + msgb_v_put(msg, GSM0808_IE_LCLS_BREAK_REQ); + msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg)); + + return msg; +} + + /*! Create BSSMAP Classmark Update message * \param[in] cm2 Classmark 2 * \param[in] cm2_len length (in octets) of \a cm2 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 3b9fbfd..c05b4ee 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -158,6 +158,9 @@ gsm0808_create_layer3; gsm0808_create_layer3_aoip; gsm0808_create_layer3_2; +gsm0808_create_lcls_conn_ctrl; +gsm0808_create_lcls_conn_ctrl_ack; +gsm0808_create_lcls_notification; gsm0808_create_reset; gsm0808_create_reset_ack; gsm0808_create_sapi_reject; -- To view, visit https://gerrit.osmocom.org/9378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib83143e467df068b7d462a8e51d94b9d961ce18f Gerrit-Change-Number: 9378 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:53:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 23:53:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: introduce Facility IE templates for SS/USSD In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9368 to look at the new patch set (#2). Change subject: library: introduce Facility IE templates for SS/USSD ...................................................................... library: introduce Facility IE templates for SS/USSD Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de --- A library/SS_Templates.ttcn 1 file changed, 202 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/9368/2 -- To view, visit https://gerrit.osmocom.org/9368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de Gerrit-Change-Number: 9368 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:53:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 23:53:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce USSD helper functions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9370 to look at the new patch set (#2). Change subject: msc: introduce USSD helper functions ...................................................................... msc: introduce USSD helper functions Change-Id: Ic528b968a9bc7c12e8395364e895400aa016c8f5 --- A msc/USSD_Helpers.ttcn M msc/gen_links.sh 2 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/9370/2 -- To view, visit https://gerrit.osmocom.org/9370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic528b968a9bc7c12e8395364e895400aa016c8f5 Gerrit-Change-Number: 9370 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue May 29 23:53:10 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Tue, 29 May 2018 23:53:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/USSD: add single *#100# request testcase In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9372 to look at the new patch set (#2). Change subject: msc/USSD: add single *#100# request testcase ...................................................................... msc/USSD: add single *#100# request testcase Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad --- M msc/MSC_Tests.ttcn M msc/expected-results.xml 2 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/9372/2 -- To view, visit https://gerrit.osmocom.org/9372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad Gerrit-Change-Number: 9372 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:15:05 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 09:15:05 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9379 Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... ortp: resynchronize rtp session on timestamp changes When libortp detects a timestamp jump, we resynchronize the session in order to restore proper rtp frame reception. However, we do not resynchronize on an SSRC change. An SSRC change usually indicates the change of an RTP stream source, which is a much more profound event than a timestamp change, so we should resynchronize the session on SSRC changes as well. Also, not resynchronizing the session on an SSRC change causes problems when the jitter buffer feature is used. In those cases it takes libortp a long time until it finally detects the timestamp jump and the session resyhcornization happens late. Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Related OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/9379/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 8ea05e4..8eecd9f 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -114,7 +114,8 @@ uint32_t ssrc = rtp_session_get_recv_ssrc(rs); LOGP(DLMIB, LOGL_INFO, - "osmo-ortp(%d): ssrc_changed to 0x%08x\n", port, ssrc); + "osmo-ortp(%d): ssrc_changed to 0x%08x, resyncing\n", port, ssrc); + rtp_session_resync(rs); } static void ortp_sig_cb_pt(RtpSession *rs, void *data) -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:15:06 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 09:15:06 +0000 Subject: Change in libosmo-abis[master]: ortp: detect ssrc changes immediately Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9380 Change subject: ortp: detect ssrc changes immediately ...................................................................... ortp: detect ssrc changes immediately libortp detects an ssrc jump using a packet count thresold. This threshold is set to 50 by default. This means that libortp has to see 50 rtp packets with the new SSRC before it accepts the new stream. In our application we want to detect the changed SSRC (Handover) as fast as possible. So we should change the threshold to zero. - use rtp_session_set_ssrc_changed_threshold() to set a thresold of 0 packets when osmo_rtp_socket_create() is called. Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Related: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/9380/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 8eecd9f..8c7f104 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -371,6 +371,8 @@ rtp_session_set_seq_number(rs->sess, random()); rs->tx_timestamp = random(); + /* Make sure ssrc changes are detected immediately */ + rtp_session_set_ssrc_changed_threshold(rs->sess, 0); return rs; } -- To view, visit https://gerrit.osmocom.org/9380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Gerrit-Change-Number: 9380 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:28:39 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 09:28:39 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9379/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/#/c/9379/1/src/trau/osmo_ortp.c at 118 PS1, Line 118: rtp_session_resync(rs); What about using rtp_session_reset here? -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 09:28:39 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:30:11 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 09:30:11 +0000 Subject: Change in libosmo-abis[master]: ortp: detect ssrc changes immediately In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9380 ) Change subject: ortp: detect ssrc changes immediately ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Gerrit-Change-Number: 9380 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 09:30:11 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:30:59 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 09:30:59 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9379/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/#/c/9379/1/src/trau/osmo_ortp.c at 118 PS1, Line 118: rtp_session_resync(rs); > What about using rtp_session_reset here? https://www.linphone.org/docs/ortp/rtpsession_8h.html#a87c96ff6a38bd0683165040af5ec1418 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 09:30:59 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:55:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 09:55:56 +0000 Subject: Change in openbsc[master]: bsc_nat.c: Return correct err code to avoid heap-user-after-free Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9381 Change subject: bsc_nat.c: Return correct err code to avoid heap-user-after-free ...................................................................... bsc_nat.c: Return correct err code to avoid heap-user-after-free When ipaccess_bsc_read_cb calls bsc_close_connection, the osmo_fd struct is freed, so we need to indicate to osmo_wqueue_bfd_cb that it should not continue using the fd pointer after we return. Fixes following AdressSanitizer report: <0015> openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c:1317 The connection to the BSC Nr: -1 was lost. Cleaning it ================================================================= ==27028==ERROR: AddressSanitizer: heap-use-after-free on address 0x6160000c521c at pc 0x7ffff606b056 bp 0x7fffffffe170 sp 0x7fffffffe168 READ of size 4 at 0x6160000c521c thread T0 #0 0x7ffff606b055 in osmo_wqueue_bfd_cb libosmocore/src/write_queue.c:65 #1 0x7ffff6055c3b in osmo_fd_disp_fds libosmocore/src/select.c:217 #2 0x7ffff6055ed5 in osmo_select_main libosmocore/src/select.c:257 #3 0x421c82 in main openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c:1713 #4 0x7ffff4803b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #5 0x406438 (/bin/osmo-bsc_nat+0x406438) Fixes: OS#3300 Change-Id: I120f646601bd4275b9088d0d73000ce04564bc6b --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 16 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/81/9381/1 diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 57b51a2..38a29be 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1308,20 +1308,18 @@ int ret; ret = ipa_msg_recv_buffered(bfd->fd, &msg, &bsc->pending_msg); - if (ret <= 0) { - if (ret == -EAGAIN) - return 0; - if (ret == 0) - LOGP(DNAT, LOGL_ERROR, - "The connection to the BSC Nr: %d was lost. Cleaning it\n", - bsc->cfg ? bsc->cfg->nr : -1); - else - LOGP(DNAT, LOGL_ERROR, - "Stream error on BSC Nr: %d. Failed to parse ip access message: %d (%s)\n", - bsc->cfg ? bsc->cfg->nr : -1, ret, strerror(-ret)); - - bsc_close_connection(bsc); - return -1; + if (ret == -EAGAIN) { + return 0; + } else if (ret == 0) { + LOGP(DNAT, LOGL_ERROR, + "The connection to the BSC Nr: %d was lost. Cleaning it\n", + bsc->cfg ? bsc->cfg->nr : -1); + goto close_fd; + } else if (ret < 0) { + LOGP(DNAT, LOGL_ERROR, + "Stream error on BSC Nr: %d. Failed to parse ip access message: %d (%s)\n", + bsc->cfg ? bsc->cfg->nr : -1, ret, strerror(-ret)); + goto close_fd; } @@ -1356,8 +1354,11 @@ /* FIXME: Currently no PONG is sent to the BSC */ /* FIXME: Currently no ID ACK is sent to the BSC */ forward_sccp_to_msc(bsc, msg); - return 0; + +close_fd: + bsc_close_connection(bsc); + return -EBADF; } static int ipaccess_listen_bsc_cb(struct osmo_fd *bfd, unsigned int what) -- To view, visit https://gerrit.osmocom.org/9381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I120f646601bd4275b9088d0d73000ce04564bc6b Gerrit-Change-Number: 9381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 09:58:53 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 09:58:53 +0000 Subject: Change in libosmo-abis[master]: ortp: make sure the ortp scheduler is started In-Reply-To: References: Message-ID: dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/9360 ) Change subject: ortp: make sure the ortp scheduler is started ...................................................................... ortp: make sure the ortp scheduler is started the function osmo_rtp_init() is initializing ortp at the start of the application. However, it does not start the scheduler of ortp, which leads into error log messages in some situatios. - make sure that ortp_scheduler_init() is called with osmo_rtp_init() Change-Id: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Related: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 8ea05e4..18a6123 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -290,6 +290,7 @@ ortp_set_log_handler(my_ortp_logfn); create_payload_types(); + ortp_scheduler_init(); } /*! \brief Set Osmocom RTP socket parameters -- To view, visit https://gerrit.osmocom.org/9360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Gerrit-Change-Number: 9360 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:28:21 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 10:28:21 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... Patch Set 1: I am not entirely sure. I have tried both, and both work fine. When I look in the code I can see that the reset functions resets a lot of flags and counters too. I am not sure if this data is still needed or not, but presumably you are right. I will change it for reset. -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 10:28:21 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:36:49 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 10:36:49 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9379 to look at the new patch set (#2). Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... ortp: resynchronize rtp session on timestamp changes When libortp detects a timestamp jump, we resynchronize the session in order to restore proper rtp frame reception. However, we do not resynchronize on an SSRC change. An SSRC change usually indicates the change of an RTP stream source, which is a much more profound event than a timestamp change, so we should resynchronize the session on SSRC changes as well. Also, not resynchronizing the session on an SSRC change causes problems when the jitter buffer feature is used. In those cases it takes libortp a long time until it finally detects the timestamp jump and the session resyhcornization happens late. Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Related OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/9379/2 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:46:43 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 10:46:43 +0000 Subject: Change in openbsc[master]: chan_alloc: Print bts nr on chan alloc failure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9382 Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... chan_alloc: Print bts nr on chan alloc failure Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/82/9382/1 diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 52a8259..31a7055 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -362,7 +362,8 @@ } else { struct challoc_signal_data sig; - LOGP(DRLL, LOGL_ERROR, "Failed to allocate %s channel\n", + LOGP(DRLL, LOGL_ERROR, "(bts=%d) Failed to allocate %s channel\n", + gsm_ts_and_pchan_name(bts->nr), gsm_lchant_name(type)); sig.bts = bts; -- To view, visit https://gerrit.osmocom.org/9382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 Gerrit-Change-Number: 9382 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:47:39 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 10:47:39 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9379 to look at the new patch set (#3). Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... ortp: resynchronize rtp session on timestamp changes When libortp detects a timestamp jump, we resynchronize the session in order to restore proper rtp frame reception. However, we do not resynchronize on an SSRC change. An SSRC change usually indicates the change of an RTP stream source, which is a much more profound event than a timestamp change, so we should even reset the session on SSRC changes. Also, not resynchronizing the session on an SSRC change causes problems when the jitter buffer feature is used. In those cases it takes libortp a long time until it finally detects the timestamp jump and the session resyhcornization happens late. - reset the ession on SSRC changes by calling rtp_session_reset() Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Related OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/9379/3 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:49:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 10:49:08 +0000 Subject: Change in openbsc[master]: chan_alloc: Print bts nr on chan alloc failure In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/9382 ) Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... chan_alloc: Print bts nr on chan alloc failure Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/82/9382/2 -- To view, visit https://gerrit.osmocom.org/9382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 Gerrit-Change-Number: 9382 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:51:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 10:51:46 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: Print bts nr on chan alloc failure Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9383 Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... chan_alloc: Print bts nr on chan alloc failure Also change format of related debug message to match similar format than gsm_ts_and_pchan_name(). Change-Id: Id4f875944c40fd862fc63feec82216c45d2e41c2 --- M src/libbsc/chan_alloc.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/9383/1 diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index d773382..4eccff0 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -338,7 +338,7 @@ struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; - LOGP(DRLL, LOGL_DEBUG, "bts-%d lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); + LOGP(DRLL, LOGL_DEBUG, "(bts=%d) lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); switch (type) { case GSM_LCHAN_SDCCH: @@ -488,8 +488,8 @@ } else { struct challoc_signal_data sig; - LOGP(DRLL, LOGL_ERROR, "Failed to allocate %s channel\n", - gsm_lchant_name(type)); + LOGP(DRLL, LOGL_ERROR, "(bts=%d) Failed to allocate %s channel\n", + bts->nr, gsm_lchant_name(type)); sig.bts = bts; sig.type = type; -- To view, visit https://gerrit.osmocom.org/9383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Id4f875944c40fd862fc63feec82216c45d2e41c2 Gerrit-Change-Number: 9383 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 10:53:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 10:53:08 +0000 Subject: Change in libosmo-abis[master]: ortp: resynchronize rtp session on timestamp changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: resynchronize rtp session on timestamp changes ...................................................................... Patch Set 3: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/9379/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9379/3//COMMIT_MSG at 7 PS3, Line 7: ortp: resynchronize rtp session on timestamp changes I guess should be "reset rtp session on SSRC changes" -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 30 May 2018 10:53:08 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:00:18 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 11:00:18 +0000 Subject: Change in openbsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9384 Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f --- M openbsc/src/libbsc/abis_rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/84/9384/1 diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index f05344a..3090bc7 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -1842,7 +1842,7 @@ /* Determine channel request cause code */ chreq_reason = get_reason_by_chreq(rqd_ref->ra, bts->network->neci); - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", msg->lchan->ts->trx->bts->nr, get_value_string(gsm_chreq_descs, chreq_reason), rqd_ref->ra, bts->network->neci, chreq_reason); -- To view, visit https://gerrit.osmocom.org/9384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f Gerrit-Change-Number: 9384 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:01:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 11:01:56 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: Fix whitespace Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9385 Change subject: abis_rsl.c: Fix whitespace ...................................................................... abis_rsl.c: Fix whitespace Change-Id: I67659275beda1b6a89bdf11eb0231438b0c8b912 --- M src/libbsc/abis_rsl.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/9385/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index ffbf630..2a67943 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -135,7 +135,7 @@ } if ((msg_type & 0xe0) == 0x20) return ABIS_RSL_MDISC_DED_CHAN; - + return ABIS_RSL_MDISC_LOC; } @@ -316,7 +316,7 @@ lchan->bs_power = db/2; if (fpc) lchan->bs_power |= 0x10; - + dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_BS_POWER_CONTROL); dh->chan_nr = chan_nr; @@ -345,7 +345,7 @@ if (fpc) lchan->ms_power |= 0x20; - + dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_MS_POWER_CONTROL); dh->chan_nr = chan_nr; @@ -994,7 +994,7 @@ /* (a) */ if (ts->dyn.pchan_is != ts->dyn.pchan_want) return dyn_ts_switchover_continue(ts); - + /* (b) */ if (dyn_ts_should_switch_to_pdch(ts)) return dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); @@ -1958,7 +1958,7 @@ arfcn = lchan->ts->trx->arfcn; subch = lchan->nr; - + lchan->encr.alg_id = RSL_ENC_ALG_A5(0); /* no encryption */ lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); lchan->bs_power = 0; /* 0dB reduction, output power = Pn */ @@ -2188,7 +2188,7 @@ "Abis RSL rx RLL: "); ts_name = gsm_lchan_name(msg->lchan); DEBUGP(DRLL, "%s SAPI=%u ", ts_name, sapi); - + switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: DEBUGPC(DRLL, "DATA INDICATION\n"); @@ -2614,7 +2614,7 @@ msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx IPACC: "); ts_name = gsm_lchan_name(msg->lchan); - + switch (rllh->c.msg_type) { case RSL_MT_IPAC_CRCX_ACK: DEBUGP(DRSL, "%s IPAC_CRCX_ACK ", ts_name); @@ -2762,7 +2762,7 @@ * wouldn't remember to use lchan[1] across e.g. a PDCH deact anyway) */ lchan = ts->lchan; - + /* * For TCH/x, the lchan->type has been set in lchan_alloc(), but it may * have been lost during channel release due to dynamic switchover. -- To view, visit https://gerrit.osmocom.org/9385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I67659275beda1b6a89bdf11eb0231438b0c8b912 Gerrit-Change-Number: 9385 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:01:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 11:01:56 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9386 Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f --- M src/libbsc/abis_rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/9386/1 diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 2a67943..4d8a635 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -1881,7 +1881,7 @@ /* Determine channel request cause code */ chreq_reason = get_reason_by_chreq(rqd_ref->ra, bts->network->neci); - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", msg->lchan->ts->trx->bts->nr, get_value_string(gsm_chreq_descs, chreq_reason), rqd_ref->ra, bts->network->neci, chreq_reason); -- To view, visit https://gerrit.osmocom.org/9386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f Gerrit-Change-Number: 9386 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:08:10 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 11:08:10 +0000 Subject: Change in openbsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9384 to look at the new patch set (#2). Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f --- M openbsc/src/libbsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/84/9384/2 -- To view, visit https://gerrit.osmocom.org/9384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f Gerrit-Change-Number: 9384 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:08:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 11:08:23 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Pau Espin Pedrol has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/9386 ) Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f --- M src/libbsc/abis_rsl.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/9386/2 -- To view, visit https://gerrit.osmocom.org/9386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f Gerrit-Change-Number: 9386 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-CC: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 11:22:13 2018 From: gerrit-no-reply at lists.osmocom.org (Bernhard M.) Date: Wed, 30 May 2018 11:22:13 +0000 Subject: Change in osmo-iuh[master]: asn1tostruct: allow to override build date Message-ID: Bernhard M. has uploaded this change for review. ( https://gerrit.osmocom.org/9387 Change subject: asn1tostruct: allow to override build date ...................................................................... asn1tostruct: allow to override build date in order to make builds reproducible. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. Also do not record build user name to not have it vary. Change-Id: I5cfa465cc82f009f28dd7f12ced0e72a05fda842 --- M asn1/utils/asn1tostruct.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/9387/1 diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 0bba9dd..3c33980 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -4,6 +4,7 @@ import datetime import getopt import getpass +import time version = "0.5osmo1" @@ -33,11 +34,11 @@ print string def outputHeaderToFile(f, filename): - now = datetime.datetime.now() + now = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) f.write("/*******************************************************************************\n") f.write(" * This file had been created by asn1tostruct.py script v%s\n" % (version)) f.write(" * Please do not modify this file but regenerate it via script.\n") - f.write(" * Created on: %s by %s\n * from %s\n" % (str(now), getpass.getuser(), filenames)) + f.write(" * Created on: %s\n * from %s\n" % (str(now), filenames)) f.write(" ******************************************************************************/\n") def lowerFirstCamelWord(word): -- To view, visit https://gerrit.osmocom.org/9387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I5cfa465cc82f009f28dd7f12ced0e72a05fda842 Gerrit-Change-Number: 9387 Gerrit-PatchSet: 1 Gerrit-Owner: Bernhard M. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 12:29:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 12:29:36 +0000 Subject: Change in libosmo-abis[master]: ortp: reset rtp session on SSRC changes In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9379 to look at the new patch set (#4). Change subject: ortp: reset rtp session on SSRC changes ...................................................................... ortp: reset rtp session on SSRC changes When libortp detects a timestamp jump, we resynchronize the session in order to restore proper rtp frame reception. However, we do not resynchronize on an SSRC change. An SSRC change usually indicates the change of an RTP stream source, which is a much more profound event than a timestamp change, so we should even reset the session on SSRC changes. Also, not resynchronizing the session on an SSRC change causes problems when the jitter buffer feature is used. In those cases it takes libortp a long time until it finally detects the timestamp jump and the session resyhcornization happens late. - reset the ession on SSRC changes by calling rtp_session_reset() Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Related OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/9379/4 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 12:32:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 12:32:36 +0000 Subject: Change in libosmo-abis[master]: ortp: detect ssrc changes immediately In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9380 to look at the new patch set (#3). Change subject: ortp: detect ssrc changes immediately ...................................................................... ortp: detect ssrc changes immediately libortp detects an ssrc jump using a packet count thresold. This threshold is set to 50 by default. This means that libortp has to see 50 rtp packets with the new SSRC before it accepts the new stream. In our application we want to detect the changed SSRC (Handover) as fast as possible. So we should change the threshold to zero. - use rtp_session_set_ssrc_changed_threshold() to set a thresold of 0 packets when osmo_rtp_socket_create() is called. Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Related: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/80/9380/3 -- To view, visit https://gerrit.osmocom.org/9380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Gerrit-Change-Number: 9380 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 12:40:40 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 12:40:40 +0000 Subject: Change in libosmo-abis[master]: ortp: reset rtp session on SSRC changes In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: reset rtp session on SSRC changes ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 30 May 2018 12:40:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 12:43:32 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 12:43:32 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9388 Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... ortp: enable scheduled mode on rtp socket creation we use some functionalities of libortp that require to use rtp sessions with the scheduled mode enabled. Since we do not enable the scheduled mode, yet, we receive error messages in the log that complain about a non enabled scheduled mode. - Turn on scheduled mode using rtp_session_set_scheduling_mode() when osmo_rtp_socket_create() is called. Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Closes: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/88/9388/1 diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 18a6123..90a4b16 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -350,6 +350,7 @@ rtp_session_set_data(rs->sess, rs); rtp_session_set_profile(rs->sess, osmo_pt_profile); rtp_session_set_jitter_compensation(rs->sess, 100); + rtp_session_set_scheduling_mode(rs->sess, TRUE); rtp_session_signal_connect(rs->sess, "ssrc_changed", (RtpCallback) ortp_sig_cb_ssrc, @@ -371,7 +372,6 @@ rtp_session_set_seq_number(rs->sess, random()); rs->tx_timestamp = random(); - return rs; } -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 12:47:29 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 12:47:29 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 1: What's the consequence of enabling scheduling_mode? I think it should be explained in this commit description. Extra topic: I saw you are starting to use a lot of APIs from ortp we were not using so far. It would be desirable to see when were this APIs added and make sure we require the minimum version in configure.ac. -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 12:47:29 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 13:08:28 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 13:08:28 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 1: > What's the consequence of enabling scheduling_mode? I think it > should be explained in this commit description. > > Extra topic: I saw you are starting to use a lot of APIs from ortp > we were not using so far. It would be desirable to see when were > this APIs added and make sure we require the minimum version in > configure.ac. I have done the debugging with libortp 0.22.0, this is also the minimum we require at the moment, so I think we should be safe with the stuff I have added. -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 13:08:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 13:14:24 2018 From: gerrit-no-reply at lists.osmocom.org (Neels Hofmeyr) Date: Wed, 30 May 2018 13:14:24 +0000 Subject: Change in libosmocore[master]: add osmo_fsm_inst_state_chg_keep_timer() Message-ID: Neels Hofmeyr has uploaded this change for review. ( https://gerrit.osmocom.org/9389 Change subject: add osmo_fsm_inst_state_chg_keep_timer() ...................................................................... add osmo_fsm_inst_state_chg_keep_timer() Change-Id: I3c0e53b846b2208bd201ace99777f2286ea39ae8 --- M include/osmocom/core/fsm.h M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 4 files changed, 188 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/89/9389/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 174396a..67e00ad 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -182,6 +182,21 @@ unsigned long timeout_secs, int T, const char *file, int line); +/*! perform a state change while keeping the current timer running. + * + * This is useful to keep a timeout across several states (without having to round the + * remaining time to seconds). + * + * This is a macro that calls _osmo_fsm_inst_state_chg_keep_timer() with the given + * parameters as well as the caller's source file and line number for logging + * purposes. See there for documentation. + */ +#define osmo_fsm_inst_state_chg_keep_timer(fi, new_state) \ + _osmo_fsm_inst_state_chg_keep_timer(fi, new_state, \ + __BASE_FILE__, __LINE__) +int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, + const char *file, int line); + /*! dispatch an event to an osmocom finite state machine instance * * This is a macro that calls _osmo_fsm_inst_dispatch() with the given diff --git a/src/fsm.c b/src/fsm.c index 0370f65..b5af2e7 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -429,15 +429,56 @@ return fsm->states[state].name; } +static int state_chg(struct osmo_fsm_inst *fi, uint32_t new_state, + bool keep_timer, unsigned long timeout_secs, int T, + const char *file, int line) +{ + struct osmo_fsm *fsm = fi->fsm; + uint32_t old_state = fi->state; + const struct osmo_fsm_state *st = &fsm->states[fi->state]; + + /* validate if new_state is a valid state */ + if (!(st->out_state_mask & (1 << new_state))) { + LOGPFSMLSRC(fi, LOGL_ERROR, file, line, + "transition to state %s not permitted!\n", + osmo_fsm_state_name(fsm, new_state)); + return -EPERM; + } + + if (!keep_timer) { + /* delete the old timer */ + osmo_timer_del(&fi->timer); + } + + if (st->onleave) + st->onleave(fi, new_state); + + LOGPFSMSRC(fi, file, line, "state_chg to %s\n", + osmo_fsm_state_name(fsm, new_state)); + fi->state = new_state; + st = &fsm->states[new_state]; + + if (!keep_timer && timeout_secs) { + fi->T = T; + osmo_timer_schedule(&fi->timer, timeout_secs, 0); + } + + /* Call 'onenter' last, user might terminate FSM from there */ + if (st->onenter) + st->onenter(fi, old_state); + + return 0; +} + /*! perform a state change of the given FSM instance * * Best invoke via the osmo_fsm_inst_state_chg() macro which logs the source * file where the state change was effected. Alternatively, you may pass \a * file as NULL to use the normal file/line indication instead. * - * All changes to the FSM instance state must be made via this + * All changes to the FSM instance state must be made via an osmo_fsm_inst_state_chg_* * function. It verifies that the existing state actually permits a - * transiiton to new_state. + * transition to new_state. * * timeout_secs and T are optional parameters, and only have any effect * if timeout_secs is not 0. If the timeout function is used, then the @@ -457,39 +498,32 @@ unsigned long timeout_secs, int T, const char *file, int line) { - struct osmo_fsm *fsm = fi->fsm; - uint32_t old_state = fi->state; - const struct osmo_fsm_state *st = &fsm->states[fi->state]; + return state_chg(fi, new_state, false, timeout_secs, T, file, line); +} - /* validate if new_state is a valid state */ - if (!(st->out_state_mask & (1 << new_state))) { - LOGPFSMLSRC(fi, LOGL_ERROR, file, line, - "transition to state %s not permitted!\n", - osmo_fsm_state_name(fsm, new_state)); - return -EPERM; - } - - /* delete the old timer */ - osmo_timer_del(&fi->timer); - - if (st->onleave) - st->onleave(fi, new_state); - - LOGPFSMSRC(fi, file, line, "state_chg to %s\n", - osmo_fsm_state_name(fsm, new_state)); - fi->state = new_state; - st = &fsm->states[new_state]; - - if (timeout_secs) { - fi->T = T; - osmo_timer_schedule(&fi->timer, timeout_secs, 0); - } - - /* Call 'onenter' last, user might terminate FSM from there */ - if (st->onenter) - st->onenter(fi, old_state); - - return 0; +/*! perform a state change while keeping the current timer running. + * + * This is useful to keep a timeout across several states (without having to round the + * remaining time to seconds). + * + * Best invoke via the osmo_fsm_inst_state_chg_keep_timer() macro which logs the source + * file where the state change was effected. Alternatively, you may pass \a + * file as NULL to use the normal file/line indication instead. + * + * All changes to the FSM instance state must be made via an osmo_fsm_inst_state_chg_* + * function. It verifies that the existing state actually permits a + * transition to new_state. + * + * \param[in] fi FSM instance whose state is to change + * \param[in] new_state The new state into which we should change + * \param[in] file Calling source file (from osmo_fsm_inst_state_chg macro) + * \param[in] line Calling source line (from osmo_fsm_inst_state_chg macro) + * \returns 0 on success; negative on error + */ +int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, + const char *file, int line) +{ + return state_chg(fi, new_state, true, 0, 0, file, line); } /*! dispatch an event to an osmocom finite state machine instance diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index e34164c..34a8399 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -266,6 +266,89 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); } +const struct timeval fake_time_start_time = { 123, 456 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + fprintf(stderr, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} + +static int timeout_fired = 0; +static int timer_cb(struct osmo_fsm_inst *fi) +{ + timeout_fired = fi->T; + return 0; +} + +static void test_state_chg_keep_timer() +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = timer_cb; + + /* Test that no timer remains no timer */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 0, 0); + timeout_fired = -1; + + osmo_fsm_inst_state_chg_keep_timer(fi, ST_TWO); + + OSMO_ASSERT(timeout_fired == -1); + OSMO_ASSERT(fi->T == 0); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + /* Test that a set time continues with exact precision */ + fake_time_start(); + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 10, 10); + + timeout_fired = -1; + + fake_time_passes(2, 342); + osmo_fsm_inst_state_chg_keep_timer(fi, ST_TWO); + + fake_time_passes(0, 0); + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(7, 1000000 - 342 - 1); + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(0, 1); + OSMO_ASSERT(timeout_fired == 10); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + static const struct log_info_cat default_categories[] = { [DMAIN] = { .name = "DMAIN", @@ -306,6 +389,7 @@ osmo_fsm_inst_free(finst); test_id_api(); + test_state_chg_keep_timer(); osmo_fsm_unregister(&fsm); exit(0); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 3237def..85606e2 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -80,4 +80,24 @@ Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST) Test_FSM(arbitrary_id){NULL}: Freeing instance Test_FSM(arbitrary_id){NULL}: Deallocated - \ No newline at end of file + +--- test_state_chg_keep_timer() +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Total time passed: 0.000000 s +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Total time passed: 2.000342 s +Test_FSM{ONE}: state_chg to TWO +Total time passed: 2.000342 s +Total time passed: 9.999999 s +Total time passed: 10.000000 s +Test_FSM{TWO}: Timeout of T10 +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_keep_timer() done -- To view, visit https://gerrit.osmocom.org/9389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I3c0e53b846b2208bd201ace99777f2286ea39ae8 Gerrit-Change-Number: 9389 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:07:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:07:31 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: remove obsolete "dest" command Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9390 Change subject: osmo-bsc.cfg: remove obsolete "dest" command ...................................................................... osmo-bsc.cfg: remove obsolete "dest" command Change-Id: I9c81af2e5ff1149a9fb0cb161e907eddf2270648 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/9390/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 9d5a9c3..f6eb9e7 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -347,7 +347,6 @@ no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text - dest 192.168.100.11 6666 0 type normal allow-emergency allow amr-config 12_2k forbidden -- To view, visit https://gerrit.osmocom.org/9390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I9c81af2e5ff1149a9fb0cb161e907eddf2270648 Gerrit-Change-Number: 9390 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:07:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:07:31 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9391 Change subject: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh ...................................................................... ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh The existing dest config + jenkins.sh test 3GPP AoIP operation, while the new set of configs + jenkins-sccplite.sh are testing IPA/SCCPlite operation of osmo-bsc. Change-Id: Ief0799a8f7d378dc3831e7988c9175166c82eace --- A ttcn3-bsc-test/jenkins-sccplite.sh A ttcn3-bsc-test/sccplite/BSC_Tests.cfg A ttcn3-bsc-test/sccplite/osmo-bsc.cfg 3 files changed, 445 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/9391/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh new file mode 100755 index 0000000..2bf29f6 --- /dev/null +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +. ../jenkins-common.sh + +mkdir $VOL_BASE_DIR/bsc-tester +cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ + +mkdir $VOL_BASE_DIR/bsc +cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ + +network_create 172.18.11.0/24 + +echo Starting container with BSC +docker run --rm \ + --network $NET_NAME --ip 172.18.11.20 \ + -v $VOL_BASE_DIR/bsc:/data \ + --name ${BUILD_TAG}-bsc -d \ + $REPO_USER/osmo-bsc-master + +for i in `seq 0 2`; do + echo Starting container with OML for BTS$i + docker run --rm \ + --network $NET_NAME --ip 172.18.11.10$i \ + --name ${BUILD_TAG}-bts$i -d \ + $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1 +done + +echo Starting container with BSC testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.11.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/bsc-tester:/data \ + --name ${BUILD_TAG}-ttcn3-bsc-test \ + $REPO_USER/ttcn3-bsc-test + +echo Stopping containers +for i in `seq 0 2`; do + docker container kill ${BUILD_TAG}-bts$i +done +docker container kill ${BUILD_TAG}-bsc + +network_remove +collect_logs diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg new file mode 100644 index 0000000..a862bea --- /dev/null +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -0,0 +1,29 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bsc/BSC_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "BSC_Tests" + +[TESTPORT_PARAMETERS] +*.BSCVTY.CTRL_HOSTNAME := "172.18.2.20" + +[MODULE_PARAMETERS] +BSC_Tests.mp_bsc_ip := "172.18.2.20"; +BSC_Tests.mp_test_ip := "172.18.2.203"; +BSC_Tests.mp_bssap_cfg := { + transport := BSSAP_TRANSPORT_SCCPlite_SERVER, + sccp_service_type := "mtp3_itu", + sctp_addr := { 5000, "172.18.11.203", -1, "" }, + own_pc := 185, + own_ssn := 254, + peer_pc := 187, + peer_ssn := 254, + sio := '83'O, + rctx := 0 +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +BSC_Tests.control diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg new file mode 100644 index 0000000..688943f --- /dev/null +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -0,0 +1,373 @@ +! +! OsmoBSC (1.0.1.122-630df) configuration saved from vty +!! +password foo +! +log file /data/osmo-bsc.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 5000 0 ipa + remote-ip 172.18.2.200 + as as-clnt-msc-0 ipa + asp asp-clnt-msc-0 + routing-key 0 0.23.3 + point-code overried dpc 0.23.1 +network + network country code 1 + mobile network code 1 + encryption a5 0 1 3 + neci 1 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + dyn_ts_allow_tch_f 1 + periodic location update 30 + timer t3113 10 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 10 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1234 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 2 + dtx uplink force + dtx downlink + base_station_id_code 11 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1235 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1235 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1235 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1235 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 2 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 12 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1236 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1236 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1236 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1236 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + ip.access rtp-base 4000 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden + codec-list fr1 fr2 fr3 hr1 hr3 + mgw remote-ip 172.18.2.203 + asp-protocol ipa +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list +ctrl + bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/9391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ief0799a8f7d378dc3831e7988c9175166c82eace Gerrit-Change-Number: 9391 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:07:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:07:32 +0000 Subject: Change in docker-playground[master]: redmine: Migrate from 3.2 to 3.4 Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9392 Change subject: redmine: Migrate from 3.2 to 3.4 ...................................................................... redmine: Migrate from 3.2 to 3.4 Change-Id: I8bfd387c71477c4dfdea2eb8520415ce129a3b32 --- M redmine/Dockerfile D redmine/redmine-image-content-disposition.diff D redmine/redmine-issue-2047-svg-image-support.diff D redmine/redmine-openid-hmac-digest.diff 4 files changed, 2 insertions(+), 144 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/9392/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 1d8362d..25f6308 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,17 +1,9 @@ -FROM redmine:3.2 +FROM redmine:3.4 RUN apt-get update && \ apt-get install -y --no-install-recommends \ graphviz \ + imagemagick \ mscgen \ patch && \ apt-get clean - -COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff -RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff - -COPY redmine-openid-hmac-digest.diff /tmp/ -RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff - -COPY redmine-image-content-disposition.diff /tmp/ -RUN patch -p1 < /tmp/redmine-image-content-disposition.diff diff --git a/redmine/redmine-image-content-disposition.diff b/redmine/redmine-image-content-disposition.diff deleted file mode 100644 index 50d83db..0000000 --- a/redmine/redmine-image-content-disposition.diff +++ /dev/null @@ -1,64 +0,0 @@ -From 6c94d485cb3e23559da8f0356a1052a620d7a2c2 Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Mon, 14 May 2018 23:16:51 +0200 -Subject: [PATCH] chagnge content-disposition of pdf/image/text/patch to - 'inline' - -Related: https://osmocom.org/issues/3264 ---- - app/controllers/attachments_controller.rb | 9 ++++++++- - app/models/attachment.rb | 8 ++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb -index c2b5fa9c8..f2a57c31d 100644 ---- a/app/controllers/attachments_controller.rb -+++ b/app/controllers/attachments_controller.rb -@@ -57,7 +57,7 @@ class AttachmentsController < ApplicationController - # images are sent inline - send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), - :type => detect_content_type(@attachment), -- :disposition => 'attachment' -+ :disposition => disposition(@attachment) - end - end - -@@ -188,4 +188,12 @@ class AttachmentsController < ApplicationController - end - content_type.to_s - end -+ -+ def disposition(attachment) -+ if attachment.is_pdf? || attachment.is_image? || attachment.is_diff? || attachment.is_text? -+ 'inline' -+ else -+ 'attachment' -+ end -+ end - end -diff --git a/app/models/attachment.rb b/app/models/attachment.rb -index 3d16f57cc..a2520b0d5 100644 ---- a/app/models/attachment.rb -+++ b/app/models/attachment.rb -@@ -236,10 +236,18 @@ class Attachment < ActiveRecord::Base - Redmine::MimeType.is_type?('text', filename) - end - -+ def is_image? -+ Redmine::MimeType.is_type?('image', filename) -+ end -+ - def is_diff? - self.filename =~ /\.(patch|diff)$/i - end - -+ def is_pdf? -+ Redmine::MimeType.of(filename) == "application/pdf" -+ end -+ - # Returns true if the file is readable - def readable? - File.readable?(diskfile) --- -2.17.0 - diff --git a/redmine/redmine-issue-2047-svg-image-support.diff b/redmine/redmine-issue-2047-svg-image-support.diff deleted file mode 100644 index 23fc1e2..0000000 --- a/redmine/redmine-issue-2047-svg-image-support.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru app.orig/helpers/application_helper.rb app/helpers/application_helper.rb ---- app.orig/helpers/application_helper.rb 2018-01-08 19:37:37.000000000 +0000 -+++ app/helpers/application_helper.rb 2018-05-14 08:15:11.558390732 +0000 -@@ -637,7 +637,7 @@ - attachments = options[:attachments] || [] - attachments += obj.attachments if obj.respond_to?(:attachments) - if attachments.present? -- text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m| -+ text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png|svg))"(\s+alt="([^"]*)")?/i) do |m| - filename, ext, alt, alttext = $1.downcase, $2, $3, $4 - # search for the picture in attachments - if found = Attachment.latest_attach(attachments, CGI.unescape(filename)) -diff -ru app.orig/models/attachment.rb app/models/attachment.rb ---- app.orig/models/attachment.rb 2018-01-08 19:37:37.000000000 +0000 -+++ app/models/attachment.rb 2018-05-14 08:14:49.542526978 +0000 -@@ -193,7 +193,7 @@ - end - - def image? -- !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i) -+ !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png|svg)$/i) - end - - def thumbnailable? diff --git a/redmine/redmine-openid-hmac-digest.diff b/redmine/redmine-openid-hmac-digest.diff deleted file mode 100644 index e5b22dc..0000000 --- a/redmine/redmine-openid-hmac-digest.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nurd lib/openid/cryptutil.rb -/usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb ---- lib/openid/cryptutil.rb 1970-01-01 00:00:00.000000000 +0000 -+++ /usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2017-07-17 -18:25:45.146746571 +0000 -@@ -2,7 +2,7 @@ - require "digest/sha1" - require "digest/sha2" - begin -- require "digest/hmac" -+ require "openssl" - rescue LoadError - begin - # Try loading the ruby-hmac files if they exist -@@ -33,27 +33,19 @@ - end - - def CryptUtil.sha1(text) -- return Digest::SHA1.digest(text) -+ return OpenSSL::Digest.new('sha1').digest(text) - end - - def CryptUtil.hmac_sha1(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA1).update(text).digest -- else -- return HMAC::SHA1.digest(key, text) -- end -+ return OpenSSL::HMAC.digest('sha1', key, text) - end - - def CryptUtil.sha256(text) -- return Digest::SHA256.digest(text) -+ return OpenSSL::Digest.new('sha256').digest(text) - end - - def CryptUtil.hmac_sha256(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA256).update(text).digest -- else -- return HMAC::SHA256.digest(key, text) -- end -+ return OpenSSL::HMAC.digest('sha256', key, text) - end - - # Generate a random string of the given length, composed of the -- To view, visit https://gerrit.osmocom.org/9392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I8bfd387c71477c4dfdea2eb8520415ce129a3b32 Gerrit-Change-Number: 9392 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:10 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:10 +0000 Subject: Change in docker-playground[master]: redmine: Migrate from 3.2 to 3.4 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9392 ) Change subject: redmine: Migrate from 3.2 to 3.4 ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8bfd387c71477c4dfdea2eb8520415ce129a3b32 Gerrit-Change-Number: 9392 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 30 May 2018 14:28:10 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:19 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:19 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9391 ) Change subject: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ief0799a8f7d378dc3831e7988c9175166c82eace Gerrit-Change-Number: 9391 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 30 May 2018 14:28:19 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:23 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: remove obsolete "dest" command In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9390 ) Change subject: osmo-bsc.cfg: remove obsolete "dest" command ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I9c81af2e5ff1149a9fb0cb161e907eddf2270648 Gerrit-Change-Number: 9390 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Wed, 30 May 2018 14:28:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:25 +0000 Subject: Change in docker-playground[master]: osmo-bsc.cfg: remove obsolete "dest" command In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9390 ) Change subject: osmo-bsc.cfg: remove obsolete "dest" command ...................................................................... osmo-bsc.cfg: remove obsolete "dest" command Change-Id: I9c81af2e5ff1149a9fb0cb161e907eddf2270648 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 29d05eb..81afbb4 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -347,7 +347,6 @@ no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text - dest 192.168.100.11 6666 0 type normal allow-emergency allow amr-config 12_2k forbidden -- To view, visit https://gerrit.osmocom.org/9390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9c81af2e5ff1149a9fb0cb161e907eddf2270648 Gerrit-Change-Number: 9390 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:25 +0000 Subject: Change in docker-playground[master]: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9391 ) Change subject: ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh ...................................................................... ttcn3-bsc-test: Add SCCPlite configs + jenkins-sccplite.sh The existing dest config + jenkins.sh test 3GPP AoIP operation, while the new set of configs + jenkins-sccplite.sh are testing IPA/SCCPlite operation of osmo-bsc. Change-Id: Ief0799a8f7d378dc3831e7988c9175166c82eace --- A ttcn3-bsc-test/jenkins-sccplite.sh A ttcn3-bsc-test/sccplite/BSC_Tests.cfg A ttcn3-bsc-test/sccplite/osmo-bsc.cfg 3 files changed, 445 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh new file mode 100755 index 0000000..2bf29f6 --- /dev/null +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +. ../jenkins-common.sh + +mkdir $VOL_BASE_DIR/bsc-tester +cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ + +mkdir $VOL_BASE_DIR/bsc +cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ + +network_create 172.18.11.0/24 + +echo Starting container with BSC +docker run --rm \ + --network $NET_NAME --ip 172.18.11.20 \ + -v $VOL_BASE_DIR/bsc:/data \ + --name ${BUILD_TAG}-bsc -d \ + $REPO_USER/osmo-bsc-master + +for i in `seq 0 2`; do + echo Starting container with OML for BTS$i + docker run --rm \ + --network $NET_NAME --ip 172.18.11.10$i \ + --name ${BUILD_TAG}-bts$i -d \ + $REPO_USER/osmo-bts-master /usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.11.20 $((i + 1234)) 1 +done + +echo Starting container with BSC testsuite +docker run --rm \ + --network $NET_NAME --ip 172.18.11.203 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/bsc-tester:/data \ + --name ${BUILD_TAG}-ttcn3-bsc-test \ + $REPO_USER/ttcn3-bsc-test + +echo Stopping containers +for i in `seq 0 2`; do + docker container kill ${BUILD_TAG}-bts$i +done +docker container kill ${BUILD_TAG}-bsc + +network_remove +collect_logs diff --git a/ttcn3-bsc-test/sccplite/BSC_Tests.cfg b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg new file mode 100644 index 0000000..a862bea --- /dev/null +++ b/ttcn3-bsc-test/sccplite/BSC_Tests.cfg @@ -0,0 +1,29 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/bsc/BSC_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "BSC_Tests" + +[TESTPORT_PARAMETERS] +*.BSCVTY.CTRL_HOSTNAME := "172.18.2.20" + +[MODULE_PARAMETERS] +BSC_Tests.mp_bsc_ip := "172.18.2.20"; +BSC_Tests.mp_test_ip := "172.18.2.203"; +BSC_Tests.mp_bssap_cfg := { + transport := BSSAP_TRANSPORT_SCCPlite_SERVER, + sccp_service_type := "mtp3_itu", + sctp_addr := { 5000, "172.18.11.203", -1, "" }, + own_pc := 185, + own_ssn := 254, + peer_pc := 187, + peer_ssn := 254, + sio := '83'O, + rctx := 0 +}; + +[MAIN_CONTROLLER] + +[EXECUTE] +BSC_Tests.control diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg new file mode 100644 index 0000000..688943f --- /dev/null +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -0,0 +1,373 @@ +! +! OsmoBSC (1.0.1.122-630df) configuration saved from vty +!! +password foo +! +log file /data/osmo-bsc.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging level all everything + logging level rll notice + logging level cc notice + logging level mm notice + logging level rr notice + logging level rsl notice + logging level nm info + logging level pag notice + logging level meas notice + logging level msc notice + logging level mgcp notice + logging level ho notice + logging level ref notice + logging level nat notice + logging level ctrl notice + logging level filter debug + logging level pcu debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +e1_input + e1_line 0 driver ipa + e1_line 0 port 0 + no e1_line 0 keepalive +cs7 instance 0 + point-code 0.23.3 + asp asp-clnt-msc-0 5000 0 ipa + remote-ip 172.18.2.200 + as as-clnt-msc-0 ipa + asp asp-clnt-msc-0 + routing-key 0 0.23.3 + point-code overried dpc 0.23.1 +network + network country code 1 + mobile network code 1 + encryption a5 0 1 3 + neci 1 + paging any use tch 0 + handover 0 + handover window rxlev averaging 10 + handover window rxqual averaging 1 + handover window rxlev neighbor averaging 10 + handover power budget interval 6 + handover power budget hysteresis 3 + handover maximum distance 9999 + dyn_ts_allow_tch_f 1 + periodic location update 30 + timer t3113 10 + bts 0 + type sysmobts + band DCS1800 + cell_identity 0 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 10 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1234 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1234 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1234 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1234 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 1 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 2 + dtx uplink force + dtx downlink + base_station_id_code 11 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1235 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1235 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1235 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1235 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 + bts 2 + type sysmobts + band DCS1800 + cell_identity 1 + location_area_code 1 + dtx uplink force + dtx downlink + base_station_id_code 12 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-descrption attach 1 + channel-descrption bs-pa-mfrms 5 + channel-descrption bs-ag-blks-res 1 + early-classmark-sending forbidden + ip.access unit_id 1236 0 + oml ip.access stream_id 255 line 0 + neighbor-list mode manual-si5 + neighbor-list add arfcn 100 + neighbor-list add arfcn 200 + si5 neighbor-list add arfcn 10 + si5 neighbor-list add arfcn 20 + codec-support fr hr efr amr + gprs mode gprs + gprs 11bit_rach_support_for_egprs 0 + gprs routing area 0 + gprs network-control-order nc0 + gprs cell bvci 1236 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 1236 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 1236 + gprs nsvc 0 local udp port 23000 + gprs nsvc 0 remote udp port 23000 + gprs nsvc 0 remote ip 192.168.100.239 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 + gprs nsvc 1 remote udp port 0 + gprs nsvc 1 remote ip 0.0.0.0 + no force-combined-si + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 + phys_chan_config CCCH+SDCCH4 + hopping enabled 0 + timeslot 1 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 2 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 3 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 4 + phys_chan_config TCH/F + hopping enabled 0 + timeslot 5 + phys_chan_config TCH/H + hopping enabled 0 + timeslot 6 + phys_chan_config PDCH + hopping enabled 0 + timeslot 7 + phys_chan_config PDCH + hopping enabled 0 +msc 0 + ip.access rtp-base 4000 + no bsc-welcome-text + no bsc-msc-lost-text + no bsc-grace-text + type normal + allow-emergency allow + amr-config 12_2k forbidden + amr-config 10_2k forbidden + amr-config 7_95k forbidden + amr-config 7_40k forbidden + amr-config 6_70k forbidden + amr-config 5_90k allowed + amr-config 5_15k forbidden + amr-config 4_75k forbidden + codec-list fr1 fr2 fr3 hr1 hr3 + mgw remote-ip 172.18.2.203 + asp-protocol ipa +bsc + mid-call-timeout 0 + no missing-msc-text + access-list-name bsc-list +ctrl + bind 0.0.0.0 -- To view, visit https://gerrit.osmocom.org/9391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ief0799a8f7d378dc3831e7988c9175166c82eace Gerrit-Change-Number: 9391 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:28:25 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:28:25 +0000 Subject: Change in docker-playground[master]: redmine: Migrate from 3.2 to 3.4 In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9392 ) Change subject: redmine: Migrate from 3.2 to 3.4 ...................................................................... redmine: Migrate from 3.2 to 3.4 Change-Id: I8bfd387c71477c4dfdea2eb8520415ce129a3b32 --- M redmine/Dockerfile D redmine/redmine-image-content-disposition.diff D redmine/redmine-issue-2047-svg-image-support.diff D redmine/redmine-openid-hmac-digest.diff 4 files changed, 2 insertions(+), 144 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 1d8362d..25f6308 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,17 +1,9 @@ -FROM redmine:3.2 +FROM redmine:3.4 RUN apt-get update && \ apt-get install -y --no-install-recommends \ graphviz \ + imagemagick \ mscgen \ patch && \ apt-get clean - -COPY redmine-issue-2047-svg-image-support.diff /tmp/redmine-issue-2047-svg-image-support.diff -RUN cd app && patch -p1 < /tmp/redmine-issue-2047-svg-image-support.diff - -COPY redmine-openid-hmac-digest.diff /tmp/ -RUN cd /usr/local/bundle/gems/ruby-openid-2.3.0 && patch -p0 < /tmp/redmine-openid-hmac-digest.diff - -COPY redmine-image-content-disposition.diff /tmp/ -RUN patch -p1 < /tmp/redmine-image-content-disposition.diff diff --git a/redmine/redmine-image-content-disposition.diff b/redmine/redmine-image-content-disposition.diff deleted file mode 100644 index 50d83db..0000000 --- a/redmine/redmine-image-content-disposition.diff +++ /dev/null @@ -1,64 +0,0 @@ -From 6c94d485cb3e23559da8f0356a1052a620d7a2c2 Mon Sep 17 00:00:00 2001 -From: Harald Welte -Date: Mon, 14 May 2018 23:16:51 +0200 -Subject: [PATCH] chagnge content-disposition of pdf/image/text/patch to - 'inline' - -Related: https://osmocom.org/issues/3264 ---- - app/controllers/attachments_controller.rb | 9 ++++++++- - app/models/attachment.rb | 8 ++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb -index c2b5fa9c8..f2a57c31d 100644 ---- a/app/controllers/attachments_controller.rb -+++ b/app/controllers/attachments_controller.rb -@@ -57,7 +57,7 @@ class AttachmentsController < ApplicationController - # images are sent inline - send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), - :type => detect_content_type(@attachment), -- :disposition => 'attachment' -+ :disposition => disposition(@attachment) - end - end - -@@ -188,4 +188,12 @@ class AttachmentsController < ApplicationController - end - content_type.to_s - end -+ -+ def disposition(attachment) -+ if attachment.is_pdf? || attachment.is_image? || attachment.is_diff? || attachment.is_text? -+ 'inline' -+ else -+ 'attachment' -+ end -+ end - end -diff --git a/app/models/attachment.rb b/app/models/attachment.rb -index 3d16f57cc..a2520b0d5 100644 ---- a/app/models/attachment.rb -+++ b/app/models/attachment.rb -@@ -236,10 +236,18 @@ class Attachment < ActiveRecord::Base - Redmine::MimeType.is_type?('text', filename) - end - -+ def is_image? -+ Redmine::MimeType.is_type?('image', filename) -+ end -+ - def is_diff? - self.filename =~ /\.(patch|diff)$/i - end - -+ def is_pdf? -+ Redmine::MimeType.of(filename) == "application/pdf" -+ end -+ - # Returns true if the file is readable - def readable? - File.readable?(diskfile) --- -2.17.0 - diff --git a/redmine/redmine-issue-2047-svg-image-support.diff b/redmine/redmine-issue-2047-svg-image-support.diff deleted file mode 100644 index 23fc1e2..0000000 --- a/redmine/redmine-issue-2047-svg-image-support.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru app.orig/helpers/application_helper.rb app/helpers/application_helper.rb ---- app.orig/helpers/application_helper.rb 2018-01-08 19:37:37.000000000 +0000 -+++ app/helpers/application_helper.rb 2018-05-14 08:15:11.558390732 +0000 -@@ -637,7 +637,7 @@ - attachments = options[:attachments] || [] - attachments += obj.attachments if obj.respond_to?(:attachments) - if attachments.present? -- text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m| -+ text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png|svg))"(\s+alt="([^"]*)")?/i) do |m| - filename, ext, alt, alttext = $1.downcase, $2, $3, $4 - # search for the picture in attachments - if found = Attachment.latest_attach(attachments, CGI.unescape(filename)) -diff -ru app.orig/models/attachment.rb app/models/attachment.rb ---- app.orig/models/attachment.rb 2018-01-08 19:37:37.000000000 +0000 -+++ app/models/attachment.rb 2018-05-14 08:14:49.542526978 +0000 -@@ -193,7 +193,7 @@ - end - - def image? -- !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png)$/i) -+ !!(self.filename =~ /\.(bmp|gif|jpg|jpe|jpeg|png|svg)$/i) - end - - def thumbnailable? diff --git a/redmine/redmine-openid-hmac-digest.diff b/redmine/redmine-openid-hmac-digest.diff deleted file mode 100644 index e5b22dc..0000000 --- a/redmine/redmine-openid-hmac-digest.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nurd lib/openid/cryptutil.rb -/usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb ---- lib/openid/cryptutil.rb 1970-01-01 00:00:00.000000000 +0000 -+++ /usr/local/lib/ruby/gems/2.3/gems/ruby-openid-2.3.0/lib/openid/cryptutil.rb 2017-07-17 -18:25:45.146746571 +0000 -@@ -2,7 +2,7 @@ - require "digest/sha1" - require "digest/sha2" - begin -- require "digest/hmac" -+ require "openssl" - rescue LoadError - begin - # Try loading the ruby-hmac files if they exist -@@ -33,27 +33,19 @@ - end - - def CryptUtil.sha1(text) -- return Digest::SHA1.digest(text) -+ return OpenSSL::Digest.new('sha1').digest(text) - end - - def CryptUtil.hmac_sha1(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA1).update(text).digest -- else -- return HMAC::SHA1.digest(key, text) -- end -+ return OpenSSL::HMAC.digest('sha1', key, text) - end - - def CryptUtil.sha256(text) -- return Digest::SHA256.digest(text) -+ return OpenSSL::Digest.new('sha256').digest(text) - end - - def CryptUtil.hmac_sha256(key, text) -- if Digest.const_defined? :HMAC -- Digest::HMAC.new(key,Digest::SHA256).update(text).digest -- else -- return HMAC::SHA256.digest(key, text) -- end -+ return OpenSSL::HMAC.digest('sha256', key, text) - end - - # Generate a random string of the given length, composed of the -- To view, visit https://gerrit.osmocom.org/9392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8bfd387c71477c4dfdea2eb8520415ce129a3b32 Gerrit-Change-Number: 9392 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:29:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:29:03 +0000 Subject: Change in libosmocore[master]: add osmo_fsm_inst_state_chg_keep_timer() In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9389 ) Change subject: add osmo_fsm_inst_state_chg_keep_timer() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3c0e53b846b2208bd201ace99777f2286ea39ae8 Gerrit-Change-Number: 9389 Gerrit-PatchSet: 1 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:29:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:29:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:29:43 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 14:29:43 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:30:08 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:30:08 +0000 Subject: Change in libosmo-abis[master]: ortp: reset rtp session on SSRC changes In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: reset rtp session on SSRC changes ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 30 May 2018 14:30:08 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:30:16 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:30:16 +0000 Subject: Change in libosmo-abis[master]: ortp: detect ssrc changes immediately In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9380 ) Change subject: ortp: detect ssrc changes immediately ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Gerrit-Change-Number: 9380 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 14:30:16 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:30:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:30:17 +0000 Subject: Change in libosmo-abis[master]: ortp: reset rtp session on SSRC changes In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9379 ) Change subject: ortp: reset rtp session on SSRC changes ...................................................................... ortp: reset rtp session on SSRC changes When libortp detects a timestamp jump, we resynchronize the session in order to restore proper rtp frame reception. However, we do not resynchronize on an SSRC change. An SSRC change usually indicates the change of an RTP stream source, which is a much more profound event than a timestamp change, so we should even reset the session on SSRC changes. Also, not resynchronizing the session on an SSRC change causes problems when the jitter buffer feature is used. In those cases it takes libortp a long time until it finally detects the timestamp jump and the session resyhcornization happens late. - reset the ession on SSRC changes by calling rtp_session_reset() Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Related OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 18a6123..9062289 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -114,7 +114,8 @@ uint32_t ssrc = rtp_session_get_recv_ssrc(rs); LOGP(DLMIB, LOGL_INFO, - "osmo-ortp(%d): ssrc_changed to 0x%08x\n", port, ssrc); + "osmo-ortp(%d): ssrc_changed to 0x%08x, resetting\n", port, ssrc); + rtp_session_reset(rs); } static void ortp_sig_cb_pt(RtpSession *rs, void *data) -- To view, visit https://gerrit.osmocom.org/9379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8688a55cd20d0e14493c357db80754851e12f2fb Gerrit-Change-Number: 9379 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:30:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:30:17 +0000 Subject: Change in libosmo-abis[master]: ortp: detect ssrc changes immediately In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9380 ) Change subject: ortp: detect ssrc changes immediately ...................................................................... ortp: detect ssrc changes immediately libortp detects an ssrc jump using a packet count thresold. This threshold is set to 50 by default. This means that libortp has to see 50 rtp packets with the new SSRC before it accepts the new stream. In our application we want to detect the changed SSRC (Handover) as fast as possible. So we should change the threshold to zero. - use rtp_session_set_ssrc_changed_threshold() to set a thresold of 0 packets when osmo_rtp_socket_create() is called. Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Related: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Pau Espin Pedrol: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 9062289..bf8df6a 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -372,6 +372,8 @@ rtp_session_set_seq_number(rs->sess, random()); rs->tx_timestamp = random(); + /* Make sure ssrc changes are detected immediately */ + rtp_session_set_ssrc_changed_threshold(rs->sess, 0); return rs; } -- To view, visit https://gerrit.osmocom.org/9380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id88c2c44d29a409affc2e47fdb932e1187020593 Gerrit-Change-Number: 9380 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:31:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:31:31 +0000 Subject: Change in osmo-iuh[master]: asn1tostruct: allow to override build date In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9387 ) Change subject: asn1tostruct: allow to override build date ...................................................................... Patch Set 1: Code-Review+1 looks fine to me, adding lynxis as our resident most knowledgeable person about reproducible builds. -- To view, visit https://gerrit.osmocom.org/9387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I5cfa465cc82f009f28dd7f12ced0e72a05fda842 Gerrit-Change-Number: 9387 Gerrit-PatchSet: 1 Gerrit-Owner: Bernhard M. Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 30 May 2018 14:31:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:03 +0000 Subject: Change in openbsc[master]: bsc_nat.c: Return correct err code to avoid heap-user-after-free In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9381 ) Change subject: bsc_nat.c: Return correct err code to avoid heap-user-after-free ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I120f646601bd4275b9088d0d73000ce04564bc6b Gerrit-Change-Number: 9381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:17 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:17 +0000 Subject: Change in openbsc[master]: chan_alloc: Print bts nr on chan alloc failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9382 ) Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 Gerrit-Change-Number: 9382 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:17 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:18 +0000 Subject: Change in openbsc[master]: bsc_nat.c: Return correct err code to avoid heap-user-after-free In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9381 ) Change subject: bsc_nat.c: Return correct err code to avoid heap-user-after-free ...................................................................... bsc_nat.c: Return correct err code to avoid heap-user-after-free When ipaccess_bsc_read_cb calls bsc_close_connection, the osmo_fd struct is freed, so we need to indicate to osmo_wqueue_bfd_cb that it should not continue using the fd pointer after we return. Fixes following AdressSanitizer report: <0015> openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c:1317 The connection to the BSC Nr: -1 was lost. Cleaning it ================================================================= ==27028==ERROR: AddressSanitizer: heap-use-after-free on address 0x6160000c521c at pc 0x7ffff606b056 bp 0x7fffffffe170 sp 0x7fffffffe168 READ of size 4 at 0x6160000c521c thread T0 #0 0x7ffff606b055 in osmo_wqueue_bfd_cb libosmocore/src/write_queue.c:65 #1 0x7ffff6055c3b in osmo_fd_disp_fds libosmocore/src/select.c:217 #2 0x7ffff6055ed5 in osmo_select_main libosmocore/src/select.c:257 #3 0x421c82 in main openbsc/openbsc/src/osmo-bsc_nat/bsc_nat.c:1713 #4 0x7ffff4803b44 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b44) #5 0x406438 (/bin/osmo-bsc_nat+0x406438) Fixes: OS#3300 Change-Id: I120f646601bd4275b9088d0d73000ce04564bc6b --- M openbsc/src/osmo-bsc_nat/bsc_nat.c 1 file changed, 16 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 57b51a2..38a29be 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -1308,20 +1308,18 @@ int ret; ret = ipa_msg_recv_buffered(bfd->fd, &msg, &bsc->pending_msg); - if (ret <= 0) { - if (ret == -EAGAIN) - return 0; - if (ret == 0) - LOGP(DNAT, LOGL_ERROR, - "The connection to the BSC Nr: %d was lost. Cleaning it\n", - bsc->cfg ? bsc->cfg->nr : -1); - else - LOGP(DNAT, LOGL_ERROR, - "Stream error on BSC Nr: %d. Failed to parse ip access message: %d (%s)\n", - bsc->cfg ? bsc->cfg->nr : -1, ret, strerror(-ret)); - - bsc_close_connection(bsc); - return -1; + if (ret == -EAGAIN) { + return 0; + } else if (ret == 0) { + LOGP(DNAT, LOGL_ERROR, + "The connection to the BSC Nr: %d was lost. Cleaning it\n", + bsc->cfg ? bsc->cfg->nr : -1); + goto close_fd; + } else if (ret < 0) { + LOGP(DNAT, LOGL_ERROR, + "Stream error on BSC Nr: %d. Failed to parse ip access message: %d (%s)\n", + bsc->cfg ? bsc->cfg->nr : -1, ret, strerror(-ret)); + goto close_fd; } @@ -1356,8 +1354,11 @@ /* FIXME: Currently no PONG is sent to the BSC */ /* FIXME: Currently no ID ACK is sent to the BSC */ forward_sccp_to_msc(bsc, msg); - return 0; + +close_fd: + bsc_close_connection(bsc); + return -EBADF; } static int ipaccess_listen_bsc_cb(struct osmo_fd *bfd, unsigned int what) -- To view, visit https://gerrit.osmocom.org/9381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I120f646601bd4275b9088d0d73000ce04564bc6b Gerrit-Change-Number: 9381 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:20 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:20 +0000 Subject: Change in openbsc[master]: chan_alloc: Print bts nr on chan alloc failure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9382 ) Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... chan_alloc: Print bts nr on chan alloc failure Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 --- M openbsc/src/libbsc/chan_alloc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 52a8259..97c1902 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -362,8 +362,8 @@ } else { struct challoc_signal_data sig; - LOGP(DRLL, LOGL_ERROR, "Failed to allocate %s channel\n", - gsm_lchant_name(type)); + LOGP(DRLL, LOGL_ERROR, "(bts=%d) Failed to allocate %s channel\n", + gsm_ts_and_pchan_name(bts->nr), gsm_lchant_name(type)); sig.bts = bts; sig.type = type; -- To view, visit https://gerrit.osmocom.org/9382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I51bb656b5fef3247edc63477f391c954c4b28f56 Gerrit-Change-Number: 9382 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:31 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:31 +0000 Subject: Change in openbsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9384 ) Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f Gerrit-Change-Number: 9384 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:31 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:32 +0000 Subject: Change in openbsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9384 ) Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f --- M openbsc/src/libbsc/abis_rsl.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index f05344a..5a508b2 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -1842,7 +1842,7 @@ /* Determine channel request cause code */ chreq_reason = get_reason_by_chreq(rqd_ref->ra, bts->network->neci); - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", msg->lchan->ts->trx->bts->nr, get_value_string(gsm_chreq_descs, chreq_reason), rqd_ref->ra, bts->network->neci, chreq_reason); @@ -1867,7 +1867,7 @@ lchan = lchan_alloc(bts, lctype, is_lu); if (!lchan) { uint8_t wait_ind; - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: no resources for %s 0x%x\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s 0x%x\n", msg->lchan->ts->trx->bts->nr, gsm_lchant_name(lctype), rqd_ref->ra); rate_ctr_inc(&bts->network->bsc_ctrs->ctr[BSC_CTR_CHREQ_NO_CHANNEL]); if (bts->T3122) -- To view, visit https://gerrit.osmocom.org/9384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2c0db366caef5632d4e04feeda1f83e79a58995f Gerrit-Change-Number: 9384 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:44 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: Print bts nr on chan alloc failure In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9383 ) Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id4f875944c40fd862fc63feec82216c45d2e41c2 Gerrit-Change-Number: 9383 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:44 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:52 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:52 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: Fix whitespace In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9385 ) Change subject: abis_rsl.c: Fix whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I67659275beda1b6a89bdf11eb0231438b0c8b912 Gerrit-Change-Number: 9385 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:58 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:58 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9386 ) Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f Gerrit-Change-Number: 9386 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:32:58 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:32:59 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:32:59 +0000 Subject: Change in osmo-bsc[master]: chan_alloc: Print bts nr on chan alloc failure In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9383 ) Change subject: chan_alloc: Print bts nr on chan alloc failure ...................................................................... chan_alloc: Print bts nr on chan alloc failure Also change format of related debug message to match similar format than gsm_ts_and_pchan_name(). Change-Id: Id4f875944c40fd862fc63feec82216c45d2e41c2 --- M src/libbsc/chan_alloc.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/chan_alloc.c b/src/libbsc/chan_alloc.c index d773382..4eccff0 100644 --- a/src/libbsc/chan_alloc.c +++ b/src/libbsc/chan_alloc.c @@ -338,7 +338,7 @@ struct gsm_lchan *lchan = NULL; enum gsm_phys_chan_config first, first_cbch, second, second_cbch; - LOGP(DRLL, LOGL_DEBUG, "bts-%d lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); + LOGP(DRLL, LOGL_DEBUG, "(bts=%d) lchan_alloc(%s)\n", bts->nr, gsm_lchant_name(type)); switch (type) { case GSM_LCHAN_SDCCH: @@ -488,8 +488,8 @@ } else { struct challoc_signal_data sig; - LOGP(DRLL, LOGL_ERROR, "Failed to allocate %s channel\n", - gsm_lchant_name(type)); + LOGP(DRLL, LOGL_ERROR, "(bts=%d) Failed to allocate %s channel\n", + bts->nr, gsm_lchant_name(type)); sig.bts = bts; sig.type = type; -- To view, visit https://gerrit.osmocom.org/9383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id4f875944c40fd862fc63feec82216c45d2e41c2 Gerrit-Change-Number: 9383 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:33:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:33:00 +0000 Subject: Change in osmo-bsc[master]: abis_rsl.c: Fix whitespace In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9385 ) Change subject: abis_rsl.c: Fix whitespace ...................................................................... abis_rsl.c: Fix whitespace Change-Id: I67659275beda1b6a89bdf11eb0231438b0c8b912 --- M src/libbsc/abis_rsl.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index ffbf630..2a67943 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -135,7 +135,7 @@ } if ((msg_type & 0xe0) == 0x20) return ABIS_RSL_MDISC_DED_CHAN; - + return ABIS_RSL_MDISC_LOC; } @@ -316,7 +316,7 @@ lchan->bs_power = db/2; if (fpc) lchan->bs_power |= 0x10; - + dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_BS_POWER_CONTROL); dh->chan_nr = chan_nr; @@ -345,7 +345,7 @@ if (fpc) lchan->ms_power |= 0x20; - + dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_MS_POWER_CONTROL); dh->chan_nr = chan_nr; @@ -994,7 +994,7 @@ /* (a) */ if (ts->dyn.pchan_is != ts->dyn.pchan_want) return dyn_ts_switchover_continue(ts); - + /* (b) */ if (dyn_ts_should_switch_to_pdch(ts)) return dyn_ts_switchover_start(ts, GSM_PCHAN_PDCH); @@ -1958,7 +1958,7 @@ arfcn = lchan->ts->trx->arfcn; subch = lchan->nr; - + lchan->encr.alg_id = RSL_ENC_ALG_A5(0); /* no encryption */ lchan->ms_power = ms_pwr_ctl_lvl(bts->band, bts->ms_max_power); lchan->bs_power = 0; /* 0dB reduction, output power = Pn */ @@ -2188,7 +2188,7 @@ "Abis RSL rx RLL: "); ts_name = gsm_lchan_name(msg->lchan); DEBUGP(DRLL, "%s SAPI=%u ", ts_name, sapi); - + switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: DEBUGPC(DRLL, "DATA INDICATION\n"); @@ -2614,7 +2614,7 @@ msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx IPACC: "); ts_name = gsm_lchan_name(msg->lchan); - + switch (rllh->c.msg_type) { case RSL_MT_IPAC_CRCX_ACK: DEBUGP(DRSL, "%s IPAC_CRCX_ACK ", ts_name); @@ -2762,7 +2762,7 @@ * wouldn't remember to use lchan[1] across e.g. a PDCH deact anyway) */ lchan = ts->lchan; - + /* * For TCH/x, the lchan->type has been set in lchan_alloc(), but it may * have been lost during channel release due to dynamic switchover. -- To view, visit https://gerrit.osmocom.org/9385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I67659275beda1b6a89bdf11eb0231438b0c8b912 Gerrit-Change-Number: 9385 Gerrit-PatchSet: 2 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:33:00 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:33:00 +0000 Subject: Change in osmo-bsc[master]: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9386 ) Change subject: abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else ...................................................................... abis_rsl: rsl_rx_chan_rqd: Format bts log string as in everywhere else Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f --- M src/libbsc/abis_rsl.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/abis_rsl.c b/src/libbsc/abis_rsl.c index 2a67943..48cc39f 100644 --- a/src/libbsc/abis_rsl.c +++ b/src/libbsc/abis_rsl.c @@ -1881,7 +1881,7 @@ /* Determine channel request cause code */ chreq_reason = get_reason_by_chreq(rqd_ref->ra, bts->network->neci); - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: reason: %s (ra=0x%02x, neci=0x%02x, chreq_reason=0x%02x)\n", msg->lchan->ts->trx->bts->nr, get_value_string(gsm_chreq_descs, chreq_reason), rqd_ref->ra, bts->network->neci, chreq_reason); @@ -1909,7 +1909,7 @@ */ lchan = lchan_alloc(bts, GSM_LCHAN_SDCCH, 0); if (!lchan && lctype != GSM_LCHAN_SDCCH) { - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: no resources for %s " + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s " "0x%x, retrying with %s\n", msg->lchan->ts->trx->bts->nr, gsm_lchant_name(GSM_LCHAN_SDCCH), rqd_ref->ra, @@ -1918,7 +1918,7 @@ } if (!lchan) { uint8_t wait_ind; - LOGP(DRSL, LOGL_NOTICE, "BTS %d CHAN RQD: no resources for %s 0x%x\n", + LOGP(DRSL, LOGL_NOTICE, "(bts=%d) CHAN RQD: no resources for %s 0x%x\n", msg->lchan->ts->trx->bts->nr, gsm_lchant_name(lctype), rqd_ref->ra); rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHREQ_NO_CHANNEL]); if (bts->T3122) -- To view, visit https://gerrit.osmocom.org/9386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7928d78e2ce3e6eca545455d08bc89ca67e01f9f Gerrit-Change-Number: 9386 Gerrit-PatchSet: 3 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:34:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:34:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library: introduce Facility IE templates for SS/USSD In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9368 ) Change subject: library: introduce Facility IE templates for SS/USSD ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibc3e8f70230d656b2f0994ea0c63e6554b6165de Gerrit-Change-Number: 9368 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:34:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:35:54 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:35:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: add GSM 04.80 RELEASE_COMPLETE message In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9367 ) Change subject: L3_Templates: add GSM 04.80 RELEASE_COMPLETE message ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/9367/1/library/L3_Templates.ttcn File library/L3_Templates.ttcn: https://gerrit.osmocom.org/#/c/9367/1/library/L3_Templates.ttcn at 1542 PS1, Line 1542: nsd := '00'B, a "tr" template wtihout any parametrs should typically be very wide in matching any type of SS RELEASE COMPLETE. Does the spec mandate that cause and facility are always absent (I don't know)? If yes, the templates are fine. If not, "*" might be more apropriate than omit. Same applies to other receive templates below. -- To view, visit https://gerrit.osmocom.org/9367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iaf295aeb4ef475d41d0eeddcca5e864016fd91cc Gerrit-Change-Number: 9367 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-Comment-Date: Wed, 30 May 2018 14:35:54 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 14:36:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Wed, 30 May 2018 14:36:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: introduce USSD helper functions In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9370 ) Change subject: msc: introduce USSD helper functions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic528b968a9bc7c12e8395364e895400aa016c8f5 Gerrit-Change-Number: 9370 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 30 May 2018 14:36:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed May 30 15:13:48 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 30 May 2018 15:13:48 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-asn1c_=C2=BB_a1=3Dde?= =?UTF-8?Q?fault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#139?= In-Reply-To: <1262627680.242.1527606607106.JavaMail.jenkins@jenkins.osmocom.org> References: <1262627680.242.1527606607106.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <247448080.250.1527693228005.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Wed May 30 15:30:08 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 15:30:08 +0000 Subject: Change in openbsc[master]: gitignore: Filter m4 files Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9393 Change subject: gitignore: Filter m4 files ...................................................................... gitignore: Filter m4 files Change-Id: I1ed0e5999a0b131091d78544d06a7be3c803a139 --- M openbsc/.gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/93/9393/1 diff --git a/openbsc/.gitignore b/openbsc/.gitignore index 3a811e7..a1695c6 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -37,6 +37,7 @@ stamp-h1 libtool ltmain.sh +m4/*.m4 # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/9393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1ed0e5999a0b131091d78544d06a7be3c803a139 Gerrit-Change-Number: 9393 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 15:31:03 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 30 May 2018 15:31:03 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GGSN_Tests: test what happens when PCO contains only one DNS entry Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/9394 Change subject: GGSN_Tests: test what happens when PCO contains only one DNS entry ...................................................................... GGSN_Tests: test what happens when PCO contains only one DNS entry When the protocol configuration options (PCO) contain a protocol option that lists only one DNS server (normally there are two included, a primary and a secondary). Than the parser in osmo-ggsn runs into an endles loop. This testcase tries to provoke this behavior by sending PDP CONTEXT ACTIVATE messages with PCO that contain only a single DNS entry. The problematic behavior of osmo-ggsn has been fixed recently (see depends). Change-Id: I71761e1f9db7ceac3c3df43d2e539f8c8d53c4fc Depends: osmo-msc Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Related: OS#3288 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/expected-results.xml M library/GTP_Templates.ttcn 3 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/9394/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index d099681..28a1785 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -932,6 +932,24 @@ T_default.stop; } + /* Test if the parser can cope with PCO that only contain either a single or a primary DNS. + * Note: an unpatched osmo-ggsn version will enter an endless-loop when the test is run + * see Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ + testcase TC_pdp4_act_deact_with_single_dns() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var ProtConfigOptions pco_pri_dns := valueof(ts_PCO_IPv4_PRI_DNS_IPCP); + var ProtConfigOptions pco_sec_dns := valueof(ts_PCO_IPv4_SEC_DNS_IPCP); + + ctx.pco_req := pco_pri_dns; + f_pdp_ctx_act(ctx); + f_pdp_ctx_del(ctx, '1'B); + + ctx.pco_req := pco_sec_dns; + f_pdp_ctx_act(ctx); + f_pdp_ctx_del(ctx, '1'B); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -947,5 +965,7 @@ execute(TC_pdp6_clients_interact()); execute(TC_echo_req_resp()); + + execute(TC_pdp4_act_deact_with_single_dns()); } } diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml index 1e5da38..f871657 100644 --- a/ggsn_tests/expected-results.xml +++ b/ggsn_tests/expected-results.xml @@ -11,4 +11,5 @@ + diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 44ec439..6c71765 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -400,6 +400,25 @@ } } + template ProtConfigOptions ts_PCO_IPv4_PRI_DNS_IPCP modifies ts_PCO := { + protocols := { + /* dummy PAP entry to check if our parser can cope with a single primary DNS entry + * see Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ + { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, + { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := + enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Primary)) } + } + } + template ProtConfigOptions ts_PCO_IPv4_SEC_DNS_IPCP modifies ts_PCO := { + protocols := { + /* dummy PAP entry to check if our parser can cope with a single secondary DNS entry + * see Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ + { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, + { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := + enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Secondary)) } + } + } + template ProtocolElement tr_PCO_Proto(OCT2 prot_id) := { protocolID := prot_id, lengthProtoID := ?, @@ -468,6 +487,13 @@ ts_IPCP(LCP_Configure_Request, identifier, { tr_IPCP_PrimaryDns('00000000'O), tr_IPCP_SecondaryDns('00000000'O) }); + template IpcpPacket ts_IPCP_ReqDNS_Primary(uint8_t identifier := 0) := + ts_IPCP(LCP_Configure_Request, identifier, + { tr_IPCP_PrimaryDns('00000000'O) }); + template IpcpPacket ts_IPCP_ReqDNS_Secondary(uint8_t identifier := 0) := + ts_IPCP(LCP_Configure_Request, identifier, + { tr_IPCP_SecondaryDns('00000000'O) }); + function f_teardown_ind_IE(in template (omit) BIT1 ind) return template (omit) TearDownInd { if (istemplatekind(ind, "omit")) { return omit; -- To view, visit https://gerrit.osmocom.org/9394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I71761e1f9db7ceac3c3df43d2e539f8c8d53c4fc Gerrit-Change-Number: 9394 Gerrit-PatchSet: 1 Gerrit-Owner: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 15:47:23 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 15:47:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: GGSN_Tests: test what happens when PCO contains only one DNS entry In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9394 ) Change subject: GGSN_Tests: test what happens when PCO contains only one DNS entry ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/#/c/9394/1/ggsn_tests/GGSN_Tests.ttcn File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/#/c/9394/1/ggsn_tests/GGSN_Tests.ttcn at 950 PS1, Line 950: f_pdp_ctx_del(ctx, '1'B); I think it would make sense to also check that the response is valid (that we received the expected DNS values, like other tests do). It also makes sense to check the case in which we sent a PCO with two IPCP, one with Primary DNS and another with a Secondary DNS. Basically what we saw the BlackBerry is doing. Then check that both DNS values are correct when answered. https://gerrit.osmocom.org/#/c/9394/1/ggsn_tests/GGSN_Tests.ttcn at 969 PS1, Line 969: execute(TC_pdp4_act_deact_with_single_dns()); Please move it together with the other TC_pdp4 ones. https://gerrit.osmocom.org/#/c/9394/1/ggsn_tests/expected-results.xml File ggsn_tests/expected-results.xml: https://gerrit.osmocom.org/#/c/9394/1/ggsn_tests/expected-results.xml at 14 PS1, Line 14: Same here. -- To view, visit https://gerrit.osmocom.org/9394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I71761e1f9db7ceac3c3df43d2e539f8c8d53c4fc Gerrit-Change-Number: 9394 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 15:47:23 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 15:51:47 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Wed, 30 May 2018 15:51:47 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9354 ) Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... Patch Set 1: dexter, ping me once you merge this one and you require a new osmo-ggsn bugfix release (1.2.2). -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 30 May 2018 15:51:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 22:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 30 May 2018 22:16:07 +0000 Subject: Change in libosmocore[master]: GSUP: implement TCAP-like session management In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7700 to look at the new patch set (#2). Change subject: GSUP: implement TCAP-like session management ...................................................................... GSUP: implement TCAP-like session management Unlike TCAP/MAP, GSUP is just a transport layer without the dialogue/context. This prevents us from having session based communication, required e.g. for USSD. But we can emulate TCAP dialogue by adding additional IEs, which would allow to relate each message to a particular session. This change introduces the following IEs: - OSMO_GSUP_SESSION_ID_IE, - OSMO_GSUP_SESSION_STATE_IE, which optionally can be used to indicate that the message is related to a session with given ID, and to manage session state, i.e. initiate, continue, and finish. Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Related: OS#1597 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 57 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/7700/2 -- To view, visit https://gerrit.osmocom.org/7700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Gerrit-Change-Number: 7700 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 22:16:07 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 30 May 2018 22:16:07 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new messages for SS/USSD payloads In-Reply-To: References: Message-ID: Hello Alexander Chemeris, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7600 to look at the new patch set (#5). Change subject: GSUP: introduce new messages for SS/USSD payloads ...................................................................... GSUP: introduce new messages for SS/USSD payloads In order to be able to transfer SS/USSD messages via GSUP, this change introduces the following new message types: - OSMO_GSUP_MSGT_PROC_SS_*, and the following new IE: - OSMO_GSUP_SS_INFO_IE which represents an ASN.1 encoded MAP payload coming to/from the mobile station 'as is', without any transcoding. Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Related: OS#1597 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 87 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/7600/5 -- To view, visit https://gerrit.osmocom.org/7600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Gerrit-Change-Number: 7600 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 22:26:59 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Wed, 30 May 2018 22:26:59 +0000 Subject: Change in osmo-msc[master]: VTY: add USSD processing back-end configuration In-Reply-To: References: Message-ID: Vadim Yanitskiy has abandoned this change. ( https://gerrit.osmocom.org/7677 ) Change subject: VTY: add USSD processing back-end configuration ...................................................................... Abandoned This is not required, since we decided to terminate SS/USSD messages at HLR. MSC becomes a transparent proxy now. -- To view, visit https://gerrit.osmocom.org/7677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I0b3c5ccea4054113e8e23109b1ab68d9f0e18497 Gerrit-Change-Number: 7677 Gerrit-PatchSet: 4 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed May 30 22:28:57 2018 From: gerrit-no-reply at lists.osmocom.org (Alexander Chemeris) Date: Wed, 30 May 2018 22:28:57 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new messages for SS/USSD payloads In-Reply-To: References: Message-ID: Alexander Chemeris has posted comments on this change. ( https://gerrit.osmocom.org/7600 ) Change subject: GSUP: introduce new messages for SS/USSD payloads ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/#/c/7600/5/tests/gsup/gsup_test.c File tests/gsup/gsup_test.c: https://gerrit.osmocom.org/#/c/7600/5/tests/gsup/gsup_test.c at 323 PS5, Line 323: maximal s/maximal/maximum/ -- To view, visit https://gerrit.osmocom.org/7600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Gerrit-Change-Number: 7600 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Wed, 30 May 2018 22:28:57 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Wed May 30 22:41:21 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Wed, 30 May 2018 22:41:21 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#52?= In-Reply-To: <646053405.244.1527633680813.JavaMail.jenkins@jenkins.osmocom.org> References: <646053405.244.1527633680813.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <203290681.254.1527720081124.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.30 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-27642/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-27642/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-27642/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-27642/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-27642/ libtool: install: (cd /tmp/am-dc-27642/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-27642/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-27642/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-27642/ libtool: install: chmod 644 /tmp/am-dc-27642/ libtool: install: ranlib /tmp/am-dc-27642/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-27642/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-27642/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-27642/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-27642/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-27642/ /bin/mkdir -p '/tmp/am-dc-27642/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-27642/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-27642/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-27642/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-27642/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-27642/ libtool: uninstall: rm -f /tmp/am-dc-27642/ /tmp/am-dc-27642/ /tmp/am-dc-27642/ /tmp/am-dc-27642/ /tmp/am-dc-27642/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-27642/ && rm -f html.tar ) ( cd '/tmp/am-dc-27642/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-27642/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de From jenkins at lists.osmocom.org Thu May 31 00:07:13 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 May 2018 00:07:13 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-bsc_=C2=BB_a1=3Ddefaul?= =?UTF-8?Q?t,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2282?= Message-ID: <1730199413.255.1527725233457.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 23.33 KB...] CC crc64gen.lo CC macaddr.lo CC stat_item.lo CC stats.lo CC stats_statsd.lo CC prim.lo CC conv_acc.lo CC conv_acc_generic.lo CC sercomm.lo CC prbs.lo CC isdnhdlc.lo CC conv_acc_sse.lo CC conv_acc_sse_avx.lo CC plugin.lo CC msgfile.lo CC serial.lo CCLD libosmocore.la make[4]: Entering directory '/build/deps/libosmocore/src' make[4]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../libtool --mode=install /usr/bin/install -c libosmocore.la '/build/deps/install/stow/libosmocore/lib' libtool: install: /usr/bin/install -c .libs/libosmocore.so.10.0.0 /build/deps/install/stow/libosmocore/lib/libosmocore.so.10.0.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocore.so.10.0.0 libosmocore.so.10 || { rm -f libosmocore.so.10 && ln -s libosmocore.so.10.0.0 libosmocore.so.10; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocore.so.10.0.0 libosmocore.so || { rm -f libosmocore.so && ln -s libosmocore.so.10.0.0 libosmocore.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocore.lai /build/deps/install/stow/libosmocore/lib/libosmocore.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[4]: Leaving directory '/build/deps/libosmocore/src' make[3]: Leaving directory '/build/deps/libosmocore/src' make[2]: Leaving directory '/build/deps/libosmocore/src' Making install in src/vty make[2]: Entering directory '/build/deps/libosmocore/src/vty' CC command.lo CC buffer.lo CC vty.lo CC vector.lo CC utils.lo CC telnet_interface.lo CC stats_vty.lo CC logging_vty.lo CC fsm_vty.lo CC talloc_ctx_vty.lo CCLD libosmovty.la make[3]: Entering directory '/build/deps/libosmocore/src/vty' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmovty.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmovty.la' libtool: install: (cd /build/deps/libosmocore/src/vty; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 4:1:0 -no-undefined -o libosmovty.la -rpath /build/deps/install/stow/libosmocore/lib buffer.lo command.lo vty.lo vector.lo utils.lo telnet_interface.lo logging_vty.lo stats_vty.lo fsm_vty.lo talloc_ctx_vty.lo ../../src/libosmocore.la -ltalloc ) libtool: install: /usr/bin/install -c .libs/libosmovty.so.4.0.1T /build/deps/install/stow/libosmocore/lib/libosmovty.so.4.0.1 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmovty.so.4.0.1 libosmovty.so.4 || { rm -f libosmovty.so.4 && ln -s libosmovty.so.4.0.1 libosmovty.so.4; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmovty.so.4.0.1 libosmovty.so || { rm -f libosmovty.so && ln -s libosmovty.so.4.0.1 libosmovty.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmovty.lai /build/deps/install/stow/libosmocore/lib/libosmovty.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/vty' make[2]: Leaving directory '/build/deps/libosmocore/src/vty' Making install in src/codec make[2]: Entering directory '/build/deps/libosmocore/src/codec' CC gsm610.lo CC gsm660.lo CC gsm620.lo CC gsm690.lo CC ecu_fr.lo CCLD libosmocodec.la make[3]: Entering directory '/build/deps/libosmocore/src/codec' make[3]: Nothing to be done for 'install-data-am'. /bin/mkdir -p '/build/deps/install/stow/libosmocore/lib' /bin/bash ../../libtool --mode=install /usr/bin/install -c libosmocodec.la '/build/deps/install/stow/libosmocore/lib' libtool: install: warning: relinking `libosmocodec.la' libtool: install: (cd /build/deps/libosmocore/src/codec; /bin/bash /build/deps/libosmocore/libtool --silent --tag CC --mode=relink gcc -Wall -g -O2 -DBUILDING_LIBOSMOCORE -Wall -version-info 1:0:1 -no-undefined -o libosmocodec.la -rpath /build/deps/install/stow/libosmocore/lib gsm610.lo gsm620.lo gsm660.lo gsm690.lo ecu_fr.lo ../../src/libosmocore.la ) libtool: install: /usr/bin/install -c .libs/libosmocodec.so.0.1.0T /build/deps/install/stow/libosmocore/lib/libosmocodec.so.0.1.0 libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocodec.so.0.1.0 libosmocodec.so.0 || { rm -f libosmocodec.so.0 && ln -s libosmocodec.so.0.1.0 libosmocodec.so.0; }; }) libtool: install: (cd /build/deps/install/stow/libosmocore/lib && { ln -s -f libosmocodec.so.0.1.0 libosmocodec.so || { rm -f libosmocodec.so && ln -s libosmocodec.so.0.1.0 libosmocodec.so; }; }) libtool: install: /usr/bin/install -c .libs/libosmocodec.lai /build/deps/install/stow/libosmocore/lib/libosmocodec.la libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/build_bin:/sbin" ldconfig -n /build/deps/install/stow/libosmocore/lib ---------------------------------------------------------------------- Libraries have been installed in: /build/deps/install/stow/libosmocore/lib If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the `-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the `LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the `LD_RUN_PATH' environment variable during linking - use the `-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to `/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- make[3]: Leaving directory '/build/deps/libosmocore/src/codec' make[2]: Leaving directory '/build/deps/libosmocore/src/codec' Making install in src/gsm make[2]: Entering directory '/build/deps/libosmocore/src/gsm' GEN gsm0503_conv.c Generating convolutional codes... Generate 'xcch' definition Generate 'rach' definition Generate 'rach_ext' definition Generate 'sch' definition Generate 'cs2' definition Generate 'cs3' definition Generate 'cs2_np' definition Generate 'cs3_np' definition Generate 'tch_afs_12_2' definition Generate 'tch_afs_10_2' definition Generate 'tch_afs_7_95' definition Generate 'tch_afs_7_4' definition Generate 'tch_afs_6_7' definition Generate 'tch_afs_5_9' definition Generate 'tch_afs_5_15' definition Generate 'tch_afs_4_75' definition Generate 'tch_fr' definition Generate 'tch_hr' definition Generate 'tch_ahs_7_95' definition Generate 'tch_ahs_7_4' definition Generate 'tch_ahs_6_7' definition Generate 'tch_ahs_5_9' definition Generate 'tch_ahs_5_15' definition Generate 'tch_ahs_4_75' definition Generate 'mcs1_dl_hdr' definition Generate 'mcs1_ul_hdr' definition Generate 'mcs1' definition Generate 'mcs2' definition Generate 'mcs3' definition Generate 'mcs4' definition Generate 'mcs5_dl_hdr' definition Generate 'mcs5_ul_hdr' definition Generate 'mcs5' definition Generate 'mcs6' definition Generate 'mcs7_dl_hdr' definition Generate 'mcs7_ul_hdr' definition Generate 'mcs7' definition Generate 'mcs8' definition Generate 'mcs9' definition Generation complete. make install-am make[3]: Entering directory '/build/deps/libosmocore/src/gsm' CC a5.lo CC tlv_parser.lo CC gsm48.lo CC rxlev_stat.lo CC comp128v23.lo CC gsm_utils.lo CC rsl.lo CC comp128.lo gsm_utils.c:112:9: note: #pragma message: including GnuTLS for getrandom fallback. #pragma message ("including GnuTLS for getrandom fallback.") ^ gsm_utils.c: In function 'osmo_get_rand_id': gsm_utils.c:456:9: note: #pragma message: Secure random failed: using GnuTLS fallback. #pragma message ("Secure random failed: using GnuTLS fallback.") ^ CC gsm48_ie.lo CC gsm0808.lo CC sysinfo.lo CC gprs_cipher_core.lo CC gprs_rlc.lo CC gsm0480.lo CC abis_nm.lo CC gsm0502.lo CC gsm0411_utils.lo CC gsm0411_smc.lo CC gsm0411_smr.lo CC gsm0414.lo CC lapd_core.lo CC lapdm.lo CC kasumi.lo CC gsm_04_08_gprs.lo CC auth_core.lo CC auth_comp128v1.lo CC auth_comp128v23.lo CC auth_milenage.lo CC gea.lo CC milenage/aes-internal.lo CC milenage/aes-internal-enc.lo CC milenage/milenage.lo CC gan.lo CC ipa.lo CC gsm0341.lo CC apn.lo CC gsup.lo CC gprs_gea.lo CC gsm0503_conv.lo CC oap.lo CC gsm0808_utils.lo CC gsm23003.lo CC mncc.lo lapd_core.c: In function 'lapd_ph_data_ind': lapd_core.c:1713:1: internal compiler error: Segmentation fault } ^ Please submit a full bug report, with preprocessed source if appropriate. See for instructions. CC bts_features.lo CC milenage/aes-encblock.lo The bug is not reproducible, so it is likely a hardware or OS problem. make[3]: *** [lapd_core.lo] Error 1 Makefile:568: recipe for target 'lapd_core.lo' failed make[3]: Leaving directory '/build/deps/libosmocore/src/gsm' Makefile:673: recipe for target 'install' failed make[2]: Leaving directory '/build/deps/libosmocore/src/gsm' make[2]: *** [install] Error 2 make[1]: *** [install-recursive] Error 1 Makefile:593: recipe for target 'install-recursive' failed make[1]: Leaving directory '/build/deps/libosmocore' Makefile:892: recipe for target 'install' failed make: *** [install] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu May 31 00:14:02 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 May 2018 00:14:02 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-osmo-pcu_=C2=BB_m?= =?UTF-8?Q?aster,osmocom-master-debian9,none,False_#517?= Message-ID: <675888259.256.1527725642236.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 116.39 KB...] CXX egprs_rlc_compression.lo CXXLD libgprs.la ar: `u' modifier ignored since `D' is the default (see `U') CXX pcu_main.o CXXLD osmo-pcu make[2]: Leaving directory ' Making all in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'all'. make[2]: Leaving directory ' Making all in tests make[2]: Entering directory ' CXX pcu_emu.o CXX test_replay_gprs_attach.o CC openbsc_clone.o CXX test_pdp_activation.o CXXLD emu/pcu_emu make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'all-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making dvi in include make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in tests make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making check in include make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in src make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory ' Making check in tests make[2]: Entering directory ' make rlcmac/RLCMACTest alloc/AllocTest alloc/MslotTest tbf/TbfTest types/TypesTest ms/MsTest llist/LListTest llc/LlcTest codel/codel_test edge/EdgeTest bitcomp/BitcompTest fn/FnTest make[3]: Entering directory ' CXX RLCMACTest.o CXXLD rlcmac/RLCMACTest CXX AllocTest.o CXXLD alloc/AllocTest CXX MslotTest.o CXXLD alloc/MslotTest CXX TbfTest.o CXXLD tbf/TbfTest CXX TypesTest.o CXXLD types/TypesTest CXX MsTest.o CXXLD ms/MsTest CXX LListTest.o CXXLD llist/LListTest CXX LlcTest.o CXXLD llc/LlcTest CC codel_test.o CCLD codel/codel_test CXX EdgeTest.o CXXLD edge/EdgeTest CXX BitcompTest.o CXX egprs_rlc_compression.o CXXLD bitcomp/BitcompTest CXX FnTest.o CXXLD fn/FnTest make[3]: Leaving directory ' make check-local make[3]: Entering directory ' /bin/bash '../../../tests/testsuite' ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf ok 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## All 12 tests were successful. make python-tests make[4]: Entering directory ' Not running python-based tests (determined at configure-time) make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making install in include make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/osmocom/pcu/pcuif_proto.h ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in src make[2]: Entering directory ' make[3]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c osmo-pcu ' libtool: install: /usr/bin/install -c osmo-pcu make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in examples make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../examples/osmo-pcu.cfg ' make[3]: Leaving directory ' make[2]: Leaving directory ' Making install in tests make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. make[3]: Nothing to be done for 'install-data-am'. make[3]: Leaving directory ' make[2]: Leaving directory ' make[2]: Entering directory ' make[3]: Entering directory ' make[3]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 osmo-pcu.pc ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in examples make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in tests make[2]: Entering directory ' /bin/bash '../../../tests/testsuite' AUTOTEST_PATH=' \ ## ---------------------------------- ## ## osmo-pcu 0.5.0.5-f0f7d test suite. ## ## ---------------------------------- ## Regression tests 1: rlcmac ok 2: multi_slot ok 3: ts_alloc ok 4: tbf FAILED (testsuite.at:29) 5: bitcomp ok 6: edge ok 7: types ok 8: ms ok 9: llc ok 10: llist ok 11: codel ok 12: fn ok ## ------------- ## ## Test results. ## ## ------------- ## ERROR: All 12 tests were run, 1 failed unexpectedly. ## -------------------------- ## ## testsuite.log was created. ## ## -------------------------- ## Please send `tests/testsuite.log' and all information you think might help: To: Subject: [osmo-pcu 0.5.0.5-f0f7d] testsuite: 4 failed You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may be found below `tests/testsuite.dir'. Makefile:1265: recipe for target 'installcheck-local' failed make[2]: *** [installcheck-local] Error 1 make[2]: Leaving directory ' Makefile:461: recipe for target 'installcheck-recursive' failed make[1]: *** [installcheck-recursive] Error 1 make[1]: Leaving directory ' Makefile:666: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh ======================== ./osmo-pcu-0.5.0.5-f0f7d/_build/sub/tests/testsuite.dir/04/testsuite.log # -*- compilation -*- 4. testsuite.at:25: testing tbf ... ../../../tests/testsuite.at:29: $OSMO_QEMU $abs_top_builddir/tests/tbf/TbfTest --- experr 2018-05-31 00:14:00.692767428 +0000 +++ 2018-05-31 00:14:00.760766928 +0000 @@ -4526,6 +4526,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 07 80 02 08 44 57 40 40 40 40 40 40 40 c0 10 70 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) downlink acknowledge TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Final ACK received. +../../../src/gprs_rlcmac_meas.cpp:134:49: runtime error: left shift of negative value -999173 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) changes state from FLOW to WAIT RELEASE TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) starting timer T3193 [release (DL-TBF)] with 0 sec. 0 microsec, cur_fn=0 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=WAIT RELEASE EGPRS) changes DL ASS state from GPRS_RLCMAC_DL_ASS_WAIT_ACK to GPRS_RLCMAC_DL_ASS_NONE 4. testsuite.at:25: 4. tbf (testsuite.at:25): FAILED (testsuite.at:29) Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE From jenkins at lists.osmocom.org Thu May 31 00:17:11 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 May 2018 00:17:11 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-bsc_=C2=BB_a1=3Dd?= =?UTF-8?Q?efault,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#2283?= In-Reply-To: <1730199413.255.1527725233457.JavaMail.jenkins@jenkins.osmocom.org> References: <1730199413.255.1527725233457.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1615279152.257.1527725831731.JavaMail.jenkins@jenkins.osmocom.org> See From jenkins at lists.osmocom.org Thu May 31 07:34:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 May 2018 07:34:20 +0000 (UTC) Subject: =?UTF-8?Q?Jenkins_build_is_back_to_normal_:_master-osmo-pc?= =?UTF-8?Q?u_=C2=BB_master,osmocom-master-debian9,none,False_#518?= In-Reply-To: <675888259.256.1527725642236.JavaMail.jenkins@jenkins.osmocom.org> References: <675888259.256.1527725642236.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <1825762499.264.1527752060946.JavaMail.jenkins@jenkins.osmocom.org> See From gerrit-no-reply at lists.osmocom.org Thu May 31 09:45:19 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 31 May 2018 09:45:19 +0000 Subject: Change in osmo-pcu[master]: log warnings when measurements arrive from the future Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9395 Change subject: log warnings when measurements arrive from the future ...................................................................... log warnings when measurements arrive from the future We have observed problems which look like the monotonic clock going backwards on Jenkins build workers, causing overflow in a time delta calculation. When this happens, log an error and don't process the measurement. Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/95/9395/1 diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index ac01f2a..056db20 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -24,6 +24,7 @@ #include #include +#include /* * downlink measurement @@ -78,6 +79,14 @@ tbf->meas.rssi_num++; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); + if (now_tv.tv_sec < rssi_tv->tv_sec || + (now_tv.tv_sec == rssi_tv->tv_sec && now_tv.tv_nsec < rssi_tv->tv_nsec)) { + LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing RSSI measurement received from the future; " + "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n", + (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec, + (uint64_t)rssi_tv->tv_sec, (uint64_t)rssi_tv->tv_nsec); + return 0; + } elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7) + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) @@ -130,6 +139,14 @@ tbf->m_bw.dl_loss_lost += lost; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); + if (now_tv.tv_sec < loss_tv->tv_sec || + (now_tv.tv_sec == loss_tv->tv_sec && now_tv.tv_nsec < loss_tv->tv_nsec)) { + LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing lost frames measurement received from the future; " + "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n", + (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec, + (uint64_t)loss_tv->tv_sec, (uint64_t)loss_tv->tv_nsec); + return 0; + } elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7) + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) @@ -174,6 +191,14 @@ tbf->m_bw.dl_bw_octets += octets; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); + if (now_tv.tv_sec < bw_tv->tv_sec || + (now_tv.tv_sec == bw_tv->tv_sec && now_tv.tv_nsec < bw_tv->tv_nsec)) { + LOGP(DRLCMACMEAS, LOGL_ERROR, "Not processing bandwidth measurement received from the future; " + "did the monotonic clock jump backwards? (now=%" PRIu64 ".%" PRIu64 " < %" PRIu64 ".%" PRIu64 ")\n", + (uint64_t)now_tv.tv_sec, (uint64_t)now_tv.tv_nsec, + (uint64_t)bw_tv->tv_sec, (uint64_t)bw_tv->tv_nsec); + return 0; + } elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7) + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000; if (elapsed < 128) -- To view, visit https://gerrit.osmocom.org/9395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 Gerrit-Change-Number: 9395 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 09:45:44 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 09:45:44 +0000 Subject: Change in python/osmo-python-tests[master]: Add debian packaging rules Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9396 Change subject: Add debian packaging rules ...................................................................... Add debian packaging rules This allows us to package osmopy as debian package. The package currently includes both the library as well as the executables/scripts. It might make sense to separate that into a pure library package and an "utils" package Related: SYS#3028 Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 --- A debian/changelog A debian/compat A debian/control A debian/copyright A debian/rules 5 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/96/9396/1 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9b158f6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +osmopy (0.0.9-1) unstable; urgency=medium + + * Initial package + + -- Harald Welte Thu, 31 May 2019 10:33:31 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..334416f --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: osmopy +Section: non-free/python +Priority: optional +Maintainer: Harald Welte +Build-Depends: debhelper (>= 9), python, dh-python, python-setuptools, python3, python3-setuptools +Standards-Version: 3.9.8 +Homepage: http://git.osmocom.org/python/osmo-python-tests/ +Vcs-Git: git://git.osmocom.org/python/osmo-python-tests +Vcs-Browser: http://git.osmocom.org/python/osmo-python-tests/ + +Package: python-osmopy +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: Python code (not only) for testing of Osmocom programs + FIXME + . + This package contains the Python 2 version of osmopy + +Package: python3-osmopy +Architecture: all +Depends: ${python3:Depends}, ${misc:Depends} +Description: Python code (not only) for testing of Osmocom programs + FIXME + . + This package contains the Python 3 version of osmopy diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..996db77 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,23 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-python-tests +Source: http://git.osmocom.org/python/osmo-python-tests/ + +Files: osmopy/obscvty.py +Copyright: Copyright (C) 2012, 2013 Holger Hans Peter Freyther +License: GPL-2+ + +Files: osmopy/osmo_ipa.py +Copyright: Copyright (C) 2016 sysmocom s.f.m.c. GmbH +License: GPL-3+ + +Files: osmopy/osmoutil.py +Copyright: (C) 2013 by Katerina Barone-Adesi +License: GPL-3+ + +Files: osmopy/osmo_interact/* +Copyright: (C) 2017 by sysmocom s.f.m.c. GmbH +License: GPL-3+ + +Files: debian/* +Copyright: 2018 Harald Welte +License: GPL-2+ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..452ab3c --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2,python3 + +override_dh_auto_install: + python setup.py install --install-layout=deb --root=$(CURDIR)/debian/python-osmopy + python3 setup.py install --install-layout=deb --root=$(CURDIR)/debian/python3-osmopy -- To view, visit https://gerrit.osmocom.org/9396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 Gerrit-Change-Number: 9396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 09:58:31 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 09:58:31 +0000 Subject: Change in osmo-pcu[master]: log warnings when measurements arrive from the future In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9395 ) Change subject: log warnings when measurements arrive from the future ...................................................................... Patch Set 1: Code-Review-1 (4 comments) https://gerrit.osmocom.org/#/c/9395/1/src/gprs_rlcmac_meas.cpp File src/gprs_rlcmac_meas.cpp: https://gerrit.osmocom.org/#/c/9395/1/src/gprs_rlcmac_meas.cpp at 82 PS1, Line 82: if (now_tv.tv_sec < rssi_tv->tv_sec || Use timespeccmp() here (include osmocom/core/timer_compat.h) https://gerrit.osmocom.org/#/c/9395/1/src/gprs_rlcmac_meas.cpp at 91 PS1, Line 91: + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000; I can't claim I understand what's going on in here with the "<< 7", why is it being done this way. But for sure this seems to be wrong, even with a monotonic clock: Get rssi_tv = {6, 9999} and now_tv = {7, 00001}. The substraction of nsec will be negative despite clock is correctly advancing in monotonic way. So I'm not sure what exactly this code does, but it's wrong. https://gerrit.osmocom.org/#/c/9395/1/src/gprs_rlcmac_meas.cpp at 142 PS1, Line 142: if (now_tv.tv_sec < loss_tv->tv_sec || Same https://gerrit.osmocom.org/#/c/9395/1/src/gprs_rlcmac_meas.cpp at 194 PS1, Line 194: if (now_tv.tv_sec < bw_tv->tv_sec || Same -- To view, visit https://gerrit.osmocom.org/9395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 Gerrit-Change-Number: 9395 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 09:58:31 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 09:58:50 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 09:58:50 +0000 Subject: Change in osmo-pcu[master]: log warnings when measurements arrive from the future In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9395 ) Change subject: log warnings when measurements arrive from the future ...................................................................... Patch Set 1: Code-Review+1 if we're seeing non-monotonic CLOCK_MONOTONIC, then that's a serious issue and an operating system problem. I would actually go OSMO_ASSERT() on that. -- To view, visit https://gerrit.osmocom.org/9395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 Gerrit-Change-Number: 9395 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 09:58:50 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 09:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 09:59:28 +0000 Subject: Change in osmo-ggsn[master]: ggsn: fix misinterpreted length field in ipcp_contains_option() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9354 ) Change subject: ggsn: fix misinterpreted length field in ipcp_contains_option() ...................................................................... ggsn: fix misinterpreted length field in ipcp_contains_option() The abort condition of the while loop in ipcp_contains_option() is accessing ipcp->len directly. Unfortunately this field is an uint16_t which as to be interpreted as little endian value. If it is used without prior conversion the value may appear larger than actually intended and the loop will then not stop at the end of end of the buffer. This can cause unpredictable results when the value given with the parameter enum ipcp_options opt is not found. The loop will then eventually cause a segmentation fauld or is likely to hang as soon as cur_opt->len points to a zero byte in memory. - Make sure that ipcp->len interpreted correctly by accessing it through ntohs() Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Related: OS#3288 --- M ggsn/ggsn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 72bf61c..3a8c4be 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -418,7 +418,7 @@ uint8_t *cur = ipcp->options; /* iterate over Options and check if protocol contained */ - while (cur + 2 <= ((uint8_t *)ipcp) + ipcp->len) { + while (cur + 2 <= ((uint8_t *)ipcp) + ntohs(ipcp->len)) { struct ipcp_option_hdr *cur_opt = (struct ipcp_option_hdr *) cur; if (cur_opt->type == opt) return cur_opt; -- To view, visit https://gerrit.osmocom.org/9354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 Gerrit-Change-Number: 9354 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 09:59:28 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 09:59:28 +0000 Subject: Change in osmo-ggsn[master]: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9355 ) Change subject: ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed ...................................................................... ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed struct ipcp_option_hdr and struct ipcp_hdr are not declared as packed explicitly, but they are used to parse memory blobs by casting pointers. Add __attribute__((packed)) to ensure that those structs are stored packed. Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Related: OS#3288 --- M ggsn/ggsn.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 3a8c4be..14bf04f 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -403,14 +403,14 @@ uint8_t type; uint8_t len; uint8_t data[0]; -}; +} __attribute__ ((packed)); struct ipcp_hdr { uint8_t code; uint8_t id; uint16_t len; uint8_t options[0]; -}; +} __attribute__ ((packed)); /* determine if IPCP contains given option */ static struct ipcp_option_hdr *ipcp_contains_option(struct ipcp_hdr *ipcp, enum ipcp_options opt) -- To view, visit https://gerrit.osmocom.org/9355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I14e10bb3ce482347b3f0c4d3a75168a55df15f20 Gerrit-Change-Number: 9355 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:05:57 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 10:05:57 +0000 Subject: Change in python/osmo-python-tests[master]: Add debian packaging rules In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9396 to look at the new patch set (#2). Change subject: Add debian packaging rules ...................................................................... Add debian packaging rules This allows us to package osmopy as debian package. The package currently includes both the library as well as the executables/scripts. It might make sense to separate that into a pure library package and an "utils" package Related: SYS#3028 Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 --- A debian/changelog A debian/compat A debian/control A debian/copyright A debian/rules 5 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/96/9396/2 -- To view, visit https://gerrit.osmocom.org/9396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 Gerrit-Change-Number: 9396 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:06:23 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 10:06:23 +0000 Subject: Change in python/osmo-python-tests[master]: Add debian packaging rules In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9396 ) Change subject: Add debian packaging rules ...................................................................... Patch Set 1: does anyone know how we can put the binaries into a sub-package? -- To view, visit https://gerrit.osmocom.org/9396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 Gerrit-Change-Number: 9396 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 10:06:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:40:25 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 31 May 2018 10:40:25 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports Message-ID: Stefan Sperling has uploaded this change for review. ( https://gerrit.osmocom.org/9397 Change subject: fix time-delta calculations for measurement reports ...................................................................... fix time-delta calculations for measurement reports The previous implementation unconditionally subtracted nanosecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() instead, which accounts for nanoseconds correctly. Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 14 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/9397/1 diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index ac01f2a..cffdbc6 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include #include #include @@ -72,15 +74,15 @@ int gprs_rlcmac_rssi(struct gprs_rlcmac_tbf *tbf, int8_t rssi) { struct timespec now_tv, *rssi_tv = &tbf->meas.rssi_tv; - uint32_t elapsed; + struct timespec elapsed; tbf->meas.rssi_sum += rssi; tbf->meas.rssi_num++; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + + timespecsub(&now_tv, rssi_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; gprs_rlcmac_rssi_rep(tbf); @@ -116,7 +118,7 @@ uint16_t lost) { struct timespec now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; - uint32_t elapsed; + struct timespec elapsed; uint16_t sum = received + lost; /* No measurement values */ @@ -129,10 +131,8 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; - osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + timespecsub(&now_tv, loss_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; gprs_rlcmac_lost_rep(tbf); @@ -169,21 +169,18 @@ int gprs_rlcmac_dl_bw(struct gprs_rlcmac_dl_tbf *tbf, uint16_t octets) { struct timespec now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; - uint32_t elapsed; + struct timespec elapsed; tbf->m_bw.dl_bw_octets += octets; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + timespecsub(&now_tv, bw_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; - tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets/elapsed); - + tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets << 10) / ((elapsed.tv_sec << 10) + (elapsed.tv_nsec >> 20)); LOGP(DRLCMACMEAS, LOGL_INFO, "DL Bandwitdh of IMSI=%s / TLLI=0x%08x: " - "%d KBits/s\n", tbf->imsi(), tbf->tlli(), - tbf->m_bw.dl_bw_octets / elapsed); + "%d KBits/s\n", tbf->imsi(), tbf->tlli(), tbf->m_bw.dl_throughput); /* reset bandwidth values timestamp */ memcpy(bw_tv, &now_tv, sizeof(*bw_tv)); -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:40:57 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 31 May 2018 10:40:57 +0000 Subject: Change in osmo-pcu[master]: log warnings when measurements arrive from the future In-Reply-To: References: Message-ID: Stefan Sperling has abandoned this change. ( https://gerrit.osmocom.org/9395 ) Change subject: log warnings when measurements arrive from the future ...................................................................... Abandoned See https://gerrit.osmocom.org/#/c/osmo-pcu/+/9397/ instead. -- To view, visit https://gerrit.osmocom.org/9395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I7a3aaba8eba73fad09bebc1f32e832fc25f8eb28 Gerrit-Change-Number: 9395 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:45:49 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 10:45:49 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E3-6a28_=E2=86=92_1=2E2=2E2?= Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9398 Change subject: Bump version: 1.2.1.3-6a28 ? 1.2.2 ...................................................................... Bump version: 1.2.1.3-6a28 ? 1.2.2 Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/98/9398/1 diff --git a/debian/changelog b/debian/changelog index 6588dca..3db4bd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-ggsn (1.2.2) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * ggsn_vty.c: fix: use CONFIG_NODE as parent by default + + [ Philipp Maier ] + * ggsn: fix misinterpreted length field in ipcp_contains_option() + * ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed + + -- Pau Espin Pedrol Thu, 31 May 2018 12:44:54 +0200 + osmo-ggsn (1.2.1) unstable; urgency=medium * debian/rules: Fix debian packaging after 1.2.0 release -- To view, visit https://gerrit.osmocom.org/9398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 Gerrit-Change-Number: 9398 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 10:49:32 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 10:49:32 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9397 ) Change subject: fix time-delta calculations for measurement reports ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/9397/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9397/1//COMMIT_MSG at 14 PS1, Line 14: I'd also add that previous to this patch, KBits throughtput was not being calculated/logged correctly, since it was actually accounting for KB/128th-part-of-a-second. -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Pau Espin Pedrol Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 10:49:32 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 12:14:27 2018 From: gerrit-no-reply at lists.osmocom.org (Stefan Sperling) Date: Thu, 31 May 2018 12:14:27 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports In-Reply-To: References: Message-ID: Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9397 to look at the new patch set (#2). Change subject: fix time-delta calculations for measurement reports ...................................................................... fix time-delta calculations for measurement reports The previous implementation unconditionally subtracted nanosecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() instead, which accounts for nanoseconds correctly. Also, fix calculations of KBit/s throughtput. It was not being calculated correctly, since it was actually accounting for one KB per 128th-part-of-a-second. Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 14 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/9397/2 -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 12:21:56 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 12:21:56 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9397 ) Change subject: fix time-delta calculations for measurement reports ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 12:21:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:20:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:20:53 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E3-6a28_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9398 ) Change subject: Bump version: 1.2.1.3-6a28 ? 1.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 Gerrit-Change-Number: 9398 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 13:20:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:20:55 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:20:55 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E3-6a28_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9398 ) Change subject: Bump version: 1.2.1.3-6a28 ? 1.2.2 ...................................................................... Bump version: 1.2.1.3-6a28 ? 1.2.2 Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 --- M debian/changelog 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 6588dca..3db4bd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +osmo-ggsn (1.2.2) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * ggsn_vty.c: fix: use CONFIG_NODE as parent by default + + [ Philipp Maier ] + * ggsn: fix misinterpreted length field in ipcp_contains_option() + * ggsn: make sure ipcp_option_hdr and and ipcp_hdr are packed + + -- Pau Espin Pedrol Thu, 31 May 2018 12:44:54 +0200 + osmo-ggsn (1.2.1) unstable; urgency=medium * debian/rules: Fix debian packaging after 1.2.0 release -- To view, visit https://gerrit.osmocom.org/9398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 Gerrit-Change-Number: 9398 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:23:03 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:23:03 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9397 ) Change subject: fix time-delta calculations for measurement reports ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 13:23:03 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:29:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:29:05 +0000 Subject: Change in libosmocore[master]: GSUP: implement TCAP-like session management In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7700 ) Change subject: GSUP: implement TCAP-like session management ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/7700/2/include/osmocom/gsm/gsup.h File include/osmocom/gsm/gsup.h: https://gerrit.osmocom.org/#/c/7700/2/include/osmocom/gsm/gsup.h at 197 PS2, Line 197: /*! Unique session identifier and origination flag */ it might make sense to explain that this field (session id) is only valid if session_state != 0 -- To view, visit https://gerrit.osmocom.org/7700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Gerrit-Change-Number: 7700 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 31 May 2018 13:29:05 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:29:09 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:29:09 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new messages for SS/USSD payloads In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7600 ) Change subject: GSUP: introduce new messages for SS/USSD payloads ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Gerrit-Change-Number: 7600 Gerrit-PatchSet: 5 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Thu, 31 May 2018 13:29:09 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:29:53 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:29:53 +0000 Subject: Change in openbsc[master]: gitignore: Filter m4 files In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9393 ) Change subject: gitignore: Filter m4 files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1ed0e5999a0b131091d78544d06a7be3c803a139 Gerrit-Change-Number: 9393 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 13:29:53 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:30:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:30:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc: Add Encoder/Decoder for Supplementary Services In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9365 ) Change subject: msc: Add Encoder/Decoder for Supplementary Services ...................................................................... msc: Add Encoder/Decoder for Supplementary Services The many SS_* types depend on MAP, whcih in turn depends on ROSE. Add all of this to the MSC testsuite so we can do SS related testing. Change-Id: If5084decb5391736ab5cadd86adb2ffa78e7140f --- M msc/gen_links.sh M msc/regen_makefile.sh 2 files changed, 12 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/gen_links.sh b/msc/gen_links.sh index a5444db..0ceed43 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -49,8 +49,18 @@ FILES="BSSAP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.ROSE/src +FILES="Remote_Operations_Generic_ROS_PDUs.asn Remote_Operations_Information_Objects.asn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MAP/src +FILES="MAP_ApplicationContexts.asn MAP_CH_DataTypes.asn MAP_CallHandlingOperations.asn MAP_CommonDataTypes.asn MAP_DialogueInformation.asn MAP_ER_DataTypes.asn MAP_EncDec.cc MAP_Errors.asn MAP_GR_DataTypes.asn MAP_Group_Call_Operations.asn MAP_LCS_DataTypes.asn MAP_LocationServiceOperations.asn MAP_MS_DataTypes.asn MAP_MobileServiceOperations.asn MAP_OM_DataTypes.asn MAP_OperationAndMaintenanceOperations.asn MAP_PDU_Defs.asn MAP_Protocol.asn MAP_SM_DataTypes.asn MAP_SS_Code.asn MAP_SS_DataTypes.asn MAP_ShortMessageServiceOperations.asn MAP_SupplementaryServiceOperations.asn MAP_TS_Code.asn MAP_Types.ttcn " +FILES+="MAP_BS_Code.asn MAP_ExtensionDataTypes.asn MobileDomainDefinitions.asn" +gen_links $DIR $FILES + DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src -FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn" +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn " +FILES+="SS_DataTypes.asn SS_Errors.asn SS_Operations.asn SS_PDU_Defs.asn SS_Protocol.asn SS_Types.ttcn SS_EncDec.cc" gen_links $DIR $FILES DIR=$BASEDIR/titan.ProtocolModules.SDP/src diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index fc4a29d..5798f8a 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc *.c" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc *.c *.asn" export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/9365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If5084decb5391736ab5cadd86adb2ffa78e7140f Gerrit-Change-Number: 9365 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:30:18 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:30:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: L3_Templates: Add templates related to Supplementaryt Services In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9366 ) Change subject: L3_Templates: Add templates related to Supplementaryt Services ...................................................................... L3_Templates: Add templates related to Supplementaryt Services Change-Id: I919fa542a2e037b3fcf8cd5b0b9d7599b8c09070 --- M library/L3_Templates.ttcn 1 file changed, 208 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 824dbf2..593c990 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -1295,6 +1295,214 @@ } /*********************************************************************** + * Supplementary Services + ***********************************************************************/ + +private template (value) Facility_TLV ts_FacTLV(OCTN facility) := { + elementIdentifier := '1C'O, + lengthIndicator := lengthof(facility), + facilityInformation := facility +} +private template Facility_TLV tr_FacTLV(template OCTN facility) := { + elementIdentifier := '1C'O, + lengthIndicator := ?, + facilityInformation := facility +} + +private template (value) Facility_LV ts_FacLV(OCTN facility) := { + lengthIndicator := lengthof(facility), + facilityInformation := facility +} +private template Facility_LV tr_FacLV(template OCTN facility) := { + lengthIndicator := ?, + facilityInformation := facility +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_REGISTER( + uint3_t tid, BIT1 ti_flag, + OCTN facility, + template (omit) SS_VersionIndicator ss_ver := omit +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := ts_FacTLV(facility), + ss_version := ss_ver + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_REGISTER( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility, + template SS_VersionIndicator ss_ver := omit +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := tr_FacTLV(facility), + ss_version := ss_ver + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_REGISTER( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := ts_FacTLV(facility) + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_REGISTER( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + register := { + messageType := '111011'B, + nsd := '00'B, + facility := tr_FacTLV(facility) + } + } + } +} + +template (value) PDU_ML3_MS_NW ts_ML3_MO_SS_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := ts_FacLV(facility) + } + } + } +} +template PDU_ML3_MS_NW tr_ML3_MO_SS_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := tr_FacLV(facility) + } + } + } +} + +template (value) PDU_ML3_NW_MS ts_ML3_MT_SS_FACILITY( + uint3_t tid, BIT1 ti_flag, + OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := int2bit(tid, 3), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := ts_FacLV(facility) + } + } + } +} +template PDU_ML3_NW_MS tr_ML3_MT_SS_FACILITY( + template uint3_t tid, template BIT1 ti_flag, + template OCTN facility +) := { + discriminator := '1011'B, + tiOrSkip := { + transactionId := { + tio := f_tid_or_wc(tid), + tiFlag := ti_flag, + tIExtension := omit + } + }, + msgs := { + ss := { + facility := { + messageType := '111010'B, + nsd := '00'B, + facility := tr_FacLV(facility) + } + } + } +} + +/*********************************************************************** * GPRS Mobility Management ***********************************************************************/ -- To view, visit https://gerrit.osmocom.org/9366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I919fa542a2e037b3fcf8cd5b0b9d7599b8c09070 Gerrit-Change-Number: 9366 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:30:49 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 13:30:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: msc/USSD: add single *#100# request testcase In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9372 ) Change subject: msc/USSD: add single *#100# request testcase ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I82450c6f48f6c17bc33e0ec6c91f2a73e44793ad Gerrit-Change-Number: 9372 Gerrit-PatchSet: 2 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 13:30:49 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 13:35:33 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 13:35:33 +0000 Subject: =?UTF-8?Q?Change_in_osmo-ggsn=5Bmaster=5D=3A_Bump_version=3A_1=2E2=2E1=2E3-6a28_=E2=86=92_1=2E2=2E2?= In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9398 ) Change subject: Bump version: 1.2.1.3-6a28 ? 1.2.2 ...................................................................... Patch Set 1: Tag pushed. I'll fire latest repo build and prepare patch for meta-telephony. -- To view, visit https://gerrit.osmocom.org/9398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Idbc183ca37196082e95a107901bea53d37aa2ff3 Gerrit-Change-Number: 9398 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 13:35:33 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 14:02:19 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 14:02:19 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Update 1.2.1 -> 1.2.2 Message-ID: Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9399 Change subject: osmo-ggsn: Update 1.2.1 -> 1.2.2 ...................................................................... osmo-ggsn: Update 1.2.1 -> 1.2.2 Change-Id: I48f607b380b798f416cb6c05c6bf06e458b75836 --- M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/99/9399/1 diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb index 13d3cbd..58f00ec 100644 --- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb +++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb @@ -2,10 +2,10 @@ HOMEPAGE = "https://osmocom.org/projects/openggsn" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -PV = "1.2.1+gitr${SRCPV}" +PV = "1.2.2+gitr${SRCPV}" PR = "r0" -SRCREV = "ac07625086948281295e54dd295228153ecd5ff0" +SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a" SRC_URI = "git://git.osmocom.org/osmo-ggsn \ file://osmo-ggsn.init \ file://libgtp-queue_depth_32.patch \ -- To view, visit https://gerrit.osmocom.org/9399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: newchange Gerrit-Change-Id: I48f607b380b798f416cb6c05c6bf06e458b75836 Gerrit-Change-Number: 9399 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 14:06:03 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 14:06:03 +0000 Subject: Change in openbsc[master]: gitignore: Filter m4 files In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9393 ) Change subject: gitignore: Filter m4 files ...................................................................... gitignore: Filter m4 files Change-Id: I1ed0e5999a0b131091d78544d06a7be3c803a139 --- M openbsc/.gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/openbsc/.gitignore b/openbsc/.gitignore index 3a811e7..a1695c6 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -37,6 +37,7 @@ stamp-h1 libtool ltmain.sh +m4/*.m4 # git-version-gen magic .tarball-version -- To view, visit https://gerrit.osmocom.org/9393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1ed0e5999a0b131091d78544d06a7be3c803a139 Gerrit-Change-Number: 9393 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:23:55 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 May 2018 15:23:55 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9388 to look at the new patch set (#2). Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... ortp: enable scheduled mode on rtp socket creation we use some functionalities of libortp that require to use rtp sessions with the scheduled mode enabled. Since we do not enable the scheduled mode, yet, we receive error messages in the log that complain about a non enabled scheduled mode. - Turn on scheduled mode using rtp_session_set_scheduling_mode() when osmo_rtp_socket_create() is called. Note: this patch is related to chane: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Unfortunately we observed a segfault with ortp version 0.22.0, which seems to be related to an unintialized scheduling mode. We expect this patch to fix the problem. Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Closes: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/88/9388/2 -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:40:35 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 15:40:35 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/9388/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/9388/2//COMMIT_MSG at 17 PS2, Line 17: Note: this patch is related to chane: s/chane/change/. https://gerrit.osmocom.org/#/c/9388/2//COMMIT_MSG at 19 PS2, Line 19: segfault with ortp version 0.22.0, which seems to be related to an version in which we observed the segfault is 0.25.0 on an ARM platform. -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 15:40:35 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:43:36 2018 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 31 May 2018 15:43:36 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9388 to look at the new patch set (#3). Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... ortp: enable scheduled mode on rtp socket creation we use some functionalities of libortp that require to use rtp sessions with the scheduled mode enabled. Since we do not enable the scheduled mode, yet, we receive error messages in the log that complain about a non enabled scheduled mode. - Turn on scheduled mode using rtp_session_set_scheduling_mode() when osmo_rtp_socket_create() is called. Note: this patch is related to chane: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Unfortunately we observed a segfault with ortp version 0.25.0 (ARM), which seems to be related to an unintialized scheduling mode. We expect this patch to fix the problem. Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Closes: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/88/9388/3 -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:46:46 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 15:46:46 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 31 May 2018 15:46:46 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:46:52 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 15:46:52 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 31 May 2018 15:46:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 15:46:57 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 15:46:57 +0000 Subject: Change in libosmo-abis[master]: ortp: enable scheduled mode on rtp socket creation In-Reply-To: References: Message-ID: Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/9388 ) Change subject: ortp: enable scheduled mode on rtp socket creation ...................................................................... ortp: enable scheduled mode on rtp socket creation we use some functionalities of libortp that require to use rtp sessions with the scheduled mode enabled. Since we do not enable the scheduled mode, yet, we receive error messages in the log that complain about a non enabled scheduled mode. - Turn on scheduled mode using rtp_session_set_scheduling_mode() when osmo_rtp_socket_create() is called. Note: this patch is related to chane: I3a63c23f5ede47773b6a249a48ecebd5d3b45ace Unfortunately we observed a segfault with ortp version 0.25.0 (ARM), which seems to be related to an unintialized scheduling mode. We expect this patch to fix the problem. Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Closes: OS#3299 --- M src/trau/osmo_ortp.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index bf8df6a..13e2478 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -351,6 +351,7 @@ rtp_session_set_data(rs->sess, rs); rtp_session_set_profile(rs->sess, osmo_pt_profile); rtp_session_set_jitter_compensation(rs->sess, 100); + rtp_session_set_scheduling_mode(rs->sess, TRUE); rtp_session_signal_connect(rs->sess, "ssrc_changed", (RtpCallback) ortp_sig_cb_ssrc, -- To view, visit https://gerrit.osmocom.org/9388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4b8f0349d5503bbe53745cc8903beb26f149f219 Gerrit-Change-Number: 9388 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: dexter -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 16:12:03 2018 From: gerrit-no-reply at lists.osmocom.org (Vadim Yanitskiy) Date: Thu, 31 May 2018 16:12:03 +0000 Subject: Change in libosmocore[master]: GSUP: implement TCAP-like session management In-Reply-To: References: Message-ID: Hello Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7700 to look at the new patch set (#3). Change subject: GSUP: implement TCAP-like session management ...................................................................... GSUP: implement TCAP-like session management Unlike TCAP/MAP, GSUP is just a transport layer without the dialogue/context. This prevents us from having session based communication, required e.g. for USSD. But we can emulate TCAP dialogue by adding additional IEs, which would allow to relate each message to a particular session. This change introduces the following IEs: - OSMO_GSUP_SESSION_ID_IE, - OSMO_GSUP_SESSION_STATE_IE, which optionally can be used to indicate that the message is related to a session with given ID, and to manage session state, i.e. initiate, continue, and finish. Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Related: OS#1597 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 58 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/00/7700/3 -- To view, visit https://gerrit.osmocom.org/7700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Gerrit-Change-Number: 7700 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 16:55:20 2018 From: gerrit-no-reply at lists.osmocom.org (Pau Espin Pedrol) Date: Thu, 31 May 2018 16:55:20 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Update 1.2.1 -> 1.2.2 In-Reply-To: References: Message-ID: Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9399 ) Change subject: osmo-ggsn: Update 1.2.1 -> 1.2.2 ...................................................................... Patch Set 1: TODO after this patch is merged: launch 201705-stable build. -- To view, visit https://gerrit.osmocom.org/9399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I48f607b380b798f416cb6c05c6bf06e458b75836 Gerrit-Change-Number: 9399 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 16:55:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From admin at opensuse.org Thu May 31 17:39:03 2018 From: admin at opensuse.org (OBS Notification) Date: Thu, 31 May 2018 17:39:03 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_9.0/aarch64 In-Reply-To: References: Message-ID: <5b103354d122c_1a87aca684310257@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_9.0/aarch64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [* ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 53s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 54s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 55s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ *] A start job is running for dev-disk?\x2d0.device (4min 56s / no limit) [ **] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ ***] A start job is running for dev-disk?\x2d0.device (4min 57s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [ *** ] A start job is running for dev-disk?\x2d0.device (4min 58s / no limit) [*** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [** ] A start job is running for dev-disk?\x2d0.device (4min 59s / no limit) [* ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [** ] A start job is running for dev-disk?rtio\x2d0.device (5min / no limit) [*** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 1s / no limit) [ *** ] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ ***] A start job is running for dev-disk?o\x2d0.device (5min 2s / no limit) [ **] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)### WATCHDOG TRIGGERED, KILLING VM ### [ 329s] [ *] A start job is running for dev-disk?o\x2d0.device (5min 3s / no limit)/var/cache/obs/worker/root_4/root: 20372 [ 329s] qemu-system-aarch64: terminating on signal 15 from pid 24407 () [ 329s] ### VM INTERACTION END ### [ 329s] /var/run/obs/worker/4/build/build-vm: line 458: kill: (20360) - No such process [ 329s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 329s] or the build host has a kernel or hardware problem... gave up after 9 failed build attempts... -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu May 31 19:08:02 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 19:08:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types Message-ID: Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/9400 Change subject: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types ...................................................................... bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types Change-Id: Ic0ccca39be48dc2d42b92d433dcb5c6d65adbb33 --- M bsc/BSC_Tests.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/9400/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0da0a59..9b92207 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -235,13 +235,6 @@ } } -/* sleep for given number of (fractional) seconds */ -function f_sleep(float seconds) { - timer T := seconds; - T.start; - T.timeout; -} - /* global altstep for global guard timer; also takes care of responding RESET witH RESET-ACK */ altstep as_Tguard() runs on test_CT { var BSSAP_N_UNITDATA_ind ud_ind; -- To view, visit https://gerrit.osmocom.org/9400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0ccca39be48dc2d42b92d433dcb5c6d65adbb33 Gerrit-Change-Number: 9400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:07 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:07 +0000 Subject: Change in libosmocore[master]: GSUP: implement TCAP-like session management In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/7700 ) Change subject: GSUP: implement TCAP-like session management ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Gerrit-Change-Number: 7700 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Comment-Date: Thu, 31 May 2018 20:59:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:12 +0000 Subject: Change in libosmocore[master]: GSUP: implement TCAP-like session management In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7700 ) Change subject: GSUP: implement TCAP-like session management ...................................................................... GSUP: implement TCAP-like session management Unlike TCAP/MAP, GSUP is just a transport layer without the dialogue/context. This prevents us from having session based communication, required e.g. for USSD. But we can emulate TCAP dialogue by adding additional IEs, which would allow to relate each message to a particular session. This change introduces the following IEs: - OSMO_GSUP_SESSION_ID_IE, - OSMO_GSUP_SESSION_STATE_IE, which optionally can be used to indicate that the message is related to a session with given ID, and to manage session state, i.e. initiate, continue, and finish. Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Related: OS#1597 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 58 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 8ccfa49..d984813 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +gsup gsup.h the 'osmo_gsup_message' struct extended with + session information => ABI changed diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index a7fa820..5f45699 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -82,6 +82,9 @@ OSMO_GSUP_AUTS_IE = 0x26, OSMO_GSUP_RES_IE = 0x27, OSMO_GSUP_CN_DOMAIN_IE = 0x28, + + OSMO_GSUP_SESSION_ID_IE = 0x30, + OSMO_GSUP_SESSION_STATE_IE = 0x31, }; /*! GSUP message type */ @@ -132,6 +135,18 @@ OSMO_GSUP_CN_DOMAIN_CS = 2, }; +/*! TCAP-like session state */ +enum osmo_gsup_session_state { + /*! Undefined session state */ + OSMO_GSUP_SESSION_STATE_NONE = 0x00, + /*! Initiation of a new session */ + OSMO_GSUP_SESSION_STATE_BEGIN = 0x01, + /*! Communication of an existing session */ + OSMO_GSUP_SESSION_STATE_CONTINUE = 0x02, + /*! Indication of the session end */ + OSMO_GSUP_SESSION_STATE_END = 0x03, +}; + /*! parsed/decoded PDP context information */ struct osmo_gsup_pdp_info { unsigned int context_id; @@ -176,6 +191,12 @@ enum osmo_gsup_cn_domain cn_domain; const uint8_t *pdp_charg_enc; size_t pdp_charg_enc_len; + + /*! Session state \ref osmo_gsup_session_state */ + enum osmo_gsup_session_state session_state; + /*! Unique session identifier and origination flag. + * Encoded only when \ref session_state != 0x00 */ + uint32_t session_id; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index b6ac56d..8663f44 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -385,6 +385,14 @@ gsup_msg->pdp_charg_enc_len = value_len; break; + case OSMO_GSUP_SESSION_ID_IE: + gsup_msg->session_id = osmo_decode_big_endian(value, value_len); + break; + + case OSMO_GSUP_SESSION_STATE_IE: + gsup_msg->session_state = *value; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -564,6 +572,14 @@ gsup_msg->pdp_charg_enc_len, gsup_msg->pdp_charg_enc); } + if ((u8 = gsup_msg->session_state)) { + size_t len = sizeof(gsup_msg->session_id); + uint8_t *sid = osmo_encode_big_endian(gsup_msg->session_id, len); + + msgb_tlv_put(msg, OSMO_GSUP_SESSION_ID_IE, len, sid); + msgb_tlv_put(msg, OSMO_GSUP_SESSION_STATE_IE, sizeof(u8), &u8); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index acc7274..6ead7d2 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -171,6 +171,15 @@ 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, }; + static const uint8_t dummy_session_ies[] = { + 0x2b, /* Dummy value, we only interested in IE coding */ + TEST_IMSI_IE, + + /* Session ID and state */ + 0x30, 0x04, 0xde, 0xad, 0xbe, 0xef, + 0x31, 0x01, 0x01, + }; + static const struct test { char *name; const uint8_t *data; @@ -204,6 +213,8 @@ send_auth_info_res_umts, sizeof(send_auth_info_res_umts)}, {"Send Authentication Info Request with AUTS and RAND (UMTS)", send_auth_info_req_auts, sizeof(send_auth_info_req_auts)}, + {"Dummy message with session IEs", + dummy_session_ies, sizeof(dummy_session_ies)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -267,7 +278,7 @@ osmo_hexdump(t->data + j, ie_end - j)); OSMO_ASSERT(j <= ie_end - 2); - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_CN_DOMAIN_IE); + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SESSION_STATE_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 05c64fe..5c010e6 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -40,6 +40,9 @@ generated message: 08 01 08 21 43 65 87 09 21 43 f5 26 0e 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 20 10 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 original message: 08 01 08 21 43 65 87 09 21 43 f5 26 0e 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 20 10 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 IMSI: 123456789012345 + generated message: 2b 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 + original message: 2b 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -54,6 +57,7 @@ message 11: tested 13 truncations, 12 parse failures message 12: tested 211 truncations, 209 parse failures message 13: tested 45 truncations, 43 parse failures + message 14: tested 20 truncations, 18 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 768 parse failures @@ -69,3 +73,4 @@ message 11: tested 3328 modifications, 767 parse failures message 12: tested 54016 modifications, 4622 parse failures message 13: tested 11520 modifications, 1026 parse failures + message 14: tested 5120 modifications, 1026 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 49a85ba..1f59902 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -27,4 +27,6 @@ Send Authentication Info Result with IK, CK, AUTN and RES (UMTS) OK Testing Send Authentication Info Request with AUTS and RAND (UMTS) Send Authentication Info Request with AUTS and RAND (UMTS) OK + Testing Dummy message with session IEs + Dummy message with session IEs OK Done. -- To view, visit https://gerrit.osmocom.org/7700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1cee271fed0284a134ffed103c0d4bebbcfde2a8 Gerrit-Change-Number: 7700 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:12 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:12 +0000 Subject: Change in libosmocore[master]: GSUP: introduce new messages for SS/USSD payloads In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/7600 ) Change subject: GSUP: introduce new messages for SS/USSD payloads ...................................................................... GSUP: introduce new messages for SS/USSD payloads In order to be able to transfer SS/USSD messages via GSUP, this change introduces the following new message types: - OSMO_GSUP_MSGT_PROC_SS_*, and the following new IE: - OSMO_GSUP_SS_INFO_IE which represents an ASN.1 encoded MAP payload coming to/from the mobile station 'as is', without any transcoding. Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Related: OS#1597 --- M TODO-RELEASE M include/osmocom/gsm/gsup.h M src/gsm/gsup.c M tests/gsup/gsup_test.c M tests/gsup/gsup_test.err M tests/gsup/gsup_test.ok 6 files changed, 87 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d984813..7b225cc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line gsup gsup.h the 'osmo_gsup_message' struct extended with session information => ABI changed + SS/USSD information => ABI changed diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 5f45699..dd27493 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -85,6 +85,9 @@ OSMO_GSUP_SESSION_ID_IE = 0x30, OSMO_GSUP_SESSION_STATE_IE = 0x31, + + /*! Supplementary Services payload */ + OSMO_GSUP_SS_INFO_IE = 0x35, }; /*! GSUP message type */ @@ -114,6 +117,10 @@ OSMO_GSUP_MSGT_LOCATION_CANCEL_REQUEST = 0b00011100, OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR = 0b00011101, OSMO_GSUP_MSGT_LOCATION_CANCEL_RESULT = 0b00011110, + + OSMO_GSUP_MSGT_PROC_SS_REQUEST = 0b00100000, + OSMO_GSUP_MSGT_PROC_SS_ERROR = 0b00100001, + OSMO_GSUP_MSGT_PROC_SS_RESULT = 0b00100010, }; #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00) @@ -197,6 +204,10 @@ /*! Unique session identifier and origination flag. * Encoded only when \ref session_state != 0x00 */ uint32_t session_id; + + /*! ASN.1 encoded MAP payload for Supplementary Services */ + uint8_t *ss_info; + size_t ss_info_len; }; int osmo_gsup_decode(const uint8_t *data, size_t data_len, diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 8663f44..b4b60b2 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -62,6 +62,11 @@ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_LOCATION_CANCEL_REQUEST), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_LOCATION_CANCEL_ERROR), OSMO_VALUE_STRING(OSMO_GSUP_MSGT_LOCATION_CANCEL_RESULT), + + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_REQUEST), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_ERROR), + OSMO_VALUE_STRING(OSMO_GSUP_MSGT_PROC_SS_RESULT), + { 0, NULL } }; @@ -393,6 +398,11 @@ gsup_msg->session_state = *value; break; + case OSMO_GSUP_SS_INFO_IE: + gsup_msg->ss_info = value; + gsup_msg->ss_info_len = value_len; + break; + default: LOGP(DLGSUP, LOGL_NOTICE, "GSUP IE type %d unknown\n", iei); @@ -580,6 +590,11 @@ msgb_tlv_put(msg, OSMO_GSUP_SESSION_STATE_IE, sizeof(u8), &u8); } + if (gsup_msg->ss_info) { + msgb_tlv_put(msg, OSMO_GSUP_SS_INFO_IE, + gsup_msg->ss_info_len, gsup_msg->ss_info); + } + return 0; } diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 6ead7d2..9712d77 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -180,6 +180,43 @@ 0x31, 0x01, 0x01, }; + static const uint8_t send_ussd_req[] = { + 0x20, /* OSMO_GSUP_MSGT_PROC_SS_REQUEST */ + TEST_IMSI_IE, + + /* Session ID and state */ + 0x30, 0x04, 0xde, 0xad, 0xbe, 0xef, + 0x31, 0x01, 0x01, + + /* SS/USSD information IE */ + 0x35, 0x14, + /* ASN.1 encoded MAP payload */ + 0xa1, 0x12, + 0x02, 0x01, /* Component: invoke */ + 0x01, /* invokeID = 1 */ + /* opCode: processUnstructuredSS-Request */ + 0x02, 0x01, 0x3b, 0x30, 0x0a, 0x04, 0x01, 0x0f, + 0x04, 0x05, 0xaa, 0x18, 0x0c, 0x36, 0x02, + }; + + static const uint8_t send_ussd_res[] = { + 0x22, /* OSMO_GSUP_MSGT_PROC_SS_RESULT */ + TEST_IMSI_IE, + + /* Session ID and state */ + 0x30, 0x04, 0xde, 0xad, 0xbe, 0xef, + 0x31, 0x01, 0x03, + + /* SS/USSD information IE */ + 0x35, 0x08, + /* ASN.1 encoded MAP payload */ + 0xa3, 0x06, + 0x02, 0x01, /* Component: returnError */ + 0x01, /* invokeID = 1 */ + /* localValue: unknownAlphabet */ + 0x02, 0x01, 0x47, + }; + static const struct test { char *name; const uint8_t *data; @@ -215,6 +252,10 @@ send_auth_info_req_auts, sizeof(send_auth_info_req_auts)}, {"Dummy message with session IEs", dummy_session_ies, sizeof(dummy_session_ies)}, + {"SS/USSD processUnstructuredSS-Request / Invoke", + send_ussd_req, sizeof(send_ussd_req)}, + {"SS/USSD processUnstructuredSS-Request / ReturnResult", + send_ussd_res, sizeof(send_ussd_res)}, }; printf("Test GSUP message decoding/encoding\n"); @@ -278,7 +319,11 @@ osmo_hexdump(t->data + j, ie_end - j)); OSMO_ASSERT(j <= ie_end - 2); - OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SESSION_STATE_IE); + /** + * FIXME: share the maximal IE value somehow + * in order to avoid manual updating of this + */ + OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SS_INFO_IE); OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2); ie_end = j; diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err index 5c010e6..ac71ac2 100644 --- a/tests/gsup/gsup_test.err +++ b/tests/gsup/gsup_test.err @@ -43,6 +43,12 @@ generated message: 2b 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 original message: 2b 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 IMSI: 123456789012345 + generated message: 20 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 35 14 a1 12 02 01 01 02 01 3b 30 0a 04 01 0f 04 05 aa 18 0c 36 02 + original message: 20 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 35 14 a1 12 02 01 01 02 01 3b 30 0a 04 01 0f 04 05 aa 18 0c 36 02 + IMSI: 123456789012345 + generated message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 + original message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 + IMSI: 123456789012345 message 0: tested 11 truncations, 11 parse failures message 1: tested 14 truncations, 13 parse failures message 2: tested 83 truncations, 81 parse failures @@ -58,6 +64,8 @@ message 12: tested 211 truncations, 209 parse failures message 13: tested 45 truncations, 43 parse failures message 14: tested 20 truncations, 18 parse failures + message 15: tested 42 truncations, 39 parse failures + message 16: tested 30 truncations, 27 parse failures DLGSUP Stopping DLGSUP logging message 0: tested 2816 modifications, 510 parse failures message 1: tested 3584 modifications, 768 parse failures @@ -74,3 +82,5 @@ message 12: tested 54016 modifications, 4622 parse failures message 13: tested 11520 modifications, 1026 parse failures message 14: tested 5120 modifications, 1026 parse failures + message 15: tested 10752 modifications, 1256 parse failures + message 16: tested 7680 modifications, 1265 parse failures diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok index 1f59902..d63dd2d 100644 --- a/tests/gsup/gsup_test.ok +++ b/tests/gsup/gsup_test.ok @@ -29,4 +29,8 @@ Send Authentication Info Request with AUTS and RAND (UMTS) OK Testing Dummy message with session IEs Dummy message with session IEs OK + Testing SS/USSD processUnstructuredSS-Request / Invoke + SS/USSD processUnstructuredSS-Request / Invoke OK + Testing SS/USSD processUnstructuredSS-Request / ReturnResult + SS/USSD processUnstructuredSS-Request / ReturnResult OK Done. -- To view, visit https://gerrit.osmocom.org/7600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie17a78043a35fffbdd59e80fd2b2da39cce5e532 Gerrit-Change-Number: 7600 Gerrit-PatchSet: 6 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:32 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:32 +0000 Subject: Change in meta-telephony[201705]: osmo-ggsn: Update 1.2.1 -> 1.2.2 In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9399 ) Change subject: osmo-ggsn: Update 1.2.1 -> 1.2.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-MessageType: comment Gerrit-Change-Id: I48f607b380b798f416cb6c05c6bf06e458b75836 Gerrit-Change-Number: 9399 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Thu, 31 May 2018 20:59:32 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:41 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9400 ) Change subject: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ic0ccca39be48dc2d42b92d433dcb5c6d65adbb33 Gerrit-Change-Number: 9400 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 31 May 2018 20:59:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 20:59:43 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 20:59:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9400 ) Change subject: bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types ...................................................................... bsc: Remove duplicate f_sleep() function, we have one in Osmocom_Types Change-Id: Ic0ccca39be48dc2d42b92d433dcb5c6d65adbb33 --- M bsc/BSC_Tests.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 0da0a59..9b92207 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -235,13 +235,6 @@ } } -/* sleep for given number of (fractional) seconds */ -function f_sleep(float seconds) { - timer T := seconds; - T.start; - T.timeout; -} - /* global altstep for global guard timer; also takes care of responding RESET witH RESET-ACK */ altstep as_Tguard() runs on test_CT { var BSSAP_N_UNITDATA_ind ud_ind; -- To view, visit https://gerrit.osmocom.org/9400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic0ccca39be48dc2d42b92d433dcb5c6d65adbb33 Gerrit-Change-Number: 9400 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 21:00:05 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 21:00:05 +0000 Subject: Change in osmo-pcu[master]: fix time-delta calculations for measurement reports In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9397 ) Change subject: fix time-delta calculations for measurement reports ...................................................................... fix time-delta calculations for measurement reports The previous implementation unconditionally subtracted nanosecond values from different time measurements, causing overflow if the current measurement was taken in less of a fraction of a second than the past measurement. Use timespecsub() instead, which accounts for nanoseconds correctly. Also, fix calculations of KBit/s throughtput. It was not being calculated correctly, since it was actually accounting for one KB per 128th-part-of-a-second. Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Related: OS#3225 --- M src/gprs_rlcmac_meas.cpp 1 file changed, 14 insertions(+), 17 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index ac01f2a..cffdbc6 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include #include #include @@ -72,15 +74,15 @@ int gprs_rlcmac_rssi(struct gprs_rlcmac_tbf *tbf, int8_t rssi) { struct timespec now_tv, *rssi_tv = &tbf->meas.rssi_tv; - uint32_t elapsed; + struct timespec elapsed; tbf->meas.rssi_sum += rssi; tbf->meas.rssi_num++; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - rssi_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - rssi_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + + timespecsub(&now_tv, rssi_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; gprs_rlcmac_rssi_rep(tbf); @@ -116,7 +118,7 @@ uint16_t lost) { struct timespec now_tv, *loss_tv = &tbf->m_bw.dl_loss_tv; - uint32_t elapsed; + struct timespec elapsed; uint16_t sum = received + lost; /* No measurement values */ @@ -129,10 +131,8 @@ tbf->m_bw.dl_loss_received += received; tbf->m_bw.dl_loss_lost += lost; - osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - loss_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - loss_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + timespecsub(&now_tv, loss_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; gprs_rlcmac_lost_rep(tbf); @@ -169,21 +169,18 @@ int gprs_rlcmac_dl_bw(struct gprs_rlcmac_dl_tbf *tbf, uint16_t octets) { struct timespec now_tv, *bw_tv = &tbf->m_bw.dl_bw_tv; - uint32_t elapsed; + struct timespec elapsed; tbf->m_bw.dl_bw_octets += octets; osmo_clock_gettime(CLOCK_MONOTONIC, &now_tv); - elapsed = ((now_tv.tv_sec - bw_tv->tv_sec) << 7) - + (((now_tv.tv_nsec - bw_tv->tv_nsec)/1000) << 7) / 1000000; - if (elapsed < 128) + timespecsub(&now_tv, bw_tv, &elapsed); + if (elapsed.tv_sec < 1) return 0; - tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets/elapsed); - + tbf->m_bw.dl_throughput = (tbf->m_bw.dl_bw_octets << 10) / ((elapsed.tv_sec << 10) + (elapsed.tv_nsec >> 20)); LOGP(DRLCMACMEAS, LOGL_INFO, "DL Bandwitdh of IMSI=%s / TLLI=0x%08x: " - "%d KBits/s\n", tbf->imsi(), tbf->tlli(), - tbf->m_bw.dl_bw_octets / elapsed); + "%d KBits/s\n", tbf->imsi(), tbf->tlli(), tbf->m_bw.dl_throughput); /* reset bandwidth values timestamp */ memcpy(bw_tv, &now_tv, sizeof(*bw_tv)); -- To view, visit https://gerrit.osmocom.org/9397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7d22e7b5902c230efeae66eb20c17026a4037887 Gerrit-Change-Number: 9397 Gerrit-PatchSet: 2 Gerrit-Owner: Stefan Sperling Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 21:01:06 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 21:01:06 +0000 Subject: Change in python/osmo-python-tests[master]: Add debian packaging rules In-Reply-To: References: Message-ID: Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9396 ) Change subject: Add debian packaging rules ...................................................................... Patch Set 2: adding @alteholz as reviewer, maybe he can help regarding putting applications into a sub-package and not into the main library packages? -- To view, visit https://gerrit.osmocom.org/9396 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I332fb82d0e8dd09c5cf53caafa6a63297a8e3881 Gerrit-Change-Number: 9396 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Thorsten Alteholz Gerrit-Comment-Date: Thu, 31 May 2018 21:01:06 +0000 Gerrit-HasComments: No Gerrit-HasLabels: No -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu May 31 21:01:33 2018 From: gerrit-no-reply at lists.osmocom.org (Harald Welte) Date: Thu, 31 May 2018 21:01:33 +0000 Subject: Change in libosmocore[master]: add osmo_fsm_inst_state_chg_keep_timer() In-Reply-To: References: Message-ID: Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9389 ) Change subject: add osmo_fsm_inst_state_chg_keep_timer() ...................................................................... add osmo_fsm_inst_state_chg_keep_timer() Change-Id: I3c0e53b846b2208bd201ace99777f2286ea39ae8 --- M include/osmocom/core/fsm.h M src/fsm.c M tests/fsm/fsm_test.c M tests/fsm/fsm_test.err 4 files changed, 188 insertions(+), 35 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 174396a..67e00ad 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -182,6 +182,21 @@ unsigned long timeout_secs, int T, const char *file, int line); +/*! perform a state change while keeping the current timer running. + * + * This is useful to keep a timeout across several states (without having to round the + * remaining time to seconds). + * + * This is a macro that calls _osmo_fsm_inst_state_chg_keep_timer() with the given + * parameters as well as the caller's source file and line number for logging + * purposes. See there for documentation. + */ +#define osmo_fsm_inst_state_chg_keep_timer(fi, new_state) \ + _osmo_fsm_inst_state_chg_keep_timer(fi, new_state, \ + __BASE_FILE__, __LINE__) +int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, + const char *file, int line); + /*! dispatch an event to an osmocom finite state machine instance * * This is a macro that calls _osmo_fsm_inst_dispatch() with the given diff --git a/src/fsm.c b/src/fsm.c index 0370f65..b5af2e7 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -429,15 +429,56 @@ return fsm->states[state].name; } +static int state_chg(struct osmo_fsm_inst *fi, uint32_t new_state, + bool keep_timer, unsigned long timeout_secs, int T, + const char *file, int line) +{ + struct osmo_fsm *fsm = fi->fsm; + uint32_t old_state = fi->state; + const struct osmo_fsm_state *st = &fsm->states[fi->state]; + + /* validate if new_state is a valid state */ + if (!(st->out_state_mask & (1 << new_state))) { + LOGPFSMLSRC(fi, LOGL_ERROR, file, line, + "transition to state %s not permitted!\n", + osmo_fsm_state_name(fsm, new_state)); + return -EPERM; + } + + if (!keep_timer) { + /* delete the old timer */ + osmo_timer_del(&fi->timer); + } + + if (st->onleave) + st->onleave(fi, new_state); + + LOGPFSMSRC(fi, file, line, "state_chg to %s\n", + osmo_fsm_state_name(fsm, new_state)); + fi->state = new_state; + st = &fsm->states[new_state]; + + if (!keep_timer && timeout_secs) { + fi->T = T; + osmo_timer_schedule(&fi->timer, timeout_secs, 0); + } + + /* Call 'onenter' last, user might terminate FSM from there */ + if (st->onenter) + st->onenter(fi, old_state); + + return 0; +} + /*! perform a state change of the given FSM instance * * Best invoke via the osmo_fsm_inst_state_chg() macro which logs the source * file where the state change was effected. Alternatively, you may pass \a * file as NULL to use the normal file/line indication instead. * - * All changes to the FSM instance state must be made via this + * All changes to the FSM instance state must be made via an osmo_fsm_inst_state_chg_* * function. It verifies that the existing state actually permits a - * transiiton to new_state. + * transition to new_state. * * timeout_secs and T are optional parameters, and only have any effect * if timeout_secs is not 0. If the timeout function is used, then the @@ -457,39 +498,32 @@ unsigned long timeout_secs, int T, const char *file, int line) { - struct osmo_fsm *fsm = fi->fsm; - uint32_t old_state = fi->state; - const struct osmo_fsm_state *st = &fsm->states[fi->state]; + return state_chg(fi, new_state, false, timeout_secs, T, file, line); +} - /* validate if new_state is a valid state */ - if (!(st->out_state_mask & (1 << new_state))) { - LOGPFSMLSRC(fi, LOGL_ERROR, file, line, - "transition to state %s not permitted!\n", - osmo_fsm_state_name(fsm, new_state)); - return -EPERM; - } - - /* delete the old timer */ - osmo_timer_del(&fi->timer); - - if (st->onleave) - st->onleave(fi, new_state); - - LOGPFSMSRC(fi, file, line, "state_chg to %s\n", - osmo_fsm_state_name(fsm, new_state)); - fi->state = new_state; - st = &fsm->states[new_state]; - - if (timeout_secs) { - fi->T = T; - osmo_timer_schedule(&fi->timer, timeout_secs, 0); - } - - /* Call 'onenter' last, user might terminate FSM from there */ - if (st->onenter) - st->onenter(fi, old_state); - - return 0; +/*! perform a state change while keeping the current timer running. + * + * This is useful to keep a timeout across several states (without having to round the + * remaining time to seconds). + * + * Best invoke via the osmo_fsm_inst_state_chg_keep_timer() macro which logs the source + * file where the state change was effected. Alternatively, you may pass \a + * file as NULL to use the normal file/line indication instead. + * + * All changes to the FSM instance state must be made via an osmo_fsm_inst_state_chg_* + * function. It verifies that the existing state actually permits a + * transition to new_state. + * + * \param[in] fi FSM instance whose state is to change + * \param[in] new_state The new state into which we should change + * \param[in] file Calling source file (from osmo_fsm_inst_state_chg macro) + * \param[in] line Calling source line (from osmo_fsm_inst_state_chg macro) + * \returns 0 on success; negative on error + */ +int _osmo_fsm_inst_state_chg_keep_timer(struct osmo_fsm_inst *fi, uint32_t new_state, + const char *file, int line) +{ + return state_chg(fi, new_state, true, 0, 0, file, line); } /*! dispatch an event to an osmocom finite state machine instance diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c index e34164c..34a8399 100644 --- a/tests/fsm/fsm_test.c +++ b/tests/fsm/fsm_test.c @@ -266,6 +266,89 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); } +const struct timeval fake_time_start_time = { 123, 456 }; + +#define fake_time_passes(secs, usecs) do \ +{ \ + struct timeval diff; \ + osmo_gettimeofday_override_add(secs, usecs); \ + osmo_clock_override_add(CLOCK_MONOTONIC, secs, usecs * 1000); \ + timersub(&osmo_gettimeofday_override_time, &fake_time_start_time, &diff); \ + fprintf(stderr, "Total time passed: %d.%06d s\n", \ + (int)diff.tv_sec, (int)diff.tv_usec); \ + osmo_timers_prepare(); \ + osmo_timers_update(); \ +} while (0) + +void fake_time_start() +{ + struct timespec *clock_override; + + osmo_gettimeofday_override_time = fake_time_start_time; + osmo_gettimeofday_override = true; + clock_override = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + OSMO_ASSERT(clock_override); + clock_override->tv_sec = fake_time_start_time.tv_sec; + clock_override->tv_nsec = fake_time_start_time.tv_usec * 1000; + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + fake_time_passes(0, 0); +} + +static int timeout_fired = 0; +static int timer_cb(struct osmo_fsm_inst *fi) +{ + timeout_fired = fi->T; + return 0; +} + +static void test_state_chg_keep_timer() +{ + struct osmo_fsm_inst *fi; + + fprintf(stderr, "\n--- %s()\n", __func__); + + fsm.timer_cb = timer_cb; + + /* Test that no timer remains no timer */ + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 0, 0); + timeout_fired = -1; + + osmo_fsm_inst_state_chg_keep_timer(fi, ST_TWO); + + OSMO_ASSERT(timeout_fired == -1); + OSMO_ASSERT(fi->T == 0); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + /* Test that a set time continues with exact precision */ + fake_time_start(); + fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, NULL); + OSMO_ASSERT(fi); + + osmo_fsm_inst_state_chg(fi, ST_ONE, 10, 10); + + timeout_fired = -1; + + fake_time_passes(2, 342); + osmo_fsm_inst_state_chg_keep_timer(fi, ST_TWO); + + fake_time_passes(0, 0); + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(7, 1000000 - 342 - 1); + OSMO_ASSERT(timeout_fired == -1); + + fake_time_passes(0, 1); + OSMO_ASSERT(timeout_fired == 10); + + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REQUEST, NULL); + + fprintf(stderr, "--- %s() done\n", __func__); +} + static const struct log_info_cat default_categories[] = { [DMAIN] = { .name = "DMAIN", @@ -306,6 +389,7 @@ osmo_fsm_inst_free(finst); test_id_api(); + test_state_chg_keep_timer(); osmo_fsm_unregister(&fsm); exit(0); diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err index 3237def..85606e2 100644 --- a/tests/fsm/fsm_test.err +++ b/tests/fsm/fsm_test.err @@ -80,4 +80,24 @@ Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST) Test_FSM(arbitrary_id){NULL}: Freeing instance Test_FSM(arbitrary_id){NULL}: Deallocated - \ No newline at end of file + +--- test_state_chg_keep_timer() +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Test_FSM{ONE}: state_chg to TWO +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +Total time passed: 0.000000 s +Test_FSM{NULL}: Allocated +Test_FSM{NULL}: state_chg to ONE +Total time passed: 2.000342 s +Test_FSM{ONE}: state_chg to TWO +Total time passed: 2.000342 s +Total time passed: 9.999999 s +Total time passed: 10.000000 s +Test_FSM{TWO}: Timeout of T10 +Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST) +Test_FSM{TWO}: Freeing instance +Test_FSM{TWO}: Deallocated +--- test_state_chg_keep_timer() done -- To view, visit https://gerrit.osmocom.org/9389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3c0e53b846b2208bd201ace99777f2286ea39ae8 Gerrit-Change-Number: 9389 Gerrit-PatchSet: 2 Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: From jenkins at lists.osmocom.org Thu May 31 22:41:20 2018 From: jenkins at lists.osmocom.org (jenkins at lists.osmocom.org) Date: Thu, 31 May 2018 22:41:20 +0000 (UTC) Subject: =?UTF-8?Q?Build_failed_in_Jenkins:_master-rtl-sdr_=C2=BB_a1=3Ddefau?= =?UTF-8?Q?lt,a2=3Ddefault,a3=3Ddefault,osmocom-master-debian9_#53?= In-Reply-To: <203290681.254.1527720081124.JavaMail.jenkins@jenkins.osmocom.org> References: <203290681.254.1527720081124.JavaMail.jenkins@jenkins.osmocom.org> Message-ID: <158013854.267.1527806480922.JavaMail.jenkins@jenkins.osmocom.org> See ------------------------------------------ [...truncated 93.34 KB...] make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' Making dvi in src make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'dvi-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make check-recursive make[2]: Entering directory ' Making check in include make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' Making check in src make[3]: Entering directory ' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory ' make[3]: Entering directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h ' make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la ' libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai libtool: install: /usr/bin/install -c .libs/librtlsdr.a libtool: install: chmod 644 libtool: install: ranlib libtool: finish: PATH="/usr/local/bin:/usr/bin:/bin:/usr/games:/home/osmocom-build/bin:/sbin" ldconfig -n ---------------------------------------------------------------------- Libraries have been installed in: If you ever happen to want to link against installed libraries in a given directory, LIBDIR, you must either use libtool, and specify the full pathname of the library, or use the '-LLIBDIR' flag during linking and do at least one of the following: - add LIBDIR to the 'LD_LIBRARY_PATH' environment variable during execution - add LIBDIR to the 'LD_RUN_PATH' environment variable during linking - use the '-Wl,-rpath -Wl,LIBDIR' linker flag - have your system administrator add LIBDIR to '/etc/ld.so.conf' See any operating system documentation about shared libraries for more information, such as the ld(1) and ld.so(8) manual pages. ---------------------------------------------------------------------- /bin/mkdir -p ' /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ' libtool: install: /usr/bin/install -c .libs/rtl_sdr libtool: install: /usr/bin/install -c .libs/rtl_tcp libtool: install: /usr/bin/install -c .libs/rtl_test libtool: install: /usr/bin/install -c .libs/rtl_fm libtool: install: /usr/bin/install -c .libs/rtl_eeprom libtool: install: /usr/bin/install -c .libs/rtl_adsb libtool: install: /usr/bin/install -c .libs/rtl_power make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p ' /usr/bin/install -c -m 644 ./doc/html.tar ' /bin/mkdir -p ' /usr/bin/install -c -m 644 librtlsdr.pc ' make install-data-hook make[5]: Entering directory ' cd && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making installcheck in include make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' Making installcheck in src make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck'. make[2]: Leaving directory ' make[2]: Entering directory ' make[2]: Nothing to be done for 'installcheck-am'. make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd ' && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd ' && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f ' libtool: uninstall: rm -f make[2]: Leaving directory ' make[2]: Entering directory ' ( cd ' && rm -f html.tar ) ( cd ' && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make[1]: Leaving directory ' make[1]: Entering directory ' make install-recursive make[2]: Entering directory ' Making install in include make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-14450/ /usr/bin/install -c -m 644 ../../../include/rtl-sdr.h ../../../include/rtl-sdr_export.h '/tmp/am-dc-14450/ make[4]: Leaving directory ' make[3]: Leaving directory ' Making install in src make[3]: Entering directory ' make[4]: Entering directory ' /bin/mkdir -p '/tmp/am-dc-14450/ /bin/bash ../libtool --mode=install /usr/bin/install -c librtlsdr.la '/tmp/am-dc-14450/ libtool: install: /usr/bin/install -c .libs/librtlsdr.so.0.0.5 /tmp/am-dc-14450/ libtool: install: (cd /tmp/am-dc-14450/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so.0 || { rm -f librtlsdr.so.0 && ln -s librtlsdr.so.0.0.5 librtlsdr.so.0; }; }) libtool: install: (cd /tmp/am-dc-14450/ && { ln -s -f librtlsdr.so.0.0.5 librtlsdr.so || { rm -f librtlsdr.so && ln -s librtlsdr.so.0.0.5 librtlsdr.so; }; }) libtool: install: /usr/bin/install -c .libs/librtlsdr.lai /tmp/am-dc-14450/ libtool: install: /usr/bin/install -c .libs/librtlsdr.a /tmp/am-dc-14450/ libtool: install: chmod 644 /tmp/am-dc-14450/ libtool: install: ranlib /tmp/am-dc-14450/ libtool: warning: remember to run 'libtool --finish /bin/mkdir -p '/tmp/am-dc-14450/ /bin/bash ../libtool --mode=install /usr/bin/install -c rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power '/tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_sdr /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_tcp /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_test /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_fm /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_eeprom /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_adsb /tmp/am-dc-14450/ libtool: warning: 'librtlsdr.la' has not been installed in ' libtool: install: /usr/bin/install -c .libs/rtl_power /tmp/am-dc-14450/ make[4]: Nothing to be done for 'install-data-am'. make[4]: Leaving directory ' make[3]: Leaving directory ' make[3]: Entering directory ' make[4]: Entering directory ' make[4]: Nothing to be done for 'install-exec-am'. /bin/mkdir -p '/tmp/am-dc-14450/ /usr/bin/install -c -m 644 ./doc/html.tar '/tmp/am-dc-14450/ /bin/mkdir -p '/tmp/am-dc-14450/ /usr/bin/install -c -m 644 librtlsdr.pc '/tmp/am-dc-14450/ make install-data-hook make[5]: Entering directory ' cd /tmp/am-dc-14450/ && tar xf html.tar --strip-components 1 && rm -f html.tar make[5]: Leaving directory ' make[4]: Leaving directory ' make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' Making uninstall in include make[2]: Entering directory ' ( cd '/tmp/am-dc-14450/ && rm -f rtl-sdr.h rtl-sdr_export.h ) make[2]: Leaving directory ' Making uninstall in src make[2]: Entering directory ' ( cd '/tmp/am-dc-14450/ && rm -f rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power ) /bin/bash ../libtool --mode=uninstall rm -f '/tmp/am-dc-14450/ libtool: uninstall: rm -f /tmp/am-dc-14450/ /tmp/am-dc-14450/ /tmp/am-dc-14450/ /tmp/am-dc-14450/ /tmp/am-dc-14450/ make[2]: Leaving directory ' make[2]: Entering directory ' ( cd '/tmp/am-dc-14450/ && rm -f html.tar ) ( cd '/tmp/am-dc-14450/ && rm -f librtlsdr.pc ) make uninstall-hook make[3]: Entering directory ' cd /tmp/am-dc-14450/ && rm -rf make[3]: Leaving directory ' make[2]: Leaving directory ' make[1]: Leaving directory ' make[1]: Entering directory ' ERROR: files left after uninstall: (check DESTDIR support) . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . Makefile:757: recipe for target 'distuninstallcheck' failed make[1]: *** [distuninstallcheck] Error 1 make[1]: Leaving directory ' Makefile:701: recipe for target 'distcheck' failed make: *** [distcheck] Error 1 + cat-testlogs.sh Build step 'Execute shell' marked build as failure [WARNINGS]Skipping publisher since build result is FAILURE Not sending mail to unregistered user steve at steve-m.de