Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/armv7l
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: [ 942s] -o=- 1 23 IN IP4 10.9.1.120 [ 942s] -s=- [ 942s] -c=IN IP4 10.9.1.120 [ 942s] -t=0 0 [ 942s] -m=audio 16002 RTP/AVP 98 [ 942s] -a=rtpmap:98 AMR/8000 [ 942s] -a=ptime:20 [ 942s] - [ 942s] -- [ 942s] -response cb received: [ 942s] - head.response_code = 200 [ 942s] - head.trans_id = 1 [ 942s] - head.comment = OK [ 942s] - audio_port = 16002 [ 942s] - audio_ip = 10.9.1.120 [ 942s] - [ 942s] -Generated CRCX message: [ 942s] -CRCX 1 23@mgw MGCP 1.0 [ 942s] -C: 2f [ 942s] -I: 11 [ 942s] -L: p:20, a:AMR, nt:IN [ 942s] -M: sendrecv [ 942s] - [ 944s] -Generated MDCX mes[ 886.510285] SysRq : Power Off [ 944s] [ 886.590583] reboot: Power down [ 945s] ### VM INTERACTION END ### [ 945s] [ 945s] armbuild21 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 22:20:53 UTC 2017. [ 945s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
meta-telephony[201705]: libosmo-abis: Split libosmo-trau into its own package
Patch Set 1: Code-Review-1
(2 comments)
libosmo-trau -> libosmotrau and the rest looks fine.
https://gerrit.osmocom.org/#/c/5169/1/recipes-osmocom/libosmo-abis/libosmo-abis.inc
File recipes-osmocom/libosmo-abis/libosmo-abis.inc:
Line 7: INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
We can drop the INC_PR with our version of Yocto/Poky Linux
Line 13: PACKAGES =+ "libosmo-trau libosmo-trau-dev"
call it libosmotrau when the library is called like this?
--
To view, visit https://gerrit.osmocom.org/5169
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ica8b6c39aed9f3370aeab84e821c8de871d2f0be
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Holger Freyther
Gerrit-HasComments: Yes
meta-telephony[201705]: libosmo-abis: Remove unused patch
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5168 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7cf50808f0b826e82614ecd5844ab082ac017873 Gerrit-PatchSet: 1 Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Holger Freyther Gerrit-HasComments: No
Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/aarch64
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: [ 549s] | configure:7598: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 549s] | configure:7598: $? = 0 [ 549s] | configure:7671: gcc -o conftest -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro conftest.c >&5 [ 549s] | configure:7671: $? = 0 [ 549s] | configure:7671: ./conftest [ 549s] | configure:7671: $? = 0 [ 549s] | configure:7682: result: yes [ 549s] | configure:7695: checking for sys/types.h [ 549s] | configure:7695: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 549s] | configure:7695: $? = 0 [ 549s] | configure:7695: result: yes [ 549s] | configure:7695: checking for sys/stat.h [ 549s] | configure:7695: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 549s] | configure:7695: $? = 0 [ 549s] | configure:7695: result: yes [ 549s] | configure:7695: checking for stdlib.h [ 549s] | configure:7695: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 549s] | configure:7695: $? = 0 [ 549s] | configure:7695: result: yes [ 549s] | configure:7695: checking for string.h [ 549s] | configure:7695: gcc -c -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 conftest.c >&5 [ 549s] | configure:7695: $? = 0 [ 549s] | configure:7695: result: yes [ 551s] | configure[ 502.874011] sysrq: SysRq : Power Off [ 551s] [ 502.895302] reboot: Power down [ 551s] ### VM INTERACTION END ### [ 551s] [ 551s] obs-arm-1 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:27:35 UTC 2017. [ 551s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_17.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_17.04/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 189s] | #define HAVE_SYS_TYPES_H 1 [ 189s] | #define HAVE_SYS_STAT_H 1 [ 189s] | #define HAVE_STDLIB_H 1 [ 189s] | #define HAVE_STRING_H 1 [ 189s] | #define HAVE_MEMORY_H 1 [ 189s] | #define HAVE_STRINGS_H 1 [ 189s] | #define HAVE_INTTYPES_H 1 [ 189s] | #define HAVE_STDINT_H 1 [ 189s] | #define HAVE_UNISTD_H 1 [ 189s] | #define HAVE_DLFCN_H 1 [ 189s] | #define LT_OBJDIR ".libs/" [ 189s] | [ 189s] | configure: exit 0 [ 189s] [ 189s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 189s] make[1]: *** [override_dh_auto_test] Error 1 [ 189s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 189s] debian/rules:17: recipe for target 'build' failed [ 189s] make: *** [build] Error 2 [ 189s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 189s] [ 189s] lamb57 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:16:04 UTC 2017. [ 189s] [ 189s] ### VM INTERACTION START ### [ 192s] [ 178.719448] reboot: Power down [ 192s] ### VM INTERACTION END ### [ 192s] [ 192s] lamb57 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:16:08 UTC 2017. [ 192s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_16.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 135s] -M: sendrecv [ 135s] - [ 135s] -- [ 135s] -composed response: [ 135s] -- [ 135s] -200 1 OK [ 135s] -I: 1 [ 135s] - [ 135s] -v=0 [ 135s] - [ 135s] -- [ 135s] -Done [ 135s] ./testsuite.at:21: exit code was 139, expected 0 [ 135s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 135s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 135s] make[1]: *** [override_dh_auto_test] Error 1 [ 135s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 135s] debian/rules:17: recipe for target 'build' failed [ 135s] make: *** [build] Error 2 [ 135s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 135s] [ 135s] lamb66 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:12:46 UTC 2017. [ 135s] [ 135s] ### VM INTERACTION START ### [ 138s] [ 130.912264] reboot: Power down [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb66 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:12:49 UTC 2017. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_16.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_16.10/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 96s] -M: sendrecv [ 96s] - [ 96s] -- [ 96s] -composed response: [ 96s] -- [ 96s] -200 1 OK [ 96s] -I: 1 [ 96s] - [ 96s] -v=0 [ 96s] - [ 96s] -- [ 96s] -Done [ 96s] ./testsuite.at:21: exit code was 139, expected 0 [ 96s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 96s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 96s] make[1]: *** [override_dh_auto_test] Error 1 [ 96s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 96s] debian/rules:17: recipe for target 'build' failed [ 96s] make: *** [build] Error 2 [ 96s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 96s] [ 96s] lamb27 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:22 UTC 2017. [ 96s] [ 96s] ### VM INTERACTION START ### [ 99s] [ 91.350985] reboot: Power down [ 99s] ### VM INTERACTION END ### [ 99s] [ 99s] lamb27 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:25 UTC 2017. [ 99s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_8.0/i586 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 103s] - [ 103s] -- [ 103s] -composed response: [ 103s] -- [ 103s] -200 1 OK [ 103s] -I: 1 [ 103s] - [ 103s] -v=0 [ 103s] - [ 103s] -- [ 103s] -Done [ 103s] ./testsuite.at:21: exit code was 139, expected 0 [ 103s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 103s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 103s] make[1]: *** [override_dh_auto_test] Error 1 [ 103s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 103s] debian/rules:17: recipe for target 'build' failed [ 103s] make: *** [build] Error 2 [ 103s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 103s] [ 103s] lamb27 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:14 UTC 2017. [ 103s] [ 103s] ### VM INTERACTION START ### [ 104s] Powering off. [ 104s] [ 97.561515] reboot: Power down [ 104s] ### VM INTERACTION END ### [ 104s] [ 104s] lamb27 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:16 UTC 2017. [ 104s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 201s] | #define HAVE_SYS_STAT_H 1 [ 201s] | #define HAVE_STDLIB_H 1 [ 201s] | #define HAVE_STRING_H 1 [ 201s] | #define HAVE_MEMORY_H 1 [ 201s] | #define HAVE_STRINGS_H 1 [ 201s] | #define HAVE_INTTYPES_H 1 [ 201s] | #define HAVE_STDINT_H 1 [ 201s] | #define HAVE_UNISTD_H 1 [ 201s] | #define HAVE_DLFCN_H 1 [ 201s] | #define LT_OBJDIR ".libs/" [ 201s] | [ 201s] | configure: exit 0 [ 201s] [ 201s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 201s] make[1]: *** [override_dh_auto_test] Error 1 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] debian/rules:17: recipe for target 'build' failed [ 201s] make: *** [build] Error 2 [ 201s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 201s] [ 201s] wildcard2 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:07 UTC 2017. [ 201s] [ 201s] ### VM INTERACTION START ### [ 201s] Powering off. [ 201s] [ 181.664593] reboot: Power down [ 202s] ### VM INTERACTION END ### [ 202s] [ 202s] wildcard2 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:09 UTC 2017. [ 202s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_17.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 95s] -- [ 95s] -200 1 OK [ 95s] -I: 1 [ 95s] - [ 95s] -v=0 [ 95s] - [ 95s] -- [ 95s] -Done [ 95s] ./testsuite.at:21: exit code was 139, expected 0 [ 95s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 95s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 95s] make[1]: *** [override_dh_auto_test] Error 1 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] debian/rules:17: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb26 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:21 UTC 2017. [ 95s] [ 95s] ### VM INTERACTION START ### [ 95s] [ 87.580898] serial8250: too much work for irq4 [ 95s] [ 87.776191] serial8250: too much work for irq4 [ 95s] [ 87.937076] serial8250: too much work for irq4 [ 95s] [ 88.028100] serial8250: too much work for irq4 [ 98s] [ 90.986290] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb26 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:11:25 UTC 2017. [ 98s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 106s] -M: sendrecv [ 106s] - [ 106s] -- [ 106s] -composed response: [ 106s] -- [ 106s] -200 1 OK [ 106s] -I: 1 [ 106s] - [ 106s] -v=0 [ 106s] - [ 106s] -- [ 106s] -Done [ 106s] ./testsuite.at:21: exit code was 139, expected 0 [ 106s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 106s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 106s] make[1]: *** [override_dh_auto_test] Error 1 [ 106s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 106s] debian/rules:17: recipe for target 'build' failed [ 106s] make: *** [build] Error 2 [ 106s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 106s] [ 106s] lamb26 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:10:16 UTC 2017. [ 106s] [ 106s] ### VM INTERACTION START ### [ 110s] [ 101.485505] reboot: Power down [ 110s] ### VM INTERACTION END ### [ 110s] [ 110s] lamb26 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:10:19 UTC 2017. [ 110s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_17.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_17.04/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 138s] -M: sendrecv [ 138s] - [ 138s] -- [ 138s] -composed response: [ 138s] -- [ 138s] -200 1 OK [ 138s] -I: 1 [ 138s] - [ 138s] -v=0 [ 138s] - [ 138s] -- [ 138s] -Done [ 138s] ./testsuite.at:21: exit code was 139, expected 0 [ 138s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 138s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 138s] make[1]: *** [override_dh_auto_test] Error 1 [ 138s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 138s] debian/rules:17: recipe for target 'build' failed [ 138s] make: *** [build] Error 2 [ 138s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 138s] [ 138s] lamb03 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:50 UTC 2017. [ 138s] [ 138s] ### VM INTERACTION START ### [ 141s] [ 125.622879] reboot: Power down [ 141s] ### VM INTERACTION END ### [ 141s] [ 141s] lamb03 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:55 UTC 2017. [ 141s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_9.0/i586 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 120s] | #define HAVE_SYS_TYPES_H 1 [ 120s] | #define HAVE_SYS_STAT_H 1 [ 120s] | #define HAVE_STDLIB_H 1 [ 120s] | #define HAVE_STRING_H 1 [ 120s] | #define HAVE_MEMORY_H 1 [ 120s] | #define HAVE_STRINGS_H 1 [ 120s] | #define HAVE_INTTYPES_H 1 [ 120s] | #define HAVE_STDINT_H 1 [ 120s] | #define HAVE_UNISTD_H 1 [ 120s] | #define HAVE_DLFCN_H 1 [ 120s] | #define LT_OBJDIR ".libs/" [ 120s] | [ 120s] | configure: exit 0 [ 120s] [ 120s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 120s] make[1]: *** [override_dh_auto_test] Error 1 [ 120s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 120s] debian/rules:17: recipe for target 'build' failed [ 120s] make: *** [build] Error 2 [ 120s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 120s] [ 120s] lamb05 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:25 UTC 2017. [ 120s] [ 120s] ### VM INTERACTION START ### [ 123s] [ 114.658788] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] lamb05 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:29 UTC 2017. [ 123s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_16.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_16.10/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 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 0 [ 99s] [ 99s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 99s] make[1]: *** [override_dh_auto_test] Error 1 [ 99s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 99s] debian/rules:17: recipe for target 'build' failed [ 99s] make: *** [build] Error 2 [ 99s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 99s] [ 99s] lamb12 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:06 UTC 2017. [ 99s] [ 99s] ### VM INTERACTION START ### [ 102s] [ 94.798568] reboot: Power down [ 102s] ### VM INTERACTION END ### [ 102s] [ 102s] lamb12 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:10 UTC 2017. [ 102s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-mgw failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 114s] -M: sendrecv [ 114s] - [ 114s] -- [ 114s] -composed response: [ 114s] -- [ 114s] -200 1 OK [ 114s] -I: 1 [ 114s] - [ 114s] -v=0 [ 114s] - [ 114s] -- [ 114s] -Done [ 114s] ./testsuite.at:21: exit code was 139, expected 0 [ 114s] 3. testsuite.at:17: 3. mgcp_client (testsuite.at:17): FAILED (testsuite.at:21) [ 114s] debian/rules:30: recipe for target 'override_dh_auto_test' failed [ 114s] make[1]: *** [override_dh_auto_test] Error 1 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 114s] debian/rules:17: recipe for target 'build' failed [ 114s] make: *** [build] Error 2 [ 114s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 114s] [ 114s] lamb07 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:18 UTC 2017. [ 114s] [ 114s] ### VM INTERACTION START ### [ 117s] [ 109.156358] reboot: Power down [ 117s] ### VM INTERACTION END ### [ 117s] [ 117s] lamb07 failed "build osmo-mgw_1.2.0.20171204.dsc" at Mon Dec 4 20:07:22 UTC 2017. [ 117s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[ABANDON] osmo-gsm-tester[master]: Reserve ARFCN dynamically based on BTS band support
Pau Espin Pedrol has abandoned this change. Change subject: Reserve ARFCN dynamically based on BTS band support .. Abandoned -- To view, visit https://gerrit.osmocom.org/3731 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6fb5d95bed1fa50c3deaf62a7a6df3cb276bc3c9 Gerrit-PatchSet: 7 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-Reviewer: neels
osmo-gsm-tester[master]: OsmoPcuSysmo: Integrate with Sysmobts and OsmoSgsn
Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/5006/2/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl File src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl: Line 77: gprs nsvc 0 local udp port 23000 Reminder: I shall set this one to 23020 like already done in osmo-bsc.cfg.tmpl Line 81: % else: > indent is not same as '% if' Thanks, I'll fix it. -- To view, visit https://gerrit.osmocom.org/5006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I01485c5d74e5fe62d0ffea9eb1fad29041426eef Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
osmo-gsm-tester[master]: OsmoBtsOctphy: Integrate with OsmoPcu and OsmoSgsn
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/#/c/5008/2/src/osmo_gsm_tester/bts_octphy.py
File src/osmo_gsm_tester/bts_octphy.py:
Line 177: config.overlay(values, sgsn_conf)
> heh, why not
What would happen then? because self.sgsn is None in that case. Does overlay()
actually handle that correctly and replaces it with {} ? I don't like the idea
of being able to pass None to that method and I'd like to avoid it. This way is
more clear to understand what's the result inside overlay.
--
To view, visit https://gerrit.osmocom.org/5008
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I54780971d711d47b23976dd044a4a53134dd4299
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-Reviewer: Pau Espin Pedrol
Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add OsmoPcu class
Patch Set 2: (3 comments) https://gerrit.osmocom.org/#/c/5004/2/src/osmo_gsm_tester/pcu_osmo.py File src/osmo_gsm_tester/pcu_osmo.py: Line 43: # othwerwise osmo-pcu ends after connecting to socket with "pcu_l1_if.cpp:416 BTS not available" > (typo otherwise) I'll fix it. Line 44: event_loop.wait(self, self.bts.ready_for_pcu) > decided that this is worth a -1. As I said, I don't agree. Once we support doing something useful once we hit the BTS not available, like re-connecting, we can just drop this line and we will from time to time hit it due to race conditions, and if something goes wrong it will fail. So there's no benefit really in having this in each and every test. https://gerrit.osmocom.org/#/c/5004/2/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl File src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl: Line 5: logging level all debug > careful with all-debug on lower layers. We might get a mad log flood here. It logs a lot of stuff but I think for now it's fine since I'm adding support for related features and debugging it. We can always drop to a lower lever in the future once we add some missing features (gprs data) and we have them working. -- To view, visit https://gerrit.osmocom.org/5004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04d8ed5e02b090d07e91669df44ce354bc6ee749 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add class OsmoPcuSysmo
Patch Set 2: (2 comments) https://gerrit.osmocom.org/#/c/5003/2/src/osmo_gsm_tester/pcu_sysmo.py File src/osmo_gsm_tester/pcu_sysmo.py: Line 49: event_loop.wait(self, self.sysmobts.ready_for_pcu) > expecting this to be part of the test script. We should not make assumption I don't agree here. This is just a workaround for the current implementation as otherwise the process will fail. It's a known issue/limitation and improvement for it is being tracked in a task in redmime. Once osmo-pcu supports re-connecting to osmo-bts if it's not available, then we can drop this code. Test doesn't care about this implementation specific things, let's not add more boilerplate to all test for something which is strictly not needed from tester point of view. Line 84: def _process_remote(self, name, popen_args, remote_cwd=None): > (might make sense to have a common "run on sysmobts" api, but ok since we s I agree that we need to improve the code sharing by using several levels of classes and interfaces, but for now the quick way to add features requires is to do it like this. -- To view, visit https://gerrit.osmocom.org/5003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6fbb71df1ad36e5d7eb02f3fdd7987a178d523d3 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] meta-telephony[201705]: osmocom: Use CONFFILES for cfg files
Review at https://gerrit.osmocom.org/5178
osmocom: Use CONFFILES for cfg files
Change-Id: I4a4c7d4a5e3e58c413c82b75f442ae9321d64998
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
M recipes-osmocom/osmo-bsc/osmo-bsc.inc
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
M recipes-osmocom/osmo-hlr/osmo-hlr.inc
M recipes-osmocom/osmo-iuh/osmo-iuh.inc
M recipes-osmocom/osmo-mgw/osmo-mgw.inc
M recipes-osmocom/osmo-msc/osmo-msc.inc
M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
8 files changed, 25 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/78/5178/1
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index ed28cea..a335993 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -4,7 +4,7 @@
SRCREV = "54fa75b85c91bb4bb79960942f63968f6423f6a5"
SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
PV = "0.7.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
# we require the tests to link to the static libosmo-sigtran library to
# access symbols not starting with osmo_*
@@ -31,3 +31,4 @@
${bindir}/osmo-stp \
${sysconfdir}/osmocom/osmo-stp.cfg \
"
+CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
index dfa332a..820baf5 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
@@ -5,7 +5,7 @@
DEPENDS = "sqlite3 libosmocore libosmo-abis libosmo-sccp libosmo-netif
osmo-mgw"
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -23,6 +23,8 @@
SYSTEMD_PACKAGES = "osmo-bsc"
SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service"
+CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg"
+
FILES_ipaccess-utils = " \
${bindir}/ipaccess-find \
${bindir}/ipaccess-config \
@@ -33,5 +35,6 @@
${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 "
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 2751985..3aafe13 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -3,7 +3,7 @@
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
PV = "1.0.0+gitr${SRCPV}"
-PR = "r0"
+PR = "r1"
SRCREV = "859f9b0752419d43928d465bc96a87238c6d7940"
SRC_URI = "git://git.osmocom.org/osmo-ggsn \
@@ -35,6 +35,8 @@
INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn"
INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29"
+CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"
+
FILES_libgtp = "${libdir}/*${SOLIBS}"
FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
FILES_libgtp-staticdev = "${libdir}/*.a"
diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc
b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
index 8afe774..7dd6234 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="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -24,3 +24,7 @@
}
SYSTEMD_SERVICE_${PN} = "${PN}.service"
+CONFFILES_osmo-hlr = "\
+ ${sysconfdir}/osmocom/osmo-hlr.cfg \
+ ${localstatedir}/lib/osmocom/hlr.db \
+ "
diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc
b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
index a5f1cbc..2737412 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="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -35,5 +35,6 @@
${bindir}/osmo-hnbgw \
${sysconfdir}/osmocom/osmo-hnbgw.cfg \
"
+CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg"
ALLOW_EMPTY_${PN} = "1"
diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc
b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
index 45ee338..1b3362f 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="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -20,3 +20,4 @@
}
SYSTEMD_SERVICE_osmo-mgw = "osmo-bsc-mgcp.service"
+CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
[PATCH] meta-telephony[201705]: osmo-sgsn: Install example osmo-gtphub config file
Review at https://gerrit.osmocom.org/5177
osmo-sgsn: Install example osmo-gtphub config file
Change-Id: Ie8ee1e4b1e0d0a7ca00764a1906b1ff26b7bea4d
---
M recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/77/5177/1
diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
index 77029a0..74a6bd4 100644
--- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
@@ -5,7 +5,7 @@
DEPENDS = "c-ares libpcap libosmocore libosmo-netif libosmo-sccp osmo-ggsn"
-INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
inherit autotools pkgconfig systemd
@@ -18,6 +18,7 @@
install -m 0644 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg
${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
${D}${sysconfdir}/osmocom/
+ install -m 0644 ${S}/doc/examples/osmo-gtphub/osmo-gtphub.cfg
${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service
${D}${systemd_system_unitdir}/
install -m 0644 ${S}/contrib/systemd/osmo-gbproxy.service
${D}${systemd_system_unitdir}/
--
To view, visit https://gerrit.osmocom.org/5177
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8ee1e4b1e0d0a7ca00764a1906b1ff26b7bea4d
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol
osmo-gsm-tester[master]: OsmoBtsOctphy: Integrate with OsmoPcu and OsmoSgsn
Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/5008/2/src/osmo_gsm_tester/bts_octphy.py File src/osmo_gsm_tester/bts_octphy.py: Line 177: config.overlay(values, sgsn_conf) heh, why not if self.sgsn: config.overlay... -- To view, visit https://gerrit.osmocom.org/5008 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I54780971d711d47b23976dd044a4a53134dd4299 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add OsmoPcu class
Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/5004/2/src/osmo_gsm_tester/pcu_osmo.py File src/osmo_gsm_tester/pcu_osmo.py: Line 44: event_loop.wait(self, self.bts.ready_for_pcu) > oh, here it is. I'd have expected this in a test script instead. decided that this is worth a -1. We should not make assumptions on the scenario that the test scripts want to test. Maybe we want to provoke such "BTS not available" in some test? -- To view, visit https://gerrit.osmocom.org/5004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04d8ed5e02b090d07e91669df44ce354bc6ee749 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add class OsmoPcuSysmo
Patch Set 2: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/5003/2/src/osmo_gsm_tester/pcu_sysmo.py File src/osmo_gsm_tester/pcu_sysmo.py: Line 49: event_loop.wait(self, self.sysmobts.ready_for_pcu) expecting this to be part of the test script. We should not make assumptions on the scenario that the test scripts want to test. Maybe we want to provoke such "BTS not available" in some test? Line 84: def _process_remote(self, name, popen_args, remote_cwd=None): (might make sense to have a common "run on sysmobts" api, but ok since we seem to be going for code dup instead generally) -- To view, visit https://gerrit.osmocom.org/5003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6fbb71df1ad36e5d7eb02f3fdd7987a178d523d3 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add OsmoGgsn class
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5001 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0eed70838e4e8656c4bc1337df70e631a10d69c7 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-gsm-tester[master]: Add OsmoSgsn class
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5002 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iec370a444998c632b3615ad1a6d6f67e64e2bfeb Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-gsm-tester[master]: OsmoPcuSysmo: Integrate with Sysmobts and OsmoSgsn
Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/5006/2/src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl File src/osmo_gsm_tester/templates/osmo-nitb.cfg.tmpl: Line 81: % else: indent is not same as '% if' -- To view, visit https://gerrit.osmocom.org/5006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I01485c5d74e5fe62d0ffea9eb1fad29041426eef Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Add OsmoPcu class
Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/#/c/5004/2/src/osmo_gsm_tester/pcu_osmo.py File src/osmo_gsm_tester/pcu_osmo.py: Line 43: # othwerwise osmo-pcu ends after connecting to socket with "pcu_l1_if.cpp:416 BTS not available" (typo otherwise) Line 44: event_loop.wait(self, self.bts.ready_for_pcu) oh, here it is. I'd have expected this in a test script instead. https://gerrit.osmocom.org/#/c/5004/2/src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl File src/osmo_gsm_tester/templates/osmo-pcu.cfg.tmpl: Line 5: logging level all debug careful with all-debug on lower layers. We might get a mad log flood here. (At least in osmo-bts, we don't want debug logging on for everything.) Have you verified that the PCU log is not growing to megabytes quickly with this? -- To view, visit https://gerrit.osmocom.org/5004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04d8ed5e02b090d07e91669df44ce354bc6ee749 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-gsm-tester[master]: OsmoBtsTrx: Integrate with OsmoPcu and OsmoSgsn
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5007 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I777835345355538a945599fb088630af63dc9140 Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-bsc[master]: mgcp: cancel transactions on timeout
Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/5157/1/include/osmocom/bsc/osmo_bsc_mgcp.h File include/osmocom/bsc/osmo_bsc_mgcp.h: Line 47:mgcp_trans_id_t mgw_pending_trans; (makes me think ... this requires that we only have a single MGCP transaction pending at any given time. At the moment we do, right?) https://gerrit.osmocom.org/#/c/5157/1/src/osmo-bsc/osmo_bsc_mgcp.c File src/osmo-bsc/osmo_bsc_mgcp.c: Line 825: mgcp_client_cancel(mgcp, mgcp_ctx->mgw_pending_trans); Can it happen that no mgw_pending_trans was set? If yes, we might cancel an unrelated transaction. -- To view, visit https://gerrit.osmocom.org/5157 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I40794dff7d10e2b6a96863a2da7e9fbd5662a1bf Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
osmo-mgw[master]: mgcp_test: add returncode check
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5174 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9bce9ca39b7751b557374b7ab57c6c9005bcdb7d Gerrit-PatchSet: 2 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-mgw[master]: mgcp_test: fix possible double free
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5175 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2d044382c0bb66e190400e3397449c3f2387359a Gerrit-PatchSet: 2 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[PATCH] osmo-ggsn[master]: ggsn: Ignore PCO with length 0, don't abort processing
Review at https://gerrit.osmocom.org/5176 ggsn: Ignore PCO with length 0, don't abort processing The existing code would abort iterating over the list of PCO TLVs if a TLV of length zero was encountered. However, there's nothing in the spec that would make a zero-length PCO invalid, so we should continue to iterate over any PCO TLVs after the zero-length one. This issue was discovered while writing test cases in osmo-ttcn3-hacks.git Change-Id: I36660566a8ee2ca80ae6ee99c86e167e7c208df2 --- M ggsn/ggsn.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/76/5176/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index 82e1b12..e2ff88c 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -400,8 +400,6 @@ uint8_t cur_len = cur[2]; if (cur_prot == prot) return true; - if (cur_len == 0) - break; cur += cur_len + 3; } return false; -- To view, visit https://gerrit.osmocom.org/5176 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36660566a8ee2ca80ae6ee99c86e167e7c208df2 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-mgw[master]: conn: remove assertions
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5107 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7badc729e97b76701abbce6a73a1ad1e46d3fee0 Gerrit-PatchSet: 4 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: No
osmo-mgw[master]: mgcp_test: fix wrong strcmp() parameters
Patch Set 1: Code-Review+2
(2 comments)
https://gerrit.osmocom.org/#/c/5172/1/tests/mgcp/mgcp_test.c
File tests/mgcp/mgcp_test.c:
Line 796: if (msg && strcmp(t->name, "CRCX") == 0) {
lol, didn't even see the missing quotes ... so much for picking too general
macro names further above
Line 799: OSMO_ASSERT(rc == 0);
since there's just a single evaluator of rc, I'd have called
OSMO_ASSERT(get_conn_id...() == 0);
directly, but whatever
--
To view, visit https://gerrit.osmocom.org/5172
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If4f3ed2c3572da196160569a9705b7a302b700a9
Gerrit-PatchSet: 1
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-HasComments: Yes
osmo-gsm-tester[master]: suites: gprs: Introduce suite with ping test
Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/5011/3/suites/gprs/ping.py File suites/gprs/ping.py: Line 29: bts.start() > wait(bts.ready_for_pcu) ? That's done by the pcu automatically when needed. -- To view, visit https://gerrit.osmocom.org/5011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8695029cb7a43cd48f650c88f38b4c054da0bc6b Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: Yes
osmo-mgw[master]: mgcp_test: fix nullpointer dereference
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5173 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269 Gerrit-PatchSet: 2 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-mgw[master]: client: use string as connection identifier
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5167 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I395a23c1828cf216031d69d481ad35dd458ee7d4 Gerrit-PatchSet: 2 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: neels Gerrit-HasComments: No
[PATCH] osmo-mgw[master]: mgcp_test: fix possible double free
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/5175
to look at the new patch set (#2).
mgcp_test: fix possible double free
Change-Id: I2d044382c0bb66e190400e3397449c3f2387359a
---
M tests/mgcp/mgcp_test.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/5175/2
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index ee49eef..330d24d 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -685,7 +685,8 @@
printf("(response does not contain a connection
id)\n");
}
- msgb_free(msg);
+ if (msg)
+ msgb_free(msg);
if (dummy_packets)
printf("Dummy packets: %d\n", dummy_packets);
--
To view, visit https://gerrit.osmocom.org/5175
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I2d044382c0bb66e190400e3397449c3f2387359a
Gerrit-PatchSet: 2
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-mgw[master]: mgcp_test: add returncode check
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/5174
to look at the new patch set (#2).
mgcp_test: add returncode check
The returncode of get_conn_id_from_response() is unchecked, which
is intentional since some of the test messages will intentionally cause
this function to fail (the response does not inclde a connection
identifier). This means it makes no sense to assert this function
to a fixed value.
In order to spot regressions better print a log message depending
on the return code.
Change-Id: I9bce9ca39b7751b557374b7ab57c6c9005bcdb7d
Fixes: Coverity CID#180534
---
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
2 files changed, 33 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/5174/2
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 1c57347..ee49eef 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -636,6 +636,7 @@
int i;
struct mgcp_conn_rtp *conn = NULL;
char last_conn_id[256];
+ int rc;
cfg = mgcp_config_alloc();
@@ -675,9 +676,14 @@
OSMO_ASSERT(false);
}
- if (msg)
- get_conn_id_from_response(msg->data, last_conn_id,
- sizeof(last_conn_id));
+ if (msg) {
+ rc = get_conn_id_from_response(msg->data, last_conn_id,
+ sizeof(last_conn_id));
+ if (rc)
+ printf("(response contains a connection id)\n");
+ else
+ printf("(response does not contain a connection
id)\n");
+ }
msgb_free(msg);
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index c764531..23f0658 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -22,6 +22,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing AUEP2
@@ -33,6 +34,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing MDCX1
@@ -44,6 +46,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing MDCX2
@@ -55,6 +58,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing CRCX
@@ -75,6 +79,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -88,6 +93,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -111,6 +117,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -134,6 +141,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -157,6 +165,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -180,6 +189,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -203,6 +213,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Testing MDCX4_RO
@@ -217,6 +228,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -231,6 +243,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(resp
[PATCH] osmo-mgw[master]: mgcp_test: fix nullpointer dereference
Hello Neels Hofmeyr, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/5173
to look at the new patch set (#2).
mgcp_test: fix nullpointer dereference
Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269
Fixes: Coverity CID#180536
---
M tests/mgcp/mgcp_test.c
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/73/5173/2
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 86edf00..1c57347 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -788,7 +788,7 @@
msg = mgcp_handle_message(cfg, inp);
msgb_free(inp);
- if (check_response(msg->data, t->exp_resp) != 0) {
+ if (msg && check_response(msg->data, t->exp_resp) != 0) {
printf("%s failed '%s'\n", t->name, (char *)msg->data);
OSMO_ASSERT(false);
}
@@ -799,7 +799,8 @@
OSMO_ASSERT(rc == 0);
}
- msgb_free(msg);
+ if (msg)
+ msgb_free(msg);
/* Retransmit... */
printf("Re-transmitting %s\n", t->name);
--
To view, visit https://gerrit.osmocom.org/5173
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269
Gerrit-PatchSet: 2
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr
osmo-gsm-tester[master]: bts_*: Add ready_for_pcu API
Patch Set 1: Yes it is used afterwards in another commit, but that one is already quite big so it's better to split this into a former commit -- To view, visit https://gerrit.osmocom.org/5067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7209589f60bda63094336e417638906be5e273c4 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
osmo-mgw[master]: mgcp_test: fix nullpointer dereferentiation
Patch Set 1: Code-Review+2
(1 comment)
https://gerrit.osmocom.org/#/c/5173/1//COMMIT_MSG
Commit Message:
Line 7: mgcp_test: fix nullpointer dereferentiation
("dereference" or "dereferencing")
--
To view, visit https://gerrit.osmocom.org/5173
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269
Gerrit-PatchSet: 1
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr
Gerrit-HasComments: Yes
osmo-gsm-tester[master]: suites: gprs: Introduce suite with ping test
Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/5011/3/suites/gprs/ping.py File suites/gprs/ping.py: Line 29: bts.start() wait(bts.ready_for_pcu) ? -- To view, visit https://gerrit.osmocom.org/5011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8695029cb7a43cd48f650c88f38b4c054da0bc6b Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: Yes
osmo-gsm-tester[master]: bts_*: Add ready_for_pcu API
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/5067/1//COMMIT_MSG Commit Message: Line 11: "pcu_l1_if.cpp:416 BTS not available" there's no caller though, I assume that will follow in a test case? -- To view, visit https://gerrit.osmocom.org/5067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7209589f60bda63094336e417638906be5e273c4 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
osmo-gsm-tester[master]: bts_*: Add ready_for_pcu API
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7209589f60bda63094336e417638906be5e273c4 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
osmo-gsm-tester[master]: resource: next_lac: Avoid using LAC 0
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6c1bef81040e2c6210177f04743e7acf3eb9ad8f 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
osmo-gsm-tester[master]: suites: gprs: Introduce suite with ping test
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8695029cb7a43cd48f650c88f38b4c054da0bc6b Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: No
osmo-gsm-tester[master]: bts_*: Add incrementing bvci and rac values
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie65d7d33322c775a1040b5c81f367d882a7c2c5b 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-HasComments: No
[PATCH] osmo-mgw[master]: mgcp_test: fix wrong strcmp() parameters
Review at https://gerrit.osmocom.org/5172
mgcp_test: fix wrong strcmp() parameters
The CRCX string parameter lacks the quotes and the result of
the function call is not checked against zero. Also the
return code of get_conn_id_from_response() is not asserted.
Fixes: Coverity CID#180534
Change-Id: If4f3ed2c3572da196160569a9705b7a302b700a9
---
M tests/mgcp/mgcp_test.c
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/72/5172/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index fb99911..86edf00 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -765,6 +765,7 @@
struct mgcp_config *cfg;
int i;
char last_conn_id[256];
+ int rc;
cfg = mgcp_config_alloc();
@@ -792,9 +793,11 @@
OSMO_ASSERT(false);
}
- if (msg && strcmp(t->name, CRCX))
- get_conn_id_from_response(msg->data, last_conn_id,
- sizeof(last_conn_id));
+ if (msg && strcmp(t->name, "CRCX") == 0) {
+ rc = get_conn_id_from_response(msg->data, last_conn_id,
+ sizeof(last_conn_id));
+ OSMO_ASSERT(rc == 0);
+ }
msgb_free(msg);
--
To view, visit https://gerrit.osmocom.org/5172
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4f3ed2c3572da196160569a9705b7a302b700a9
Gerrit-PatchSet: 1
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
[PATCH] osmo-mgw[master]: mgcp_test: fix nullpointer dereferentiation
Review at https://gerrit.osmocom.org/5173
mgcp_test: fix nullpointer dereferentiation
Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269
Fixes: Coverity CID#180536
---
M tests/mgcp/mgcp_test.c
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/73/5173/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 86edf00..1c57347 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -788,7 +788,7 @@
msg = mgcp_handle_message(cfg, inp);
msgb_free(inp);
- if (check_response(msg->data, t->exp_resp) != 0) {
+ if (msg && check_response(msg->data, t->exp_resp) != 0) {
printf("%s failed '%s'\n", t->name, (char *)msg->data);
OSMO_ASSERT(false);
}
@@ -799,7 +799,8 @@
OSMO_ASSERT(rc == 0);
}
- msgb_free(msg);
+ if (msg)
+ msgb_free(msg);
/* Retransmit... */
printf("Re-transmitting %s\n", t->name);
--
To view, visit https://gerrit.osmocom.org/5173
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2ee79eaaca2fada673baf6ff4c226aa16c26269
Gerrit-PatchSet: 1
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
[PATCH] osmo-mgw[master]: mgcp_test: add returncode check
Review at https://gerrit.osmocom.org/5174
mgcp_test: add returncode check
The returncode of get_conn_id_from_response() is unchecked, which
is intentional since some of the test messages will intentionally cause
this function to fail (the response does not inclde a connection
identifier). This means it makes no sense to assert this function
to a fixed value.
In order to spot regressions better print a log message depending
on the return code.
Change-Id: I9bce9ca39b7751b557374b7ab57c6c9005bcdb7d
Fixes: Coverity CID#180534
---
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
2 files changed, 33 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/74/5174/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 1c57347..ee49eef 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -636,6 +636,7 @@
int i;
struct mgcp_conn_rtp *conn = NULL;
char last_conn_id[256];
+ int rc;
cfg = mgcp_config_alloc();
@@ -675,9 +676,14 @@
OSMO_ASSERT(false);
}
- if (msg)
- get_conn_id_from_response(msg->data, last_conn_id,
- sizeof(last_conn_id));
+ if (msg) {
+ rc = get_conn_id_from_response(msg->data, last_conn_id,
+ sizeof(last_conn_id));
+ if (rc)
+ printf("(response contains a connection id)\n");
+ else
+ printf("(response does not contain a connection
id)\n");
+ }
msgb_free(msg);
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index c764531..23f0658 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -22,6 +22,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing AUEP2
@@ -33,6 +34,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing MDCX1
@@ -44,6 +46,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing MDCX2
@@ -55,6 +58,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing CRCX
@@ -75,6 +79,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -88,6 +93,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -111,6 +117,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -134,6 +141,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -157,6 +165,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -180,6 +189,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -203,6 +213,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Testing MDCX4_RO
@@ -217,6 +228,7 @@
checking response:
using message with patched conn_id for comparison
Response matches our expectations.
+(response does not contain a connection id)
Dummy packets: 2
@@ -231,6 +243,7 @@
checking response:
using message as statically defined for comparison
Response matches our expectations.
+(response contains a connection id)
Testing CRCX_ZYN
@@
[PATCH] osmo-mgw[master]: mgcp_test: fix possible double free
Review at https://gerrit.osmocom.org/5175
mgcp_test: fix possible double free
Change-Id: I2d044382c0bb66e190400e3397449c3f2387359a
---
M tests/mgcp/mgcp_test.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/5175/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index ee49eef..330d24d 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -685,7 +685,8 @@
printf("(response does not contain a connection
id)\n");
}
- msgb_free(msg);
+ if (msg)
+ msgb_free(msg);
if (dummy_packets)
printf("Dummy packets: %d\n", dummy_packets);
--
To view, visit https://gerrit.osmocom.org/5175
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d044382c0bb66e190400e3397449c3f2387359a
Gerrit-PatchSet: 1
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: dexter
[PATCH] meta-telephony[201705]: ortp: Move DEPENDS to inc file and fix whitespace
Review at https://gerrit.osmocom.org/5171
ortp: Move DEPENDS to inc file and fix whitespace
Change-Id: Idf1c060d8fdbe0a309366ed7bd1e79f40625405c
---
M recipes-misc/ortp/ortp.inc
M recipes-misc/ortp/ortp_0.25.0.bb
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/71/5171/1
diff --git a/recipes-misc/ortp/ortp.inc b/recipes-misc/ortp/ortp.inc
index 98a52eb..068c4de 100644
--- a/recipes-misc/ortp/ortp.inc
+++ b/recipes-misc/ortp/ortp.inc
@@ -9,10 +9,10 @@
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+DEPENDS = "glib-2.0 openssl"
+
do_compile_append() {
sed -i -e s:${STAGING_DIR_TARGET}::g \
-e s:/${TARGET_SYS}::g \
ortp.pc
-
}
-
diff --git a/recipes-misc/ortp/ortp_0.25.0.bb b/recipes-misc/ortp/ortp_0.25.0.bb
index 74687a2..b48660b 100644
--- a/recipes-misc/ortp/ortp_0.25.0.bb
+++ b/recipes-misc/ortp/ortp_0.25.0.bb
@@ -1,5 +1,4 @@
require ortp.inc
-DEPENDS = "glib-2.0 openssl"
PR = "${INC_PR}.1"
SRC_URI[md5sum] = "f44b4ab2a8de32c19abfa584c4426f76"
--
To view, visit https://gerrit.osmocom.org/5171
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf1c060d8fdbe0a309366ed7bd1e79f40625405c
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol
[PATCH] meta-telephony[201705]: ortp: Remove unused old ortp 0.16.5
Review at https://gerrit.osmocom.org/5170
ortp: Remove unused old ortp 0.16.5
A new version 0.25.0 was added around 3 years ago and has been used
since then, because osmocom stack requires at least 0.22.0.
This 0.16.5 version has been unused since then, so we can drop it.
Change-Id: Ica158e8ddabf5a8ce2a2254ca4fabdc35e7db668
---
D recipes-misc/ortp/files/0001-fix-unused-variables.patch
D recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
D recipes-misc/ortp/ortp_0.16.5.bb
3 files changed, 0 insertions(+), 97 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/70/5170/1
diff --git a/recipes-misc/ortp/files/0001-fix-unused-variables.patch
b/recipes-misc/ortp/files/0001-fix-unused-variables.patch
deleted file mode 100644
index a57eaff..000
--- a/recipes-misc/ortp/files/0001-fix-unused-variables.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From eb4f54377e2560a76a05f62a22c961edbce8f4c2 Mon Sep 17 00:00:00 2001
-From: Simon Morlat
-Date: Tue, 31 May 2011 10:52:49 +0200
-Subject: [PATCH] fix unused variables
-
- src/stun.c | 10 +-
- src/tests/rtprecv.c |6 +-
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/src/stun.c b/src/stun.c
-index ccac58f..e0d7c80 100644
a/src/stun.c
-+++ b/src/stun.c
-@@ -1993,7 +1993,6 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
-
-bool_t changePort=FALSE;
-bool_t changeIP=FALSE;
-- bool_t discard=FALSE;
-
-StunMessage req;
-char buf[STUN_MAX_MESSAGE_SIZE];
-@@ -2015,9 +2014,10 @@ stunSendTest( Socket myFd, StunAddress4 *dest,
- case 4:
- changeIP=TRUE;
- break;
-- case 5:
-+ /* case 5:
- discard=TRUE;
- break;
-+ */
- default:
- ortp_error("stun: Test %i is unkown\n", testNum);
- return ; /* error */
-@@ -2162,7 +2162,7 @@ stunNatType( StunAddress4 *dest,
-
-bool_t respTestI=FALSE;
-bool_t isNat=TRUE;
-- StunAddress4 testIchangedAddr;
-+ /*StunAddress4 testIchangedAddr;*/
-StunAddress4 testImappedAddr;
-bool_t respTestI2=FALSE;
-bool_t mappedIpSame = TRUE;
-@@ -2345,8 +2345,8 @@ stunNatType( StunAddress4 *dest,
- if ( !respTestI )
- {
-
-- testIchangedAddr.addr =
resp.changedAddress.ipv4.addr;
-- testIchangedAddr.port =
resp.changedAddress.ipv4.port;
-+ /*testIchangedAddr.addr =
resp.changedAddress.ipv4.addr;
-+ testIchangedAddr.port =
resp.changedAddress.ipv4.port;*/
-testImappedAddr.addr =
resp.mappedAddress.ipv4.addr;
-testImappedAddr.port =
resp.mappedAddress.ipv4.port;
-
-diff --git a/src/tests/rtprecv.c b/src/tests/rtprecv.c
-index 1861592..5eee649 100644
a/src/tests/rtprecv.c
-+++ b/src/tests/rtprecv.c
-@@ -163,8 +163,12 @@ int main(int argc, char*argv[])
- /* this is to avoid to write to disk some silence
before the first RTP packet is returned*/
- if ((stream_received) && (err>0)) {
- size_t ret = fwrite(buffer,1,err,outfile);
-- if (sound_fd>0)
-+ if (sound_fd>0){
- ret = write(sound_fd,buffer,err);
-+ if (ret==-1){
-+ fprintf(stderr,"write to sound
card failed (%s)",strerror(errno));
-+ }
-+ }
- }
- }
- ts+=160;
---
-1.7.5.4
-
diff --git a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
b/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
deleted file mode 100644
index 94ddde0..000
--- a/recipes-misc/ortp/files/compile-fixes-newer-gcc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ortp-0.16.5/src/stun.c
-===
ortp-0.16.5.orig/src/stun.c
-+++ ortp-0.16.5/src/stun.c
-@@ -399,7 +399,7 @@ stunParseMessage( char* buf, unsigned in
-char* body;
-unsigned int size;
-ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
-- memset(msg, 0, sizeof(msg));
-+ memset(msg, 0, sizeof(*msg));
-
-if (sizeof(StunMsgHdr) > bufLen)
-{
diff --git a/recipes-misc/ortp/ortp_0.16.5.bb b/recipes-misc/ortp/ortp_0.16.5.bb
deleted file mode 100644
index 919405f..000
--- a/recipes-misc/ortp/ortp_0.16.5.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require ortp.inc
-DEPENDS = "glib-2.0 openssl"
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \
-file://compile-fixes-newer-gcc.diff"
-
-S
[PATCH] meta-telephony[201705]: libosmo-abis: Split libosmo-trau into its own package
Review at https://gerrit.osmocom.org/5169
libosmo-abis: Split libosmo-trau into its own package
Change-Id: Ica8b6c39aed9f3370aeab84e821c8de871d2f0be
---
M recipes-osmocom/libosmo-abis/libosmo-abis.inc
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/69/5169/1
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis.inc
b/recipes-osmocom/libosmo-abis/libosmo-abis.inc
index 15a512a..afac8a9 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis.inc
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis.inc
@@ -4,10 +4,17 @@
HOMEPAGE = "http://openbsc.gnumonks.org";
LICENSE = "AGPLv3"
-INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
inherit autotools pkgconfig
-ALLOW_EMPTY_libosmo-abis = "1"
+PACKAGES =+ "libosmo-trau libosmo-trau-dev"
+
+FILES_libosmo-trau = "${libdir}/libosmotrau${SOLIBS}"
+FILES_libosmo-trau-dev = " \
+ ${includedir}/osmocom/trau \
+ ${libdir}/pkgconfig/libosmotrau.pc \
+ ${libdir}/libosmotrau${SOLIBSDEV} \
+ "
--
To view, visit https://gerrit.osmocom.org/5169
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica8b6c39aed9f3370aeab84e821c8de871d2f0be
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol
[PATCH] meta-telephony[201705]: libosmo-abis: Remove unused patch
Review at https://gerrit.osmocom.org/5168
libosmo-abis: Remove unused patch
The patch was applied upstream in
37fcd93a508b52f6f33bf47191bba41cb7367b0d, and removed from libosmo-abis
recipe in meta-telephony d91abc18f1a1d0003fe946c5dce173f1946b9712.
Change-Id: I7cf50808f0b826e82614ecd5844ab082ac017873
---
D recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
1 file changed, 0 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/68/5168/1
diff --git a/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
b/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
deleted file mode 100644
index 63c5052..000
--- a/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The line is not initiliazed to E1INP_TS_TYPE_SIGN by default
-
-diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
-index 145e471..49424e7 100644
a/src/input/ipaccess.c
-+++ b/src/input/ipaccess.c
-@@ -915,12 +915,14 @@ int e1inp_ipa_bts_rsl_connect_n(struct e1inp_line *line,
- "trx_nr (%d) out of range\n", trx_nr);
- return -EINVAL;
- }
-+/*
- if (line->ts[E1INP_SIGN_RSL+trx_nr-1].type != E1INP_TS_TYPE_SIGN) {
- LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: "
- "trx_nr (%d) does not refer to a signalling link\n",
- trx_nr);
- return -EINVAL;
- }
-+*/
-
- rsl_link = ipa_client_conn_create(tall_ipa_ctx,
- &line->ts[E1INP_SIGN_RSL+trx_nr-1],
--
To view, visit https://gerrit.osmocom.org/5168
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cf50808f0b826e82614ecd5844ab082ac017873
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: Pau Espin Pedrol
osmo-mgw[master]: client: use string as connection identifier
Patch Set 1: Code-Review+1 I confirm this fixes the segfault in my PC and test passes successfully. -- To view, visit https://gerrit.osmocom.org/5167 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I395a23c1828cf216031d69d481ad35dd458ee7d4 Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: neels Gerrit-HasComments: No
[PATCH] osmo-mgw[master]: client: use string as connection identifier
Review at https://gerrit.osmocom.org/5167 client: use string as connection identifier The test that tests the cancelation of a pending mgcp message uses an integer as connection identifier, which leads to a segfault since connection identifiers are represented as strings. Use a string as connection identifier. Change-Id: I395a23c1828cf216031d69d481ad35dd458ee7d4 --- M tests/mgcp_client/mgcp_client_test.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/67/5167/1 diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 172faac..ef2fca8 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -236,7 +236,7 @@ .endpoint = "23@mgw", .audio_port = 1234, .call_id = 47, - .conn_id = 11, + .conn_id = "11", .conn_mode = MGCP_CONN_RECV_SEND, .presence = (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID | MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE), -- To view, visit https://gerrit.osmocom.org/5167 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I395a23c1828cf216031d69d481ad35dd458ee7d4 Gerrit-PatchSet: 1 Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Owner: dexter
[PATCH] osmo-msc[master]: mgcp: use osmo-mgw to switch rtp streams
Hello Neels Hofmeyr, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/4980
to look at the new patch set (#9).
mgcp: use osmo-mgw to switch rtp streams
in the current implementation we still use osmo-bsc_mgcp, which
has many problems and is also obsoleted by osmo-mgw.
integrate osmo-mgw and re-implement the current switching using
an osmo fsm.
Depends: osmo-mgw Iab6a6038e7610c62f34e642cd49c93d11151252c
Closes: OS#2605
Change-Id: Ieea9630358b3963261fa1993cf1f3b563ff23538
---
M include/osmocom/msc/Makefile.am
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/iucs.h
M include/osmocom/msc/msc_ifaces.h
A include/osmocom/msc/msc_mgcp.h
M src/libmsc/Makefile.am
M src/libmsc/a_iface.c
M src/libmsc/a_iface_bssap.c
M src/libmsc/gsm_04_08.c
M src/libmsc/iucs.c
M src/libmsc/msc_ifaces.c
A src/libmsc/msc_mgcp.c
M tests/msc_vlr/Makefile.am
M tests/msc_vlr/msc_vlr_tests.c
14 files changed, 1,121 insertions(+), 321 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/4980/9
diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 1419e8e..052d830 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -39,6 +39,7 @@
mncc.h \
mncc_int.h \
msc_ifaces.h \
+ msc_mgcp.h \
network_listen.h \
oap_client.h \
openbscdefines.h \
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 696cef1..9106421 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -196,9 +196,17 @@
struct gsm_encr encr;
struct {
+ struct mgcp_ctx *mgcp_ctx;
unsigned int mgcp_rtp_endpoint;
- uint16_t port_subscr;
- uint16_t port_cn;
+
+ uint16_t local_port_ran;
+ char local_addr_ran[INET_ADDRSTRLEN];
+ uint16_t remote_port_ran;
+ char remote_addr_ran[INET_ADDRSTRLEN];
+ uint16_t local_port_cn;
+ char local_addr_cn[INET_ADDRSTRLEN];
+ uint16_t remote_port_cn;
+ char remote_addr_cn[INET_ADDRSTRLEN];
} rtp;
/* which Iu-CS connection, if any. */
diff --git a/include/osmocom/msc/iucs.h b/include/osmocom/msc/iucs.h
index b7d6064..a48a316 100644
--- a/include/osmocom/msc/iucs.h
+++ b/include/osmocom/msc/iucs.h
@@ -1,7 +1,10 @@
#pragma once
+#include
+
int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg,
uint16_t *lac);
struct gsm_subscriber_connection *subscr_conn_lookup_iu(struct gsm_network
*network,
struct
ranap_ue_conn_ctx *ue);
+int iu_rab_act_cs(struct gsm_trans *trans);
diff --git a/include/osmocom/msc/msc_ifaces.h b/include/osmocom/msc/msc_ifaces.h
index 0592c07..ca25e9d 100644
--- a/include/osmocom/msc/msc_ifaces.h
+++ b/include/osmocom/msc/msc_ifaces.h
@@ -37,7 +37,3 @@
enum gsm48_reject_value value);
int msc_tx_common_id(struct gsm_subscriber_connection *conn);
-int msc_call_assignment(struct gsm_trans *trans);
-int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2);
-void msc_call_release(struct gsm_trans *trans);
-int msc_call_connect(struct gsm_trans *trans, uint16_t port, uint32_t ip);
diff --git a/include/osmocom/msc/msc_mgcp.h b/include/osmocom/msc/msc_mgcp.h
new file mode 100644
index 000..da06dae
--- /dev/null
+++ b/include/osmocom/msc/msc_mgcp.h
@@ -0,0 +1,50 @@
+/* (C) 2017 by sysmocom - s.f.m.c. GmbH
+ * All Rights Reserved
+ *
+ * Author: Philipp Maier
+ *
+ * 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
[PATCH] osmo-iuh[master]: osmo-hnbgw: don't configure specific local IP address for ST...
Review at https://gerrit.osmocom.org/5166
osmo-hnbgw: don't configure specific local IP address for STP connection
It's not necessary to set a local IP to connect to OsmoSTP with, 'any' is as
good as any.
Related: OS#2663
Change-Id: If5d0a1500de5e2c4b80acf025761d0264a8a51a0
---
M src/hnbgw.c
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/66/5166/1
diff --git a/src/hnbgw.c b/src/hnbgw.c
index 5c0570e..c1b931c 100644
--- a/src/hnbgw.c
+++ b/src/hnbgw.c
@@ -478,8 +478,7 @@
ranap_set_log_area(DRANAP);
- rc = hnbgw_cnlink_init(g_hnb_gw,
- "127.0.0.1", M3UA_PORT, "127.0.0.5" /* FIXME:
configurable */);
+ rc = hnbgw_cnlink_init(g_hnb_gw, "127.0.0.1", M3UA_PORT, NULL);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Failed to initialize SCCP link to
CN\n");
exit(1);
--
To view, visit https://gerrit.osmocom.org/5166
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5d0a1500de5e2c4b80acf025761d0264a8a51a0
Gerrit-PatchSet: 1
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr
osmo-ggsn[master]: Add configure flag to disable ipv6 support
Patch Set 2: Do you have any alternative in mind regarding this topic? AFAIR that's how it's done in the kernel for instance. Or maybe you think it's not worth it having aflag to disable ipv6 support? -- To view, visit https://gerrit.osmocom.org/5121 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I651a12d63d025bde61dcbc3c6b949cd0fed43580 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
[MERGED] osmo-bts[master]: osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
Harald Welte has submitted this change and it was merged.
Change subject: osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
..
osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
The upper layers (L1SAP, the common part of L1) *always* require frame
numbers in the uplink direction to be reported as the frame number of
the *first* burst, not the last burst of a given block.
This is particularly important in the case of passing up measurement
information, as we use this frame number to detect if the measurement
interval for that specific timeslot has just ended (and hence we must
process the measurements and send an uplink measurement report to the
BSC.
Before this patch, the measurement results were reported with the *last*
frame number, which caused the common/measurement.c code never detect
the end of a measurement window.
On TS2, tons of the following log messages were observed:
<0004> measurement.c:199 (bts=0,trx=0,ts=2,ss=0) no space for uplink
measurement, num_ul_meas=104
With this patch, it behves as expected: the measurements of 25 blocks
(= 100 bursts) are aggregated, after which point the report is computed
and sent. Subsequently, num_ul_meas is reset to 0 and the cycle
restarts.
Related: OS#2329
Change-Id: I1065ae9c400bb5240a63ab8213aee59aeb9ceeff
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
dexter: Looks good to me, but someone else must approve
Vadim Yanitskiy: 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; Verified
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 0549156..d3928f1 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -843,7 +843,7 @@
l2_len = GSM_MACBLOCK_LEN;
/* Send uplink measurement information to L2 */
- l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr |
tn,
+ l1if_process_meas_res(l1t->trx, tn, *first_fn,
trx_chan_desc[chan].chan_nr | tn,
n_errors, n_bits_total, *rssi_sum / *rssi_num, *toa_sum /
*toa_num);
ber10k = compute_ber10k(n_bits_total, n_errors);
return _sched_compose_ph_data_ind(l1t, tn, *first_fn, chan, l2, l2_len,
@@ -860,6 +860,7 @@
struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
struct l1sched_chan_state *chan_state = &l1ts->chan_state[chan];
sbit_t *burst, **bursts_p = &chan_state->ul_bursts;
+ uint32_t *first_fn = &chan_state->ul_first_fn;
uint8_t *mask = &chan_state->ul_mask;
float *rssi_sum = &chan_state->rssi_sum;
uint8_t *rssi_num = &chan_state->rssi_num;
@@ -884,6 +885,7 @@
if (bid == 0) {
memset(*bursts_p, 0, GSM0503_EGPRS_BURSTS_NBITS);
*mask = 0x0;
+ *first_fn = fn;
*rssi_sum = 0;
*rssi_num = 0;
*toa_sum = 0;
@@ -937,7 +939,7 @@
/* Send uplink measurement information to L2 */
- l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr |
tn,
+ l1if_process_meas_res(l1t->trx, tn, *first_fn,
trx_chan_desc[chan].chan_nr | tn,
n_errors, n_bits_total, *rssi_sum / *rssi_num, *toa_sum /
*toa_num);
if (rc <= 0) {
@@ -959,6 +961,7 @@
struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
struct l1sched_chan_state *chan_state = &l1ts->chan_state[chan];
sbit_t *burst, **bursts_p = &chan_state->ul_bursts;
+ uint32_t *first_fn = &chan_state->ul_first_fn;
uint8_t *mask = &chan_state->ul_mask;
uint8_t rsl_cmode = chan_state->rsl_cmode;
uint8_t tch_mode = chan_state->tch_mode;
@@ -985,6 +988,7 @@
if (bid == 0) {
memset(*bursts_p + 464, 0, 464);
*mask = 0x0;
+ *first_fn = fn;
}
/* update mask */
@@ -1047,7 +1051,7 @@
memcpy(*bursts_p, *bursts_p + 464, 464);
/* Send uplink measurement information to L2 */
- l1if_process_meas_res(l1t->trx, tn, fn, trx_chan_desc[chan].chan_nr|tn,
+ l1if_process_meas_res(l1t->trx, tn, *first_fn,
trx_chan_desc[chan].chan_nr|tn,
n_errors, n_bits_total, rssi, toa);
/* Check if the frame is bad */
@@ -1117,6 +1121,7 @@
struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);
struct l1sched_chan_state *chan_state = &l1ts->chan_state[chan];
sbit_t *burst, **bursts_p = &chan_state->ul_bursts;
+ uint32_t *first_fn = &chan_state->ul_first_fn;
uint8_t *mask = &chan_state->ul_mask;
uint8_t rsl_cmode = chan_state->rsl_cmode;
uint8_t tch_mode = chan_state->tch_mode;
@@ -1148,6 +1153,7 @@
if (bid == 0) {
memset(*bursts_p + 464, 0, 232);
osmo-bts[master]: osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/5136 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1065ae9c400bb5240a63ab8213aee59aeb9ceeff Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: No
osmo-bts[master]: osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5136 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1065ae9c400bb5240a63ab8213aee59aeb9ceeff Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: No
osmo-ggsn[master]: Add configure flag to disable ipv6 support
Patch Set 2: Code-Review-1 I think it's rather ugly to have the code full of #ifdef's. I'm really not sure if this is the way to go, sorry. -- To view, visit https://gerrit.osmocom.org/5121 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I651a12d63d025bde61dcbc3c6b949cd0fed43580 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
osmo-ggsn[master]: tests: Split ipv6 specific tests into a new test group
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5162 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3906dbf55ccf1650083398e08ac870add0bbdcef 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
osmo-ggsn[master]: ggsn.c: Print version of unhandled ip packet
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5160 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e226a12b074c96c572f90e3aaf62716d0cd47c5 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
osmo-ggsn[master]: Remove unused empty src/Makefile.in
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5161 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I207362e055dbfafc42fad2cfdd0cf1da9dcad88b 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
osmo-ggsn[master]: contrib: Add IPv6 build option
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5163 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id62f186d93bb0165764d9d25fbee2d359df79149 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: No
[MERGED] osmo-trx[master]: UHDDevice.cpp: add USRP B205mini support
Vadim Yanitskiy has submitted this change and it was merged.
Change subject: UHDDevice.cpp: add USRP B205mini support
..
UHDDevice.cpp: add USRP B205mini support
The B205mini is similar to the B200mini and runs OsmoTRX just
fine, so let's make OsmoTRX recogonize and support it too.
Change-Id: Iee575121248ea541f7abc49055e49ec2d30904c0
---
M Transceiver52M/UHDDevice.cpp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Alexander Chemeris: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Transceiver52M/UHDDevice.cpp b/Transceiver52M/UHDDevice.cpp
index 778c772..09317a9 100644
--- a/Transceiver52M/UHDDevice.cpp
+++ b/Transceiver52M/UHDDevice.cpp
@@ -519,6 +519,7 @@
{ "B100", { B100,TX_WINDOW_USRP1 } },
{ "B200", { B200,TX_WINDOW_USRP1 } },
{ "B200mini", { B200,TX_WINDOW_USRP1 } },
+ { "B205mini", { B200,TX_WINDOW_USRP1 } },
{ "B210", { B210,TX_WINDOW_USRP1 } },
{ "E100", { E1XX,TX_WINDOW_FIXED } },
{ "E110", { E1XX,TX_WINDOW_FIXED } },
--
To view, visit https://gerrit.osmocom.org/5150
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee575121248ea541f7abc49055e49ec2d30904c0
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy
Gerrit-Reviewer: Alexander Chemeris
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy
osmo-ggsn[master]: contrib: Add IPv6 build option
Patch Set 1: patch adding the option in osmo-ci can be found in https://gerrit.osmocom.org/#/c/5165/ -- To view, visit https://gerrit.osmocom.org/5163 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id62f186d93bb0165764d9d25fbee2d359df79149 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
osmo-bts[master]: osmo-bts-trx: Fix reported frame number during PRIM_INFO_MEAS
Patch Set 3: Code-Review+1 > I don't have equipment right now to test this, but the code looks > good on the first glance. > > Just one comment - is this requirement of sending the first frame > number documented in the parameters of the relevant functions? That > would be great to have it there to avoid mistakes in future. I have tried it out, I could reproduce the problem. With the patch it works fine again. I have tested it on TS0-7 in TCH/H and TCH/F mode. -- To view, visit https://gerrit.osmocom.org/5136 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1065ae9c400bb5240a63ab8213aee59aeb9ceeff Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Alexander Chemeris Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: dexter Gerrit-HasComments: No
[PATCH] osmo-ci[master]: jobs: Add IPv6 build option to osmo-ggsn job
Review at https://gerrit.osmocom.org/5165 jobs: Add IPv6 build option to osmo-ggsn job Change-Id: I3f97bcd163b0458d00c0def7982cdaa349f08747 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/5165/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3de5093..d27fa62 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -106,7 +106,9 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + a2_name: IPv6 + a2: !!python/tuple [--enable-ipv6, --disable-ipv6] + cmd: GTP="$GTP" IPv6="$IPv6" ./contrib/jenkins.sh - osmo-gsm-manuals diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 711bc0e..5f305f3 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -156,7 +156,9 @@ - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] - cmd: GTP="$GTP" ./contrib/jenkins.sh + a2_name: IPv6 + a2: !!python/tuple [--enable-ipv6, --disable-ipv6] + cmd: GTP="$GTP" IPv6="$IPv6" ./contrib/jenkins.sh publishers: downstream-ext: projects: -- To view, visit https://gerrit.osmocom.org/5165 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f97bcd163b0458d00c0def7982cdaa349f08747 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
[PATCH] osmo-ci[master]: jobs: Fix osmo-ggsn GTP build option
Review at https://gerrit.osmocom.org/5164 jobs: Fix osmo-ggsn GTP build option As far as I understand, the variable is populated using the name field. In openggsn build it matches, but it doesn't in osmo-ggsn. Change-Id: Ifb1a630b77a8c2f442e26dbef8e608882e8f9a71 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/5164/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index da80e62..3de5093 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -104,7 +104,7 @@ cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: - a1_name: gtp-linux + a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] cmd: GTP="$GTP" ./contrib/jenkins.sh diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index b127069..711bc0e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -154,7 +154,7 @@ cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: - a1_name: gtp-linux + a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] cmd: GTP="$GTP" ./contrib/jenkins.sh publishers: -- To view, visit https://gerrit.osmocom.org/5164 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb1a630b77a8c2f442e26dbef8e608882e8f9a71 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
[PATCH] osmo-ggsn[master]: contrib: Add IPv6 build option
Review at https://gerrit.osmocom.org/5163 contrib: Add IPv6 build option Change-Id: Id62f186d93bb0165764d9d25fbee2d359df79149 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/63/5163/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 4437541..bb1dd8b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -35,7 +35,7 @@ cd "$base" autoreconf --install --force -./configure CFLAGS="-Werror" CPPFLAGS="-Werror" $GTP +./configure CFLAGS="-Werror" CPPFLAGS="-Werror" $GTP $IPv6 $MAKE $PARALLEL_MAKE $MAKE distcheck -- To view, visit https://gerrit.osmocom.org/5163 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id62f186d93bb0165764d9d25fbee2d359df79149 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
[PATCH] osmo-ggsn[master]: Remove unused empty src/Makefile.in
Review at https://gerrit.osmocom.org/5161 Remove unused empty src/Makefile.in Change-Id: I207362e055dbfafc42fad2cfdd0cf1da9dcad88b --- D src/Makefile.in 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/61/5161/1 diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index e69de29..000 --- a/src/Makefile.in +++ /dev/null -- To view, visit https://gerrit.osmocom.org/5161 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I207362e055dbfafc42fad2cfdd0cf1da9dcad88b Gerrit-PatchSet: 1 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
[PATCH] osmo-ggsn[master]: tests: Split ipv6 specific tests into a new test group
Review at https://gerrit.osmocom.org/5162
tests: Split ipv6 specific tests into a new test group
This way they can be easily disabled later on when IPv6 support is made
optional.
Change-Id: I3906dbf55ccf1650083398e08ac870add0bbdcef
---
M tests/lib/Makefile.am
M tests/lib/in46a_test.c
M tests/lib/in46a_test.ok
A tests/lib/in46a_v6_test.ok
M tests/lib/ippool_test.c
M tests/lib/ippool_test.err
M tests/lib/ippool_test.ok
A tests/lib/ippool_v6_test.err
A tests/lib/ippool_v6_test.ok
M tests/testsuite.at
10 files changed, 440 insertions(+), 352 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/5162/1
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 95d6901..ee46468 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,7 +1,11 @@
AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g
-EXTRA_DIST = ippool_test.ok ippool_test.err \
-in46a_test.ok
+EXTRA_DIST = ippool_test.ok \
+ippool_test.err \
+ippool_v6_test.ok \
+ippool_v6_test.err \
+in46a_test.ok \
+in46a_v6_test.ok
noinst_PROGRAMS = ippool_test in46a_test
diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c
index d4a5dbc..c0bb670 100644
--- a/tests/lib/in46a_test.c
+++ b/tests/lib/in46a_test.c
@@ -20,41 +20,24 @@
.v4.s_addr = 0x0d0c0b0a,
};
-static const struct in46_addr g_ia6 = {
- .len = 16,
- .v6.s6_addr = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 },
-};
-
static void test_in46a_to_af(void)
{
- struct in46_addr ia;
-
- printf("Testing in46a_to_af()\n");
+ printf("Testing in46a_to_af() with IPv4 addresses\n");
OSMO_ASSERT(in46a_to_af(&g_ia4) == AF_INET);
- OSMO_ASSERT(in46a_to_af(&g_ia6) == AF_INET6);
-
- ia.len = 8;
- OSMO_ASSERT(in46a_to_af(&ia) == AF_INET6);
}
static void test_in46a_to_sas(void)
{
struct sockaddr_storage ss;
struct sockaddr_in *sin = (struct sockaddr_in *) &ss;
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &ss;
- printf("Testing in46a_to_sas()\n");
+ printf("Testing in46a_to_sas() with IPv4 addresses\n");
memset(&ss, 0, sizeof(ss));
OSMO_ASSERT(in46a_to_sas(&ss, &g_ia4) == 0);
OSMO_ASSERT(sin->sin_family == AF_INET);
OSMO_ASSERT(sin->sin_addr.s_addr == g_ia4.v4.s_addr);
-
- memset(&ss, 0, sizeof(ss));
- OSMO_ASSERT(in46a_to_sas(&ss, &g_ia6) == 0);
- OSMO_ASSERT(sin6->sin6_family == AF_INET6);
- OSMO_ASSERT(!memcmp(&sin6->sin6_addr, &g_ia6.v6,
sizeof(sin6->sin6_addr)));
}
static void test_in46a_ntop(void)
@@ -63,7 +46,7 @@
char buf[256];
const char *res;
- printf("Testing in46a_ntop()\n");
+ printf("Testing in46a_ntop() with IPv4 addresses\n");
res = in46a_ntop(NULL, buf, sizeof(buf));
OSMO_ASSERT(res && !strcmp(res, "UNDEFINED"));
@@ -78,10 +61,6 @@
ia.v4.s_addr = htonl(0x01020304);
res = in46a_ntop(&ia, buf, sizeof(buf));
OSMO_ASSERT(res && !strcmp(res, "1.2.3.4"));
- printf("res = %s\n", res);
-
- res = in46a_ntop(&g_ia6, buf, sizeof(buf));
- OSMO_ASSERT(res && !strcmp(res, "102:304:506:708:90a:b0c:d0e:f10"));
printf("res = %s\n", res);
}
@@ -101,20 +80,13 @@
{
struct in46_addr b;
- printf("Testing in46a_equal()\n");
+ printf("Testing in46a_equal() with IPv4 addresses\n");
memset(&b, 0xff, sizeof(b));
b.len = g_ia4.len;
b.v4.s_addr = g_ia4.v4.s_addr;
OSMO_ASSERT(in46a_equal(&g_ia4, &b));
-
- memset(&b, 0xff, sizeof(b));
- b.len = g_ia6.len;
- b.v6 = g_ia6.v6;
- OSMO_ASSERT(in46a_equal(&g_ia6, &b));
-
}
-
static int log_in46a_within_mask(const struct in46_addr *addr, const struct
in46_addr *net,
size_t prefixlen)
@@ -134,7 +106,7 @@
{
struct in46_addr addr, mask;
- printf("Testing in46a_within_mask()\n");
+ printf("Testing in46a_within_mask() with IPv4 addresses\n");
addr = g_ia4;
mask = g_ia4;
@@ -155,13 +127,9 @@
static void test_in46a_to_eua(void)
{
- const struct in46_addr ia_v6_8 = {
- .len = 8,
- .v6.s6_addr = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 },
- };
struct ul66_t eua;
- printf("testing in46a_to_eua()\n");
+ printf("testing in46a_to_eua() with IPv4 addresses\n");
#if 0 /* triggers assert in current implementation */
const struct in46_addr ia_invalid = { .len = 3, };
@@ -173,18 +141,6 @@
OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF);
OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v4);
OSMO_ASSERT(osmo_load32le(&eua.v[2]) == g_ia4.v4.s_addr);
-
- /* IPv6 address */
- OSMO_ASSERT(in46a_to_eua(&g_ia6, &eua) == 0);
- OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF);
- OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v6);
- OSMO_A
[PATCH] osmo-ggsn[master]: Add configure flag to disable ipv6 support
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/5121
to look at the new patch set (#2).
Add configure flag to disable ipv6 support
Some users may want to disable ipv6 related features in case they are
not needed. It can also be used as a workaround to build libgtp and
osmo-ggsn in systems where ipv6 supports fails to build due to header
struct definition conflicts between kernel and libc.
Related: SYS#3815
Change-Id: I651a12d63d025bde61dcbc3c6b949cd0fed43580
---
M configure.ac
M ggsn/Makefile.am
M ggsn/ggsn.c
M ggsn/ggsn.h
M ggsn/ggsn_vty.c
M lib/in46_addr.c
M lib/in46_addr.h
M lib/ippool.c
M lib/tun.c
M sgsnemu/sgsnemu.c
M tests/lib/in46a_test.c
M tests/lib/ippool_test.c
M tests/testsuite.at
13 files changed, 180 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/21/5121/2
diff --git a/configure.ac b/configure.ac
index 4fd0132..b835f7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,15 @@
AM_CONDITIONAL([ENABLE_GTP_KERNEL], [test "$enable_gtp_linux" = "yes"])
+# Enable/disable IPv6 support
+AC_ARG_ENABLE([ipv6], [AS_HELP_STRING([--enable-ipv6], [Build IPv6 support])],
+[enable_ipv6="$enableval"],[enable_ipv6="yes"])
+if test "x$enable_ipv6" = "xyes" ; then
+AC_DEFINE(BUILD_IPv6, 1, [Define if we want to build IPv6 support])
+fi
+AM_CONDITIONAL(BUILD_IPv6, test "x$enable_ipv6" = "xyes")
+#AC_SUBST(enable_ipv6)
+
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -170,4 +179,5 @@
echo "
osmo-ggsn Configuration:
- GTP Linux kernel support:${enable_gtp_linux}"
+ GTP Linux kernel support:${enable_gtp_linux}
+ IPv6 support:${enable_ipv6}"
diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index 8a468a9..07adf80 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -12,7 +12,10 @@
endif
osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
-osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h gtp-kernel.h icmpv6.c icmpv6.h
checksum.c checksum.h
+osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h gtp-kernel.h checksum.c checksum.h
+if BUILD_IPv6
+osmo_ggsn_SOURCES += icmpv6.c icmpv6.h
+endif
if ENABLE_GTP_KERNEL
osmo_ggsn_SOURCES += gtp-kernel.c
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 763a2c5..6a206a2 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -65,7 +65,9 @@
#include "../gtp/pdp.h"
#include "../gtp/gtp.h"
#include "gtp-kernel.h"
+#if defined(BUILD_IPv6)
#include "icmpv6.h"
+#endif
#include "ggsn.h"
void *tall_ggsn_ctx;
@@ -115,7 +117,9 @@
LOGPAPN(LOGL_NOTICE, apn, "%sStopping\n", force ? "FORCED " : "");
/* check if pools have any active PDP contexts and bail out */
pool_close_all_pdp(apn->v4.pool);
+#if defined(BUILD_IPv6)
pool_close_all_pdp(apn->v6.pool);
+#endif
/* shutdown whatever old state might be left */
if (apn->tun.tun) {
@@ -137,12 +141,13 @@
ippool_free(apn->v4.pool);
apn->v4.pool = NULL;
}
+#if defined(BUILD_IPv6)
if (apn->v6.pool) {
LOGPAPN(LOGL_INFO, apn, "Releasing IPv6 pool\n");
ippool_free(apn->v6.pool);
apn->v6.pool = NULL;
}
-
+#endif
apn->started = false;
return 0;
}
@@ -155,9 +160,11 @@
*blacklist = NULL;
+#if defined(BUILD_IPv6)
if (ipv6)
flags = IP_TYPE_IPv6_NONLINK;
else
+#endif
flags = IP_TYPE_IPv4;
while (1) {
@@ -191,7 +198,9 @@
int apn_start(struct apn_ctx *apn)
{
int ippool_flags = IPPOOL_NONETWORK | IPPOOL_NOBROADCAST;
+#if defined(BUILD_IPv6)
struct in46_prefix ipv6_tun_linklocal_ip;
+#endif
struct in46_prefix *blacklist;
int blacklist_size;
@@ -226,7 +235,7 @@
return -1;
}
}
-
+#if defined(BUILD_IPv6)
if (apn->v6.cfg.ifconfig_prefix.addr.len) {
LOGPAPN(LOGL_INFO, apn, "Setting tun IPv6 address %s\n",
in46p_ntoa(&apn->v6.cfg.ifconfig_prefix));
@@ -239,13 +248,13 @@
return -1;
}
}
-
+#endif
if (apn->tun.cfg.ipup_script) {
LOGPAPN(LOGL_INFO, apn, "Running ip-up script %s\n",
apn->tun.cfg.ipup_script);
tun_runscript(apn->tun.tun, apn->tun.cfg.ipup_script);
}
-
+#if defined(BUILD_IPv6)
if (apn->cfg.apn_type_mask & (APN_TYPE_IPv6|APN_TYPE_IPv4v6)) {
if (tun_ip_local_get(apn->tun.tun,
&ipv6_tun_linklocal_ip, 1, IP_TYPE_IPv6_LINK) < 1) {
LOGPAPN(LOGL_ERROR, apn, "Cannot obtain IPv6
link-local address of "
@@ -255,17 +264,20 @@
}
[PATCH] libosmocore[master]: Embedded: fix sercomm test
Review at https://gerrit.osmocom.org/5159
Embedded: fix sercomm test
The external sercomm_drv_[un]lock() functions are defined as stubs in
case of non-embedded build only which causes linking issue with
sercomm_test. Let's define the same stubs in sercomm_test
unconditionally - the implementation details of the locking are
irrelevant for the test anyway.
Change-Id: I3dab4f3348871b66b5d6c9fd10b2e448c61f9e73
---
M tests/sercomm/sercomm_test.c
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/5159/1
diff --git a/tests/sercomm/sercomm_test.c b/tests/sercomm/sercomm_test.c
index 058c9eb..4a40f62 100644
--- a/tests/sercomm/sercomm_test.c
+++ b/tests/sercomm/sercomm_test.c
@@ -27,6 +27,10 @@
struct osmo_sercomm_inst g_osi;
+/* Locking details are not checked by this test anyway */
+void sercomm_drv_lock(unsigned long __attribute__((unused)) *flags) {}
+void sercomm_drv_unlock(unsigned long __attribute__((unused)) *flags) {}
+
static const uint8_t valid_dlci3[] = { 0x7E, 3, 0x03, 'f', 'o', 'o', 0x7E };
static const uint8_t valid_dlci23[] = { 0x7E, 23, 0x03, '2', '3', 0x7E };
static const uint8_t valid_dlci23esc[] = { 0x7E, 23, 0x03, 0x7D, '2' ^ (1 <<
5), '3', 0x7E };
--
To view, visit https://gerrit.osmocom.org/5159
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dab4f3348871b66b5d6c9fd10b2e448c61f9e73
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max
[PATCH] osmo-ggsn[master]: ggsn.c: Print version of unhandled ip packet
Review at https://gerrit.osmocom.org/5160
ggsn.c: Print version of unhandled ip packet
Change-Id: I7e226a12b074c96c572f90e3aaf62716d0cd47c5
---
M ggsn/ggsn.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/60/5160/1
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 0beaef7..763a2c5 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -653,7 +653,7 @@
dst.v6 = ip6h->ip6_dst;
pool = apn->v6.pool;
} else {
- LOGP(DTUN, LOGL_NOTICE, "non-IPv packet received from tun\n");
+ LOGP(DTUN, LOGL_NOTICE, "non-IPv%u packet received from tun\n",
iph->version);
return -1;
}
--
To view, visit https://gerrit.osmocom.org/5160
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e226a12b074c96c572f90e3aaf62716d0cd47c5
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol
osmo-ggsn[master]: Add configure flag to disable ipv6 support
Patch Set 2: With this new version tests are passing both with "--disable-ipv6" flag and with "--enable-ipv6" (default) flag. I tested locally with an osmo-bts-trx and a mobile phone that GPRS was working fine in both cases. TODO: - Modify osmo-ggsn to build both with "disable-ipv6" flag and "enable-ipv6" flag. I think I need to modify osmo-ci. -- To view, visit https://gerrit.osmocom.org/5121 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I651a12d63d025bde61dcbc3c6b949cd0fed43580 Gerrit-PatchSet: 2 Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[PATCH] osmo-pcu[master]: TBF: implement independent T31xx timers
Review at https://gerrit.osmocom.org/5158
TBF: implement independent T31xx timers
Previously TBF got single timer so the pending timer was automatically
cancelled when new one was scheduled. Let's make it more robust by
implementing independent T31 xx timers from 3GPP TS 44.060 §13.2 with
corresponding start/stop functions and counters.
N. B. - some timers are still used as before:
* T3169: changing would require changing test output
* T3193: changing causes segfault
* T0: used for assign/reject timeouts, have to be properly attributed
and documented first
This will be fixed in follow-up patches.
Change-Id: I0305873ca47534f53441247217881da59625e1f7
Related: OS#2407
---
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M tests/tbf/TbfTest.cpp
4 files changed, 146 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/5158/1
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 7b609c8..15e73f1 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -32,6 +32,7 @@
extern "C" {
#include
+#include
#include
#include
}
@@ -163,6 +164,12 @@
n3105(0),
T(0),
num_T_exp(0),
+ num_T3169_exp(0),
+ num_T3191_exp(0),
+ num_T3193_exp(0),
+ num_T3195_exp(0),
+ num_T3197_exp(0),
+ num_T3199_exp(0),
fT(0),
num_fT_exp(0),
state(GPRS_RLCMAC_NULL),
@@ -183,6 +190,12 @@
* Just set them to 0 like talloc_zero did */
memset(&pdch, 0, sizeof(pdch));
memset(&timer, 0, sizeof(timer));
+ memset(&T3169, 0, sizeof(T3169));
+ memset(&T3191, 0, sizeof(T3191));
+ memset(&T3193, 0, sizeof(T3193));
+ memset(&T3195, 0, sizeof(T3195));
+ memset(&T3197, 0, sizeof(T3197));
+ memset(&T3199, 0, sizeof(T3199));
memset(&m_rlc, 0, sizeof(m_rlc));
memset(&gsm_timer, 0, sizeof(gsm_timer));
@@ -465,6 +478,7 @@
get_value_string(gprs_rlcmac_tbf_dl_ass_state_names,
tbf->dl_ass_state));
tbf->stop_timer("freeing TBF");
+ tbf->stop_timers("freeing TBF");
/* TODO: Could/Should generate bssgp_tx_llc_discarded */
tbf_unlink_pdch(tbf);
llist_del(&tbf->list());
@@ -550,9 +564,30 @@
osmo_timer_schedule(&tbf->timer, seconds, microseconds);
}
-void gprs_rlcmac_tbf::stop_t3191()
+static inline void t_stop(const char *tbf_name, struct osmo_timer_list *t,
uint16_t num, const char *reason)
{
- return stop_timer("T3191");
+ if (osmo_timer_pending(t)) {
+ LOGP(DRLCMAC, LOGL_DEBUG, "%s stopping timer T%u [%s]\n",
tbf_name, num, reason);
+ osmo_timer_del(t);
+ }
+}
+
+#define STOP_T(nn) void gprs_rlcmac_tbf::stop_t##nn(const char *reason) {
t_stop(tbf_name(this), &T##nn, nn, reason); }
+
+STOP_T(3169)
+STOP_T(3191)
+STOP_T(3193)
+STOP_T(3195)
+STOP_T(3197)
+STOP_T(3199)
+
+void gprs_rlcmac_tbf::stop_timers(const char *reason) {
+ stop_t3169(reason);
+ stop_t3191(reason);
+ stop_t3193(reason);
+ stop_t3195(reason);
+ stop_t3197(reason);
+ stop_t3199(reason);
}
void gprs_rlcmac_tbf::stop_timer(const char *reason)
@@ -563,6 +598,59 @@
osmo_timer_del(&timer);
}
}
+
+static inline void tbf_timeout_free(struct gprs_rlcmac_tbf *tbf, uint16_t num,
bool run_diag, bool free_tbf)
+{
+ LOGP(DRLCMAC, LOGL_NOTICE, "%s T%u timeout expired, freeing TBF\n",
+tbf_name(tbf), num, free_tbf ? "freeing" : "ignoring");
+
+ if (run_diag)
+ tbf->rlcmac_diag();
+
+ if (free_tbf)
+ tbf_free(tbf);
+}
+
+#define T_CBACK(nn, diag, free)\
+ static void tbf_timer_cb##nn(void *_tbf) { \
+ struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)_tbf; \
+ tbf_timeout_free(tbf, nn, diag, free); \
+ tbf->num_T ## nn ## _exp++; \
+ }
+
+T_CBACK(3169, true, true)
+T_CBACK(3191, true, true)
+T_CBACK(3193, false, true)
+T_CBACK(3195, true, true)
+T_CBACK(3197, false, false)
+T_CBACK(3199, false, false)
+
+typedef void (*t_cback)(void *_tbf);
+
+static inline void t_sched(struct gprs_rlcmac_tbf *tbf, struct osmo_timer_list
*t, uint64_t *exp,
+ uint16_t num, uint32_t sec, uint32_t microsec,
t_cback cback, const char *reason)
+{
+ LOGP(DRLCMAC, LOGL_DEBUG, "%s %sstarting timer T%u [%s] with %u sec. %u
microsec.\n",
+tbf_name(tbf), osmo_timer_pending(t) ? "re" : "", num, reason,
sec, microsec);
+
+ t->data = tbf;
+ t->cb = cback;
+
+ *exp = 0;
+ osmo_timer_schedule(t, sec, microsec);
+}
+
+#define START_T(nn) \
+ void gprs_rlcmac_tbf::start_t##nn(uint32_t sec, uint32_t microsec,
const char *reason) { \
+ t_sched(this, &T##nn, &num_T ## nn ##_exp, nn, sec, microsec,
&tbf_timer_cb##nn, reason); \
+ }
+
+START_T(316
[PATCH] osmo-bsc[master]: mgcp: cancel transactions on timeout
Review at https://gerrit.osmocom.org/5157
mgcp: cancel transactions on timeout
when a transaction to the MGW times out, then the context
information is freed. Unfortunately the client is not informed
about this and will try to execute the callback anyway.
explicitly cancel the transaction in order to prevent access
to already freed data structures.
Change-Id: I40794dff7d10e2b6a96863a2da7e9fbd5662a1bf
---
M include/osmocom/bsc/osmo_bsc_mgcp.h
M src/osmo-bsc/osmo_bsc_mgcp.c
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/5157/1
diff --git a/include/osmocom/bsc/osmo_bsc_mgcp.h
b/include/osmocom/bsc/osmo_bsc_mgcp.h
index df18524..f7106b6 100644
--- a/include/osmocom/bsc/osmo_bsc_mgcp.h
+++ b/include/osmocom/bsc/osmo_bsc_mgcp.h
@@ -21,6 +21,7 @@
#pragma once
#include
+#include
/* MGCP state handler context (fsm etc..) */
struct mgcp_ctx {
@@ -43,6 +44,7 @@
struct gsm_lchan *lchan;
struct gsm_lchan *ho_lchan;
struct msgb *resp;
+ mgcp_trans_id_t mgw_pending_trans;
};
struct mgcp_ctx *mgcp_assignm_req(void *ctx, struct mgcp_client *mgcp, struct
osmo_bsc_sccp_con *conn,
diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c
index f5efa95..39ae9d0 100644
--- a/src/osmo-bsc/osmo_bsc_mgcp.c
+++ b/src/osmo-bsc/osmo_bsc_mgcp.c
@@ -182,6 +182,7 @@
OSMO_ASSERT(msg);
/* Transmit MGCP message to MGW */
+ mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, crcx_for_bts_resp_cb, mgcp_ctx);
if (rc < 0) {
handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL);
@@ -335,6 +336,7 @@
OSMO_ASSERT(msg);
/* Transmit MGCP message to MGW */
+ mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, mdcx_for_bts_resp_cb, mgcp_ctx);
if (rc < 0) {
handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL);
@@ -460,6 +462,7 @@
OSMO_ASSERT(msg);
/* Transmit MGCP message to MGW */
+ mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, crcx_for_net_resp_cb, mgcp_ctx);
if (rc < 0) {
handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL);
@@ -595,6 +598,7 @@
OSMO_ASSERT(msg);
/* Transmit MGCP message to MGW */
+ mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, dlcx_for_all_resp_cb, mgcp_ctx);
if (rc < 0) {
handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL);
@@ -652,6 +656,8 @@
msg = mgcp_msg_gen(mgcp, &mgcp_msg);
OSMO_ASSERT(msg);
+ /* Transmit MGCP message to MGW */
+ mgcp_ctx->mgw_pending_trans = mgcp_msg_trans_id(msg);
rc = mgcp_client_tx(mgcp, msg, mdcx_for_bts_ho_resp_cb, mgcp_ctx);
if (rc < 0) {
handle_error(mgcp_ctx, MGCP_ERR_MGW_TX_FAIL);
@@ -815,6 +821,9 @@
/* At least release the occupied endpoint ID */
mgcp_client_release_endpoint(mgcp_ctx->rtp_endpoint, mgcp);
+ /* Cancel the transaction that timed out */
+ mgcp_client_cancel(mgcp, mgcp_ctx->mgw_pending_trans);
+
/* Initiate self destruction of the FSM */
osmo_fsm_inst_state_chg(fi, ST_HALT, 0, 0);
osmo_fsm_inst_dispatch(fi, EV_TEARDOWN, mgcp_ctx);
--
To view, visit https://gerrit.osmocom.org/5157
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40794dff7d10e2b6a96863a2da7e9fbd5662a1bf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: dexter
openbsc[vlr_3G]: contrib: Add osmo-msc service file
Patch Set 2: Code-Review-1 I guess this can be abandoned now? -- To view, visit https://gerrit.osmocom.org/2537 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3cb8a90010451bed3a1462ac9ba48275c28d48aa Gerrit-PatchSet: 2 Gerrit-Project: openbsc Gerrit-Branch: vlr_3G Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-bsc[master]: Fix tests linking
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/5084/1/src/Makefile.am File src/Makefile.am: Line 25:libcommon-cs \ > Does this position really matter? I mean, if you are running with parallel I'm not 100% sure but I think that parallel make takes this into account. At least in the tests with "make -k" without this change it fails and with it works. -- To view, visit https://gerrit.osmocom.org/5084 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib195694ef92dd6f2328ffa3a818379f3742c5084 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: Yes
[MERGED] osmo-msc[master]: Remove unneeded .py scripts
Max has submitted this change and it was merged.
Change subject: Remove unneeded .py scripts
..
Remove unneeded .py scripts
The ipa.py has been moved to osmo-python-tests as osmo_ipa - use it for
vty and ctrl tests instead of local copy. The soap.py and twisted_ipa.py
are not MSC-specific: leftovers from repository split which are now
available in osmo-python-tests as well.
Change-Id: Ia3ab77846c9beae7eca32a81079a4a9bfa4dcc75
---
M Makefile.am
M configure.ac
D contrib/Makefile.am
D contrib/ipa.py
D contrib/soap.py
D contrib/twisted_ipa.py
M tests/ctrl_test_runner.py
M tests/vty_test_runner.py
8 files changed, 2 insertions(+), 863 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/Makefile.am b/Makefile.am
index 690deae..2f0a786 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@
include \
src \
tests \
- contrib \
$(NULL)
BUILT_SOURCES = $(top_srcdir)/.version
diff --git a/configure.ac b/configure.ac
index 5766fd0..6434869 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,5 +196,4 @@
tests/msc_vlr/Makefile
doc/Makefile
doc/examples/Makefile
-contrib/Makefile
Makefile)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index db6d0f5..000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = ipa.py
diff --git a/contrib/ipa.py b/contrib/ipa.py
deleted file mode 100755
index 71cbf45..000
--- a/contrib/ipa.py
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/python3
-# -*- mode: python-mode; py-indent-tabs-mode: nil -*-
-"""
-/*
- * Copyright (C) 2016 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 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-"""
-
-import struct, random, sys
-
-class IPA(object):
-"""
-Stateless IPA protocol multiplexer: add/remove/parse (extended) header
-"""
-version = "0.0.5"
-TCP_PORT_OML = 3002
-TCP_PORT_RSL = 3003
-# OpenBSC extensions: OSMO, MGCP_OLD
-PROTO = dict(RSL=0x00, CCM=0xFE, SCCP=0xFD, OML=0xFF, OSMO=0xEE,
MGCP_OLD=0xFC)
-# ...OML Router Control, GSUP GPRS extension, Osmocom Authn Protocol
-EXT = dict(CTRL=0, MGCP=1, LAC=2, SMSC=3, ORC=4, GSUP=5, OAP=6)
-# OpenBSC extension: SCCP_OLD
-MSGT = dict(PING=0x00, PONG=0x01, ID_GET=0x04, ID_RESP=0x05, ID_ACK=0x06,
SCCP_OLD=0xFF)
-_IDTAG = dict(SERNR=0, UNITNAME=1, LOCATION=2, TYPE=3, EQUIPVERS=4,
SWVERSION=5, IPADDR=6, MACADDR=7, UNIT=8)
-CTRL_GET = 'GET'
-CTRL_SET = 'SET'
-CTRL_REP = 'REPLY'
-CTRL_ERR = 'ERR'
-CTRL_TRAP = 'TRAP'
-
-def _l(self, d, p):
-"""
-Reverse dictionary lookup: return key for a given value
-"""
-if p is None:
-return 'UNKNOWN'
-return list(d.keys())[list(d.values()).index(p)]
-
-def _tag(self, t, v):
-"""
-Create TAG as TLV data
-"""
-return struct.pack(">HB", len(v) + 1, t) + v
-
-def proto(self, p):
-"""
-Lookup protocol name
-"""
-return self._l(self.PROTO, p)
-
-def ext(self, p):
-"""
-Lookup protocol extension name
-"""
-return self._l(self.EXT, p)
-
-def msgt(self, p):
-"""
-Lookup message type name
-"""
-return self._l(self.MSGT, p)
-
-def idtag(self, p):
-"""
-Lookup ID tag name
-"""
-return self._l(self._IDTAG, p)
-
-def ext_name(self, proto, exten):
-"""
-Return proper extension byte name depending on the protocol used
-"""
-if self.PROTO['CCM'] == proto:
-return self.msgt(exten)
-if self.PROTO['OSMO'] == proto:
-return self.ext(exten)
-return None
-
-def add_header(self, data, proto, ext=None):
-"""
-Add IPA header (with extension if necessary), data must be represented
as bytes
-"""
-if ext is None:
-return struct.pack(">HB", len(data) + 1, proto) + data
-return struct.pack(">HBB", len(data) + 1, proto, ext) + data
-
-def del_header(self, data):
-"""
-Strip IPA protocol header correctly removing extension if
osmo-pcu[master]: TBF: fix compiler warning in test
Patch Set 1: It's only used inside OSMO_ASSERT() where it's compared to 0. I think it would be better to just print it, but that's rather topic for another patch. -- To view, visit https://gerrit.osmocom.org/5119 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idf9e5f15faa7810411ed9d68ed43cf907eea2545 Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-pcu[master]: Fix compiler warning
Max has submitted this change and it was merged.
Change subject: Fix compiler warning
..
Fix compiler warning
Move function declarations which use gprs_rlcmac_ul_tbf into tbf.h to
avoid compiler warning:
In file included from pcu_vty.c:15:0:
bts.h:166:27: warning: ‘struct gprs_rlcmac_ul_tbf’ declared inside parameter
list will not be visible outside of this definition or declaration
void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta);
^~
bts.h:167:24: warning: ‘struct gprs_rlcmac_ul_tbf’ declared inside parameter
list will not be visible outside of this definition or declaration
void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta);
^~
Change-Id: Ic34c72c8bff6d7c775f56bb6026fec5425f7dcb4
---
M src/bts.h
M src/tbf.h
2 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/bts.h b/src/bts.h
index aaf81cf..a32e87d 100644
--- a/src/bts.h
+++ b/src/bts.h
@@ -163,8 +163,6 @@
extern "C" {
#endif
void bts_update_tbf_ta(const char *p, uint32_t fn, uint8_t trx_no, uint8_t ts,
int8_t ta, bool is_rach);
-void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta);
-void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta);
#ifdef __cplusplus
}
#endif
diff --git a/src/tbf.h b/src/tbf.h
index 95e1e89..e9d8df8 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -562,6 +562,15 @@
void maybe_schedule_uplink_acknack(const gprs_rlc_data_info *rlc);
};
+#ifdef __cplusplus
+extern "C" {
+#endif
+void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta);
+void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta);
+#ifdef __cplusplus
+}
+#endif
+
inline enum gprs_rlcmac_tbf_direction reverse(enum gprs_rlcmac_tbf_direction
dir)
{
return (enum gprs_rlcmac_tbf_direction)
--
To view, visit https://gerrit.osmocom.org/5118
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic34c72c8bff6d7c775f56bb6026fec5425f7dcb4
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: Max
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max
Gerrit-Reviewer: Neels Hofmeyr
libosmocore[master]: embedded: fix tests
Patch Set 1: We're testing it, so I've been asking this myself. One possible reason is that I'm using latest xubuntu and the build slave is old jenkins. Maybe smth in the toolchain have become stricter in a meantime? -- To view, visit https://gerrit.osmocom.org/5123 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icedad5ba3ed311ccdb97fa3ccd3002f5fda8be68 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmocore[master]: Fix embedded build
Max has submitted this change and it was merged.
Change subject: Fix embedded build
..
Fix embedded build
Do not attempt to load auth plugins - this does not make sense on
embedded target anyway.
Change-Id: Ie92d2eea21e19e499b3f3bb4d5a82e31fbbea3f0
---
M src/gsm/auth_core.c
M src/gsm/gprs_cipher_core.c
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c
index 9e3b2c0..400708f 100644
--- a/src/gsm/auth_core.c
+++ b/src/gsm/auth_core.c
@@ -20,6 +20,8 @@
*
*/
+#include "config.h"
+
#include
#include
#include
@@ -71,7 +73,11 @@
int osmo_auth_load(const char *path)
{
/* load all plugins available from path */
+#if !defined(EMBEDDED)
return osmo_plugin_load_all(path);
+#else
+ return -1;
+#endif
}
/*! Determine if a given authentication algorithm is supported
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6fa25d6..7f2b1a5 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,6 +23,8 @@
*
*/
+#include "config.h"
+
#include
#include
@@ -68,9 +70,11 @@
/* load all available GPRS cipher plugins */
int gprs_cipher_load(const char *path)
{
+#if !defined(EMBEDDED)
/* load all plugins available from path */
if (path)
return osmo_plugin_load_all(path);
+#endif
return 0;
}
--
To view, visit https://gerrit.osmocom.org/5122
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie92d2eea21e19e499b3f3bb4d5a82e31fbbea3f0
Gerrit-PatchSet: 2
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Max
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max
[MERGED] libosmocore[master]: embedded: fix tests
Max has submitted this change and it was merged. Change subject: embedded: fix tests .. embedded: fix tests In case of embedded build some tests are failing to link properly. Fix it: * do not run fsm_test unless CTRL is enabled * do not run fr_test unless GB is enabled * do not link loggingrb_test with libosmovty Change-Id: Icedad5ba3ed311ccdb97fa3ccd3002f5fda8be68 --- M tests/Makefile.am 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index c609d6a..78542b2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,12 +8,12 @@ conv/conv_test auth/milenage_test lapd/lapd_test \ gsm0808/gsm0808_test gsm0408/gsm0408_test \ gprs/gprs_test kasumi/kasumi_test gea/gea_test \ -logging/logging_test fr/fr_test codec/codec_test \ +logging/logging_test codec/codec_test \ loggingrb/loggingrb_test strrb/strrb_test \ comp128/comp128_test smscb/gsm0341_test\ bitvec/bitvec_test msgb/msgb_test bits/bitcomp_test\ bits/bitfield_test \ -tlv/tlv_test gsup/gsup_test oap/oap_test fsm/fsm_test \ +tlv/tlv_test gsup/gsup_test oap/oap_test \ write_queue/wqueue_test socket/socket_test \ coding/coding_test conv/conv_gsm0503_test \ abis/abis_test endian/endian_test sercomm/sercomm_test \ @@ -36,11 +36,11 @@ endif if ENABLE_CTRL -check_PROGRAMS += ctrl/ctrl_test +check_PROGRAMS += ctrl/ctrl_test fsm/fsm_test endif if ENABLE_GB -check_PROGRAMS += gb/bssgp_fc_test gb/gprs_bssgp_test gb/gprs_ns_test +check_PROGRAMS += gb/bssgp_fc_test gb/gprs_bssgp_test gb/gprs_ns_test fr/fr_test endif utils_utils_test_SOURCES = utils/utils_test.c @@ -137,7 +137,7 @@ codec_codec_test_LDADD = $(LDADD) $(top_builddir)/src/codec/libosmocodec.la loggingrb_loggingrb_test_SOURCES = loggingrb/loggingrb_test.c -loggingrb_loggingrb_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la +loggingrb_loggingrb_test_LDADD = $(LDADD) strrb_strrb_test_SOURCES = strrb/strrb_test.c -- To view, visit https://gerrit.osmocom.org/5123 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icedad5ba3ed311ccdb97fa3ccd3002f5fda8be68 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr
osmo-bsc[master]: Fix tests linking
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/5084/1/src/Makefile.am File src/Makefile.am: Line 25:libcommon-cs \ Does this position really matter? I mean, if you are running with parallel make, couldn't it fail the same way? -- To view, visit https://gerrit.osmocom.org/5084 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib195694ef92dd6f2328ffa3a818379f3742c5084 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: lynxis lazus Gerrit-HasComments: Yes
osmo-msc[master]: Remove utils imported from openbsc, fix building remaining u...
Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/5139 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If7e1af11cdac8587bb4d66fb4eacee4b79945359 Gerrit-PatchSet: 4 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] osmocom-bb[master]: mobile: Return the name of the configured "MS"
Holger Freyther has submitted this change and it was merged.
Change subject: mobile: Return the name of the configured "MS"
..
mobile: Return the name of the configured "MS"
In lua osmo.ms():name() will print the name/number of the MS. This
can be used by scripting code to use in events and then be analyzed.
Change-Id: I881d3e87daa19f4e6f4f5bd30fe95906129e60ef
---
M src/host/layer23/src/mobile/script_lua.c
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/mobile/script_lua.c
b/src/host/layer23/src/mobile/script_lua.c
index e63d205..1b80c48 100644
--- a/src/host/layer23/src/mobile/script_lua.c
+++ b/src/host/layer23/src/mobile/script_lua.c
@@ -389,6 +389,12 @@
return 1;
}
+static int lua_ms_name(lua_State *L)
+{
+ lua_pushstring(L, get_primitive(L)->ms->name);
+ return 1;
+}
+
static const struct luaL_Reg ms_funcs[] = {
{ "imsi", lua_ms_imsi },
{ "imei", lua_ms_imei },
@@ -398,6 +404,7 @@
{ "start", lua_ms_no_shutdown },
{ "stop", lua_ms_shutdown },
{ "sms_send_simple", lua_ms_sms_send_simple },
+ { "number", lua_ms_name },
{ NULL, NULL },
};
--
To view, visit https://gerrit.osmocom.org/5156
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I881d3e87daa19f4e6f4f5bd30fe95906129e60ef
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Holger Freyther
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Holger Freyther
Gerrit-Reviewer: Jenkins Builder
[MERGED] osmocom-bb[master]: mobile: Simplify code and check the cb ref in load_cb
Holger Freyther has submitted this change and it was merged.
Change subject: mobile: Simplify code and check the cb ref in load_cb
..
mobile: Simplify code and check the cb ref in load_cb
Change parameters and check if the cb_ref is valid or not.
Change-Id: I74fbcd7e853e24b1225ecc4c19304134b8467c9b
---
M src/host/layer23/src/mobile/script_lua.c
1 file changed, 14 insertions(+), 21 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/src/mobile/script_lua.c
b/src/host/layer23/src/mobile/script_lua.c
index 422f9e4..e63d205 100644
--- a/src/host/layer23/src/mobile/script_lua.c
+++ b/src/host/layer23/src/mobile/script_lua.c
@@ -97,9 +97,14 @@
};
/* Push table and function. Stack+=2 */
-static bool load_cb(lua_State *L, int ref, const char *cb_name)
+static bool load_cb(struct osmocom_ms *ms, const char *cb_name)
{
- lua_rawgeti(L, LUA_REGISTRYINDEX, ref);
+ struct lua_State *L = ms->lua_state;
+
+ if (ms->lua_cb_ref == LUA_REFNIL)
+ return false;
+
+ lua_rawgeti(L, LUA_REGISTRYINDEX, ms->lua_cb_ref);
lua_pushstring(L, cb_name);
lua_gettable(L, -2);
if (lua_isnil(L, -1)) {
@@ -138,12 +143,9 @@
static void handle_started(struct mobile_prim_intf *intf, struct
mobile_started_param *param)
{
- lua_State *L = intf->ms->lua_state;
+ struct lua_State *L = intf->ms->lua_state;
- if (intf->ms->lua_cb_ref == LUA_REFNIL)
- return;
-
- if (!load_cb(L, intf->ms->lua_cb_ref, "Started"))
+ if (!load_cb(intf->ms, "Started"))
return;
lua_pushinteger(L, param->started);
@@ -154,12 +156,9 @@
static void handle_shutdown(struct mobile_prim_intf *intf, struct
mobile_shutdown_param *param)
{
- lua_State *L = intf->ms->lua_state;
+ struct lua_State *L = intf->ms->lua_state;
- if (intf->ms->lua_cb_ref == LUA_REFNIL)
- return;
-
- if (!load_cb(L, intf->ms->lua_cb_ref, "Shutdown"))
+ if (!load_cb(intf->ms, "Shutdown"))
return;
lua_pushinteger(L, param->old_state);
@@ -171,12 +170,9 @@
static void handle_sms(struct mobile_prim_intf *intf, struct mobile_sms_param
*param)
{
- lua_State *L = intf->ms->lua_state;
+ struct lua_State *L = intf->ms->lua_state;
- if (intf->ms->lua_cb_ref == LUA_REFNIL)
- return;
-
- if (!load_cb(L, intf->ms->lua_cb_ref, "Sms"))
+ if (!load_cb(intf->ms, "Sms"))
return;
lua_createtable(L, 0, 11);
@@ -225,10 +221,7 @@
{
lua_State *L = intf->ms->lua_state;
- if (intf->ms->lua_cb_ref == LUA_REFNIL)
- return;
-
- if (!load_cb(L, intf->ms->lua_cb_ref, "Mm"))
+ if (!load_cb(intf->ms, "Mm"))
return;
lua_pushinteger(L, param->state);
--
To view, visit https://gerrit.osmocom.org/5155
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74fbcd7e853e24b1225ecc4c19304134b8467c9b
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Holger Freyther
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Holger Freyther
Gerrit-Reviewer: Jenkins Builder
