Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 396s] | #define HAVE_STRINGS_H 1 [ 396s] | #define HAVE_INTTYPES_H 1 [ 396s] | #define HAVE_STDINT_H 1 [ 396s] | #define HAVE_UNISTD_H 1 [ 396s] | #define HAVE_DLFCN_H 1 [ 396s] | #define LT_OBJDIR ".libs/" [ 396s] | #define HAVE_LIBSCTP 1 [ 396s] | #define BUILD_SMPP 1 [ 396s] | #define BUILD_IU 1 [ 396s] | #define STDC_HEADERS 1 [ 396s] | #define HAVE_DBI_DBD_H 1 [ 396s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 396s] | [ 396s] | configure: exit 0 [ 396s] [ 396s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 396s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 396s] make: *** [debian/rules:45: build] Error 2 [ 396s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 396s] [ 396s] build70 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 04:28:04 UTC 2019. [ 396s] [ 396s] ### VM INTERACTION START ### [ 399s] [ 383.041190] sysrq: SysRq : Power Off [ 399s] [ 383.049584] reboot: Power down [ 399s] ### VM INTERACTION END ### [ 399s] [ 399s] build70 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 04:28:09 UTC 2019. [ 399s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/armv7l
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/armv7l
Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 668s] -DDB NOTICE verify_sms('Expired SMS'): match
[ 668s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 668s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 668s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 668s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 668s] +Assert failed rc == 0 db_sms_test.c:541
[ 668s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 26: 28907 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 668s] --- expout 2019-06-05 04:23:02.05000 +
[ 668s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout
2019-06-05 04:23:02.08000 +
[ 668s] @@ -0,0 +1 @@
[ 668s] +backtrace() returned 0 addresses
[ 668s] ./testsuite.at:23: exit code was 134, expected 0
[ 668s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 668s] debian/rules:63: recipe for target 'override_dh_auto_test' failed
[ 668s] make[1]: *** [override_dh_auto_test] Error 1
[ 668s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 668s] debian/rules:45: recipe for target 'build' failed
[ 668s] make: *** [build] Error 2
[ 668s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 668s]
[ 668s] armbuild21 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
04:23:03 UTC 2019.
[ 668s]
[ 668s] ### VM INTERACTION START ###
[ 670s] [ 649.439871] sysrq: SysRq : Power Off
[ 670s] [ 649.441262] reboot: Power down
[ 671s] ### VM INTERACTION END ###
[ 671s]
[ 671s] armbuild21 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
04:23:07 UTC 2019.
[ 671s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Raspbian_9.0/armv7l
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_9.0/armv7l
Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_9.0/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 621s] -DDB NOTICE verify_sms('Expired SMS'): match
[ 621s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 621s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 621s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 621s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 621s] +Assert failed rc == 0 db_sms_test.c:541
[ 621s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 26: 29369 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 621s] --- expout 2019-06-05 04:16:24.86500 +
[ 621s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout
2019-06-05 04:16:24.89000 +
[ 621s] @@ -0,0 +1 @@
[ 621s] +backtrace() returned 0 addresses
[ 621s] ./testsuite.at:23: exit code was 134, expected 0
[ 621s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 621s] debian/rules:63: recipe for target 'override_dh_auto_test' failed
[ 621s] make[1]: *** [override_dh_auto_test] Error 1
[ 621s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 621s] debian/rules:45: recipe for target 'build' failed
[ 621s] make: *** [build] Error 2
[ 621s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 621s]
[ 621s] armbuild22 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
04:16:26 UTC 2019.
[ 621s]
[ 621s] ### VM INTERACTION START ###
[ 623s] [ 602.620632] sysrq: SysRq : Power Off
[ 623s] [ 602.637668] reboot: Power down
[ 624s] ### VM INTERACTION END ###
[ 624s]
[ 624s] armbuild22 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
04:16:30 UTC 2019.
[ 624s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.10/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 534s] | #define HAVE_STRINGS_H 1 [ 534s] | #define HAVE_INTTYPES_H 1 [ 534s] | #define HAVE_STDINT_H 1 [ 534s] | #define HAVE_UNISTD_H 1 [ 534s] | #define HAVE_DLFCN_H 1 [ 534s] | #define LT_OBJDIR ".libs/" [ 534s] | #define HAVE_LIBSCTP 1 [ 534s] | #define BUILD_SMPP 1 [ 534s] | #define BUILD_IU 1 [ 534s] | #define STDC_HEADERS 1 [ 534s] | #define HAVE_DBI_DBD_H 1 [ 534s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 534s] | [ 534s] | configure: exit 0 [ 534s] [ 534s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 534s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 534s] make: *** [debian/rules:45: build] Error 2 [ 534s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 534s] [ 534s] lamb15 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:22:33 UTC 2019. [ 534s] [ 534s] ### VM INTERACTION START ### [ 538s] [ 523.094375] sysrq: SysRq : Power Off [ 538s] [ 523.100085] reboot: Power down [ 538s] ### VM INTERACTION END ### [ 538s] [ 538s] lamb15 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:22:37 UTC 2019. [ 538s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 541s] | ac_cv_env_LIBOSMOCORE_LIBS_value= [ 541s] | ac_cv_env_LIBOSMOCTRL_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMOCTRL_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMOCTRL_LIBS_set= [ 541s] | ac_cv_env_LIBOSMOCTRL_LIBS_value= [ 541s] | ac_cv_env_LIBOSMOGSM_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMOGSM_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMOGSM_LIBS_set= [ 541s] | ac_cv_env_LIBOSMOGSM_LIBS_value= [ 541s] | ac_cv_env_LIBOSMOGSUPCLIENT_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMOGSUPCLIENT_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMOGSUPCLIENT_LIBS_set= [ 541s] | ac_cv_env_LIBOSMOGSUPCLIENT_LIBS_value= [ 541s] | ac_cv_env_LIBOSMOMGCPCLIENT_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMOMGCPCLIENT_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMOMGCPCLIENT_LIBS_set= [ 541s] | ac_cv_env_LIBOSMOMGCPCLIENT_LIBS_value= [ 541s] | ac_cv_env_LIBOSMONETIF_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMONETIF_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMONETIF_LIBS_set= [ 541s] | ac_cv_env_LIBOSMONETIF_LIBS_value= [ 541s] | ac_cv_env_LIBOSMORANAP_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMORANAP_CFLAGS_value= [ 541s] | ac_cv_env_LIBOSMORANAP_LIBS_set= [ 541s] | ac_cv_env_LIBOSMORANAP_LIBS_value= [ 541s] | ac_cv_env_LIBOSMOSCCP_CFLAGS_set= [ 541s] | ac_cv_env_LIBOSMOSCCP_CFLAGS_value= [ 543s] | ac_cv_env_LIBOSMOSCCP_LIBS_set=[ 477.907925] sysrq: SysRq : Power Off [ 543s] [ 477.912936] reboot: Power down -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.10/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.10/x86_64
Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.10/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 271s] -DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit
encoding)'): TP-User-Data mismatch
[ 271s] -DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit
encoding)'): success, as expected
[ 271s] -DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit
encoding)'): TP-User-Data mismatch
[ 271s] -DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
[ 271s] -DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
[ 271s] -DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
[ 271s] -DDB NOTICE verify_sms('Expired SMS'): match
[ 271s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 271s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 271s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 271s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 271s] +Assert failed rc == 0 db_sms_test.c:541
[ 271s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 26: 31773 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 271s] ./testsuite.at:23: exit code was 134, expected 0
[ 271s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 271s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1
[ 271s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 271s] make: *** [debian/rules:45: build] Error 2
[ 271s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 271s]
[ 271s] sheep84 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:20:28 UTC 2019.
[ 271s]
[ 271s] ### VM INTERACTION START ###
[ 274s] [ 264.116596] sysrq: SysRq : Power Off
[ 274s] [ 264.121769] reboot: Power down
[ 274s] ### VM INTERACTION END ###
[ 274s]
[ 274s] sheep84 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:20:31 UTC 2019.
[ 274s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 339s] | $ ./config.status [ 339s] | [ 339s] | on cloud123 [ 339s] | [ 339s] | config.status:1172: creating include/Makefile [ 339s] | config.status:1172: creating include/osmocom/Makefile [ 339s] | config.status:1172: creating include/osmocom/msc/Makefile [ 339s] | config.status:1172: creating src/Makefile [ 339s] | config.status:1172: creating src/libmsc/Makefile [ 339s] | config.status:1172: creating src/libvlr/Makefile [ 339s] | config.status:1172: creating src/osmo-msc/Makefile [ 339s] | config.status:1172: creating src/utils/Makefile [ 339s] | config.status:1172: creating tests/Makefile [ 339s] | config.status:1172: creating tests/atlocal [ 339s] | config.status:1172: creating tests/smpp/Makefile [ 339s] | config.status:1172: creating tests/db_sms/Makefile [ 339s] | config.status:1172: creating tests/sms_queue/Makefile [ 339s] | config.status:1172: creating tests/msc_vlr/Makefile [ 339s] | config.status:1172: creating doc/Makefile [ 339s] | config.status:1172: creating doc/examples/Makefile [ 339s] | config.status:1172: creating doc/manuals/Makefile [ 339s] | config.status:1172: creating doc/sequence_charts/Makefile [ 339s] | config.status:1172: creating contrib/Makefile [ 341s] | config.sta[ 309.850940] sysrq: SysRq : Power Off [ 341s] [ 309.860777] reboot: Power down [ 342s] ### VM INTERACTION END ### [ 342s] [ 342s] cloud123 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:17:18 UTC 2019. [ 342s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 373s] +DDB FATAL Failed to create database connection to sqlite3 db ':memory:'; Is the sqlite3 database driver for libdbi installed on this system? [ 373s] +Assert failed rc == 0 db_sms_test.c:541 [ 373s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source: line 26: 3436 Aborted $abs_top_builddir/tests/db_sms/db_sms_test [ 373s] --- expout 2019-06-05 03:16:02.99600 + [ 373s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout 2019-06-05 03:16:03.00400 + [ 373s] @@ -0,0 +1,5 @@ [ 373s] +backtrace() returned 5 addresses [ 373s] +/usr/lib/x86_64-linux-gnu/libosmocore.so.12(osmo_panic+0xcb) [0x7f54015ea4fb] [ 373s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x40852e] [ 373s] +/lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf5) [0x7f53fffc4b45] [ 373s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x40881b] [ 373s] ./testsuite.at:23: exit code was 134, expected 0 [ 373s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED (testsuite.at:23) [ 373s] debian/rules:63: recipe for target 'override_dh_auto_test' failed [ 373s] make[1]: *** [override_dh_auto_test] Error 1 [ 373s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 373s] debian/rules:45: recipe for target 'build' failed [ 373s] make: *** [build] Error 2 [ 373s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 373s] [ 373s] lamb52 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:16:05 UTC 2019. [ 373s] [ 373s] ### VM INTERACTION START ### [ 373s] Powering off. [ 373s] [ 358.251590] reboot: Power down [ 374s] ### VM INTERACTION END ### [ 374s] [ 374s] lamb52 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:16:09 UTC 2019. [ 374s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 572s] | #define HAVE_STRINGS_H 1 [ 572s] | #define HAVE_INTTYPES_H 1 [ 572s] | #define HAVE_STDINT_H 1 [ 572s] | #define HAVE_UNISTD_H 1 [ 572s] | #define HAVE_DLFCN_H 1 [ 572s] | #define LT_OBJDIR ".libs/" [ 572s] | #define HAVE_LIBSCTP 1 [ 572s] | #define BUILD_SMPP 1 [ 572s] | #define BUILD_IU 1 [ 572s] | #define STDC_HEADERS 1 [ 572s] | #define HAVE_DBI_DBD_H 1 [ 572s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 572s] | [ 572s] | configure: exit 0 [ 572s] [ 572s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 572s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 572s] make: *** [debian/rules:45: build] Error 2 [ 572s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 572s] [ 572s] lamb16 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:15:16 UTC 2019. [ 572s] [ 572s] ### VM INTERACTION START ### [ 575s] [ 557.870646] sysrq: SysRq : Power Off [ 575s] [ 557.910474] reboot: Power down [ 575s] ### VM INTERACTION END ### [ 575s] [ 575s] lamb16 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:15:20 UTC 2019. [ 575s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_18.04/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_18.04/x86_64
Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_18.04/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 369s] -DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
[ 369s] -DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
[ 369s] -DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
[ 369s] -DDB NOTICE verify_sms('Expired SMS'[ 353.252200] serial8250: too
much work for irq4
[ 369s] ): match
[ 369s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 369s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 369s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 369s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 369s] +Assert failed rc == 0 db_sms_test.c:541
[ 369s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 26: 32186 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 369s] ./testsuite.at:23: exit code was 134, expected 0
[ 369s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 369s] debian/rules:63: recipe for target 'override_dh_auto_test' failed
[ 369s] make[1]: *** [override_dh_auto_test] Error 1
[ 369s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 369s] debian/rules:45: recipe for target 'build' failed
[ 369s] make: *** [build] Error 2
[ 369s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 369s]
[ 369s] lamb65 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:14:14 UTC 2019.
[ 369s]
[ 369s] ### VM INTERACTION START ###
[ 372s] [ 356.446427] sysrq: SysRq : Power Off
[ 372s] [ 356.451730] reboot: Power down
[ 372s] ### VM INTERACTION END ###
[ 372s]
[ 372s] lamb65 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:14:18 UTC 2019.
[ 372s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 574s] | #define HAVE_STDINT_H 1 [ 574s] | #define HAVE_UNISTD_H 1 [ 574s] | #define HAVE_DLFCN_H 1 [ 574s] | #define LT_OBJDIR ".libs/" [ 574s] | #define HAVE_LIBSCTP 1 [ 574s] | #define BUILD_SMPP 1 [ 574s] | #define BUILD_IU 1 [ 574s] | #define STDC_HEADERS 1 [ 574s] | #define HAVE_DBI_DBD_H 1 [ 574s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 574s] | [ 574s] | configure: exit 0 [ 574s] [ 574s] debian/rules:63: recipe for target 'override_dh_auto_test' failed [ 574s] make[1]: *** [override_dh_auto_test] Error 1 [ 574s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 574s] debian/rules:45: recipe for target 'build' failed [ 574s] make: *** [build] Error 2 [ 574s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 574s] [ 574s] cloud105 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:12:58 UTC 2019. [ 574s] [ 574s] ### VM INTERACTION START ### [ 577s] [ 541.245009] sysrq: SysRq : Power Off [ 577s] [ 541.548578] reboot: Power down [ 578s] ### VM INTERACTION END ### [ 578s] [ 578s] cloud105 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:13:03 UTC 2019. [ 578s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64
Package network:osmocom:nightly/osmo-msc failed to build in
Debian_Unstable/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 386s] -DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit
encoding)'): TP-User-Data mismatch
[ 386s] -DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit
encoding)'): success, as expected
[ 386s] -DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit
encoding)'): TP-User-Data mismatch
[ 386s] -DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
[ 386s] -DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
[ 386s] -DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
[ 386s] -DDB NOTICE verify_sms('Expired SMS'): match
[ 386s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 386s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 386s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 386s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 386s] +Assert failed rc == 0 db_sms_test.c:541
[ 386s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 15: 31077 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 386s] ./testsuite.at:23: exit code was 134, expected 0
[ 386s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 386s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1
[ 386s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 386s] make: *** [debian/rules:45: build] Error 2
[ 386s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 386s]
[ 386s] lamb20 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:12:55 UTC 2019.
[ 386s]
[ 386s] ### VM INTERACTION START ###
[ 389s] [ 372.150655] sysrq: SysRq : Power Off
[ 389s] [ 372.156146] reboot: Power down
[ 389s] ### VM INTERACTION END ###
[ 389s]
[ 389s] lamb20 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:12:58 UTC 2019.
[ 389s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_19.04/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_19.04/x86_64
Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_19.04/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-msc
Last lines of build log:
[ 486s] -DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit
encoding)'): TP-User-Data mismatch
[ 486s] -DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit
encoding)'): success, as expected
[ 486s] -DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit
encoding)'): TP-User-Data mismatch
[ 486s] -DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected
[ 486s] -DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected
[ 486s] -DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result
[ 486s] -DDB NOTICE verify_sms('Expired SMS'): match
[ 486s] -DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
[ 486s] -DDB NOTICE verify_sms('Empty TP-UD'): match
[ 486s] -full talloc report on 'null_context' (total 0 bytes in 1
blocks)
[ 486s] +DDB FATAL Failed to create database connection to sqlite3 db
':memory:'; Is the sqlite3 database driver for libdbi installed on this system?
[ 486s] +Assert failed rc == 0 db_sms_test.c:541
[ 486s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source:
line 15: 32359 Aborted
$abs_top_builddir/tests/db_sms/db_sms_test
[ 486s] ./testsuite.at:23: exit code was 134, expected 0
[ 486s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED
(testsuite.at:23)
[ 486s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1
[ 486s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 486s] make: *** [debian/rules:45: build] Error 2
[ 486s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 486s]
[ 486s] lamb55 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:11:22 UTC 2019.
[ 486s]
[ 486s] ### VM INTERACTION START ###
[ 489s] [ 459.576399] sysrq: SysRq : Power Off
[ 489s] [ 459.661125] reboot: Power down
[ 489s] ### VM INTERACTION END ###
[ 489s]
[ 489s] lamb55 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5
03:11:26 UTC 2019.
[ 489s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-msc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 380s] +DDB FATAL Failed to create database connection to sqlite3 db ':memory:'; Is the sqlite3 database driver for libdbi installed on this system? [ 380s] +Assert failed rc == 0 db_sms_test.c:541 [ 380s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source: line 26: 2625 Aborted $abs_top_builddir/tests/db_sms/db_sms_test [ 380s] --- expout 2019-06-05 03:10:08.980238841 + [ 380s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout 2019-06-05 03:10:08.992238841 + [ 380s] @@ -0,0 +1,5 @@ [ 380s] +backtrace() returned 5 addresses [ 380s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf760a39c] [ 380s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x804e329] [ 380s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf7) [0xf7240637] [ 380s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x804e5f2] [ 380s] ./testsuite.at:23: exit code was 134, expected 0 [ 380s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED (testsuite.at:23) [ 380s] debian/rules:63: recipe for target 'override_dh_auto_test' failed [ 380s] make[1]: *** [override_dh_auto_test] Error 1 [ 380s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 380s] debian/rules:45: recipe for target 'build' failed [ 380s] make: *** [build] Error 2 [ 380s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 380s] [ 380s] cloud114 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:10:10 UTC 2019. [ 380s] [ 380s] ### VM INTERACTION START ### [ 383s] [ 330.306930] sysrq: SysRq : Power Off [ 383s] [ 330.321247] reboot: Power down [ 384s] ### VM INTERACTION END ### [ 384s] [ 384s] cloud114 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:10:15 UTC 2019. [ 384s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 239s] +Assert failed rc == 0 db_sms_test.c:541 [ 239s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source: line 26: 2993 Aborted $abs_top_builddir/tests/db_sms/db_sms_test [ 239s] --- expout 2019-06-05 03:07:18.30800 + [ 239s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout 2019-06-05 03:07:18.32000 + [ 239s] @@ -0,0 +1,6 @@ [ 239s] +backtrace() returned 6 addresses [ 239s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_generate_backtrace+0x11) [0xf768ffd1] [ 239s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf768fdfc] [ 239s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x804e35c] [ 239s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf3) [0xf72e4723] [ 239s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test() [0x804e672] [ 239s] ./testsuite.at:23: exit code was 134, expected 0 [ 239s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED (testsuite.at:23) [ 239s] debian/rules:63: recipe for target 'override_dh_auto_test' failed [ 239s] make[1]: *** [override_dh_auto_test] Error 1 [ 239s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 239s] debian/rules:45: recipe for target 'build' failed [ 239s] make: *** [build] Error 2 [ 239s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 239s] [ 239s] lamb05 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:07:19 UTC 2019. [ 239s] [ 239s] ### VM INTERACTION START ### [ 240s] Powering off. [ 240s] [ 227.116411] reboot: Power down [ 240s] ### VM INTERACTION END ### [ 240s] [ 240s] lamb05 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:07:21 UTC 2019. [ 240s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-msc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 266s] +DDB FATAL Failed to create database connection to sqlite3 db ':memory:'; Is the sqlite3 database driver for libdbi installed on this system? [ 266s] +Assert failed rc == 0 db_sms_test.c:541 [ 266s] +/usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/test-source: line 26: 28481 Aborted $abs_top_builddir/tests/db_sms/db_sms_test [ 266s] --- expout 2019-06-05 03:03:07.668367394 + [ 266s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/3/stdout 2019-06-05 03:03:07.676367394 + [ 266s] @@ -0,0 +1,5 @@ [ 266s] +backtrace() returned 5 addresses [ 266s] +/usr/lib/i386-linux-gnu/libosmocore.so.12(osmo_panic+0x4c) [0xf768a39c] [ 266s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test(main+0xa9e) [0x565c5f4e] [ 266s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf6) [0xf729e286] [ 266s] +/usr/src/packages/BUILD/tests/db_sms/db_sms_test(+0x8307) [0x565c6307] [ 266s] ./testsuite.at:23: exit code was 134, expected 0 [ 266s] 3. testsuite.at:19: 3. db_sms_test (testsuite.at:19): FAILED (testsuite.at:23) [ 266s] debian/rules:63: recipe for target 'override_dh_auto_test' failed [ 266s] make[1]: *** [override_dh_auto_test] Error 1 [ 266s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 266s] debian/rules:45: recipe for target 'build' failed [ 266s] make: *** [build] Error 2 [ 266s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 266s] [ 266s] build83 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:03:08 UTC 2019. [ 266s] [ 266s] ### VM INTERACTION START ### [ 268s] [ 255.699382] sysrq: SysRq : Power Off [ 268s] [ 255.701292] reboot: Power down [ 268s] ### VM INTERACTION END ### [ 268s] [ 268s] build83 failed "build osmo-msc_1.3.1.135.17aa.dsc" at Wed Jun 5 03:03:11 UTC 2019. [ 268s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Raspbian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 527s] -Returned: 0, Current node: 1 '%s> ' [ 527s] -Going to execute 'ambiguous_str' [ 527s] -Called: 'ambiguous_str [ARG]' (argc=0) [ 527s] -Returned: 0, Current node: 1 '%s> ' [ 527s] -Going to execute 'ambiguous_str arg' [ 527s] -Called: 'ambiguous_str [ARG]' (argc=1) [ 527s] -Returned: 0, Current node: 1 '%s> ' [ 527s] -Going to execute 'ambiguous_str arg keyword' [ 527s] -Called: 'ambiguous_str ARG keyword' [ 527s] -Returned: 0, Current node: 1 '%s> ' [ 527s] -All tests passed [ 527s] ./testsuite.at:196: exit code was 139, expected 0 [ 527s] 31. testsuite.at:192: 31. vty (testsuite.at:192): FAILED (testsuite.at:196) [ 527s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 527s] make[1]: *** [override_dh_auto_test] Error 1 [ 527s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 527s] debian/rules:15: recipe for target 'build' failed [ 527s] make: *** [build] Error 2 [ 527s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 527s] [ 527s] armbuild21 failed "build libosmocore_1.1.0.44.ef7be.dsc" at Wed Jun 5 02:41:08 UTC 2019. [ 527s] [ 527s] ### VM INTERACTION START ### [ 530s] [ 510.732471] sysrq: SysRq : Power Off [ 530s] [ 510.78] reboot: Power down [ 530s] ### VM INTERACTION END ### [ 530s] [ 530s] armbuild21 failed "build libosmocore_1.1.0.44.ef7be.dsc" at Wed Jun 5 02:41:11 UTC 2019. [ 530s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...libosmocore[master]: lapdm: Allow user to specify T200 values; Use correct N200 values
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/14339 to look at the new patch set (#4). Change subject: lapdm: Allow user to specify T200 values; Use correct N200 values .. lapdm: Allow user to specify T200 values; Use correct N200 values TS 04.06 specifies a N200 re-transmission counter that depends on the channel type, which we didn't care about at all so far. Let's have the caller tell us the channel type so we can internally look up the correct N200 value for it. At the same time, permit the user to specify T200 re-transmission timer values for each SAPI on both DCCH and ACCH, which is required at least in the BTS as per GSM TS 12.21. Also, extend the timer resolution of the API from seconds to milli-seconds, which is more applicable as particularly on the FACCH the recommended values are in the 200ms range. Change-Id: I90fdc4dd4720d4e02213197c894eb0a55a39158c Related: OS#3906 Related: OS#2294 Related: OS#4037 --- M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 3 files changed, 85 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/14339/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I90fdc4dd4720d4e02213197c894eb0a55a39158c Gerrit-Change-Number: 14339 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/db.c: get rid of hard-coded SMS expiry threshold
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13631 ) Change subject: libmsc/db.c: get rid of hard-coded SMS expiry threshold .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ce6b1ab50986dc69a2be4ea62b6a24c7f3f8f0a Gerrit-Change-Number: 13631 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:36:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: introduce and use parse_sm_ud_from_result()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13488 ) Change subject: libmsc/db.c: introduce and use parse_sm_ud_from_result() .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 Gerrit-Change-Number: 13488 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 21:36:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: warn user about SMS text truncation
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13489 ) Change subject: libmsc/db.c: warn user about SMS text truncation .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I75e852ebe44ba4784572cbffa029e13f0d3c430c Gerrit-Change-Number: 13489 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 21:36:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: fix potential integer overflow
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13470 ) Change subject: libmsc/db.c: fix potential integer overflow .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2 Gerrit-Change-Number: 13470 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:35:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: add VTY parameter to toggle authentication
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 ) Change subject: osmo-sgsn: add VTY parameter to toggle authentication .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9909145e7e0af587c28827e16301a61b13eedaa9 Gerrit-Change-Number: 14194 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:31:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: doc/manuals/vty: regenerate sgsn_vty_reference.xml
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 ) Change subject: doc/manuals/vty: regenerate sgsn_vty_reference.xml .. doc/manuals/vty: regenerate sgsn_vty_reference.xml Change-Id: I3dfe3598055457cc9724a371590e676f1920652b --- M doc/manuals/vty/sgsn_vty_reference.xml 1 file changed, 21 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index 52d4213..7619215 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -222,6 +222,7 @@ + @@ -733,7 +734,7 @@ - + @@ -768,6 +769,7 @@ + @@ -1488,7 +1490,8 @@ - + + @@ -1518,7 +1521,7 @@ - + @@ -1553,6 +1556,7 @@ + @@ -1696,10 +1700,11 @@ - + + @@ -1762,7 +1767,7 @@ - + @@ -1772,6 +1777,7 @@ + @@ -2234,6 +2240,13 @@ + + + + + + + @@ -2325,7 +2338,8 @@ - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dfe3598055457cc9724a371590e676f1920652b Gerrit-Change-Number: 14377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: doc/manuals/vty: regenerate sgsn_vty_reference.xml
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 ) Change subject: doc/manuals/vty: regenerate sgsn_vty_reference.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dfe3598055457cc9724a371590e676f1920652b Gerrit-Change-Number: 14377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 21:31:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 ) Change subject: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If9b0c0d031477ca87786aab5c269d00748e896c8 Gerrit-Change-Number: 14195 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:31:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: Add LAPDm test for SABM with wrong C/R bit
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378 )
Change subject: bts: Add LAPDm test for SABM with wrong C/R bit
..
bts: Add LAPDm test for SABM with wrong C/R bit
Test that the BTS will take no action when it receives an SABM frame
with the C bit set wrong (R); Inspired by TS 51.010-1 25.2.5.2
Implemented as TC_sabm_incorrect_c().
Related: OS#4032
Change-Id: I4fbe7e708c9b1a2c04e5d24a205b5b5af20ff8c7
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 50 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index 12f24eb..edbd37b 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -1052,6 +1052,55 @@
var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
f_testmatrix_each_chan(pars, refers(f_TC_incorrect_cr));
}
+
+/* test that the BTS will take no action when it receives an SABM frame with
the C bit set wrong (R)
+ Inspired by TS 51.010-1 25.2.5.2 */
+private function f_TC_sabm_incorrect_c(charstring id) runs on ConnHdlr {
+ var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0));
+ var integer sapi := link_id.sapi;
+ var boolean is_sacch := false;
+ if (link_id.c == SACCH) {
+ is_sacch := true;
+ }
+ timer T := 3.0;
+ var default d;
+
+ fp_common_init();
+
+ /* some common altstep for meas res and other background noise */
+ d := activate(as_ignore_background(true));
+ RSL.clear;
+ LAPDM.clear;
+
+ f_establish_mo(link_id);
+
+ /* Send I-frame SAPI = 0, C = 1, P = 0, M = 0, L = 3, N(S) = 0, N(R) =
0 */
+ var octetstring l3_mo := '010203'O;
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD,
p:=false, nr:=0, ns:=0,
+l3:=l3_mo)));
+ /* Expect RR SAPI = 0, R = 1, F = 0, M = 0, L = 0, N(R) = 1 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=false, nr:=1)));
+ RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo));
+ /* Send SABM SAPI = 0, C = 0, P = 1, M = 0, L = 0 */
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_SABM(sapi, c_r:=cr_MO_RSP,
p:=true, l3:=''O)));
+ /* Expect RSL ERR IND */
+ RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, '0C'O));
+ /* Expect fill frame C = 0, P = 0, M = 0, L = 0 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_UI(0, ?, ''O)));
+ /* Send RR command (P=1) SAPI = 0, C = 1, P = 1, M = 0, L = 0, N(R) = 0
*/
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD,
p:=true, nr:=0)));
+ /* Expect RR response (F=1) SAPI = 0, R = 1, F = 1, M = 0, L = 0, N(R)
= 1 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=true, nr:=1)));
+
+ deactivate(d);
+
+ fp_common_fini();
+}
+testcase TC_sabm_incorrect_c() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
+ f_testmatrix_each_chan(pars, refers(f_TC_sabm_incorrect_c));
+}
+
control {
execute(TC_foo());
execute(TC_sabm_ua_dcch_sapi0());
@@ -1071,6 +1120,7 @@
execute(TC_t200_n200());
execute(TC_rr_response_frame_loss());
execute(TC_incorrect_cr());
+ execute(TC_sabm_incorrect_c());
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fbe7e708c9b1a2c04e5d24a205b5b5af20ff8c7
Gerrit-Change-Number: 14378
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: bts: Add test csse for I frame with wrong C/R value
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350 )
Change subject: bts: Add test csse for I frame with wrong C/R value
..
bts: Add test csse for I frame with wrong C/R value
Implemented as BTS_Tests_LAPDm.TC_incorrect_cr()
Related: OS#4032
Change-Id: I19e50049625bd31662a1e22b1394b69b2d249104
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 54 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index bf359f2..12f24eb 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -999,6 +999,59 @@
f_testmatrix_each_chan(pars, refers(f_TC_rr_response_frame_loss));
}
+/* Ensure BTS ignores I frames with wrong C/R bit; Inspired by TS 51.010-1
25.2.5.1 */
+private function f_TC_incorrect_cr(charstring id) runs on ConnHdlr {
+ var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0));
+ var integer sapi := link_id.sapi;
+ var boolean is_sacch := false;
+ if (link_id.c == SACCH) {
+ is_sacch := true;
+ }
+ timer T := 3.0;
+ var default d;
+
+ fp_common_init();
+
+ /* some common altstep for meas res and other background noise */
+ d := activate(as_ignore_background(true));
+ RSL.clear;
+ LAPDM.clear;
+
+ f_establish_mo(link_id);
+
+ var octetstring l3_mo := f_rnd_octstring(10);
+ /* Send an I frame to the BTS: SAPI = 0, C = 0, P = 1, M = 0, L = 3,
N(S) = 0, N(R) = 0 */
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_I(sapi, c_r:=cr_MO_RSP,
p:=true, nr:=0, ns:=0,
+l3:=l3_mo)));
+ T.start;
+ alt {
+ [] RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo)) {
+ setverdict(fail, "BTS didn't ignore I frame with wrong C/R
bit");
+ }
+ [] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, '0C'O)) {
+ repeat;
+ }
+ /* ensure BTS still sends idle frames */
+ [] as_lapdm_idle() {
+ setverdict(pass, "still sending idle frames");
+ }
+ [] T.timeout {}
+ }
+
+ /* Send RR command P=1 */
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD,
p:=true, nr:=0)));
+
+ /* The BTS shall respond with a RR response, F bit set to 1. */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=true, nr:=0)));
+
+ deactivate(d);
+
+ fp_common_fini();
+}
+testcase TC_incorrect_cr() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
+ f_testmatrix_each_chan(pars, refers(f_TC_incorrect_cr));
+}
control {
execute(TC_foo());
execute(TC_sabm_ua_dcch_sapi0());
@@ -1017,6 +1070,7 @@
execute(TC_segm_concat_sacch());
execute(TC_t200_n200());
execute(TC_rr_response_frame_loss());
+ execute(TC_incorrect_cr());
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I19e50049625bd31662a1e22b1394b69b2d249104
Gerrit-Change-Number: 14350
Gerrit-PatchSet: 4
Gerrit-Owner: Harald Welte
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: bts: Add LAPDm test for SABM with wrong C/R bit
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378 ) Change subject: bts: Add LAPDm test for SABM with wrong C/R bit .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4fbe7e708c9b1a2c04e5d24a205b5b5af20ff8c7 Gerrit-Change-Number: 14378 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 21:30:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: Add test csse for I frame with wrong C/R value
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350 ) Change subject: bts: Add test csse for I frame with wrong C/R value .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I19e50049625bd31662a1e22b1394b69b2d249104 Gerrit-Change-Number: 14350 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 21:30:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bts: Add LAPDm test for SABM with wrong C/R bit
Harald Welte has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378
Change subject: bts: Add LAPDm test for SABM with wrong C/R bit
..
bts: Add LAPDm test for SABM with wrong C/R bit
Test that the BTS will take no action when it receives an SABM frame
with the C bit set wrong (R); Inspired by TS 51.010-1 25.2.5.2
Implemented as TC_sabm_incorrect_c().
Related: OS#4032
Change-Id: I4fbe7e708c9b1a2c04e5d24a205b5b5af20ff8c7
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 50 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/78/14378/1
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index 12f24eb..edbd37b 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -1052,6 +1052,55 @@
var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
f_testmatrix_each_chan(pars, refers(f_TC_incorrect_cr));
}
+
+/* test that the BTS will take no action when it receives an SABM frame with
the C bit set wrong (R)
+ Inspired by TS 51.010-1 25.2.5.2 */
+private function f_TC_sabm_incorrect_c(charstring id) runs on ConnHdlr {
+ var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(0));
+ var integer sapi := link_id.sapi;
+ var boolean is_sacch := false;
+ if (link_id.c == SACCH) {
+ is_sacch := true;
+ }
+ timer T := 3.0;
+ var default d;
+
+ fp_common_init();
+
+ /* some common altstep for meas res and other background noise */
+ d := activate(as_ignore_background(true));
+ RSL.clear;
+ LAPDM.clear;
+
+ f_establish_mo(link_id);
+
+ /* Send I-frame SAPI = 0, C = 1, P = 0, M = 0, L = 3, N(S) = 0, N(R) =
0 */
+ var octetstring l3_mo := '010203'O;
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD,
p:=false, nr:=0, ns:=0,
+l3:=l3_mo)));
+ /* Expect RR SAPI = 0, R = 1, F = 0, M = 0, L = 0, N(R) = 1 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=false, nr:=1)));
+ RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo));
+ /* Send SABM SAPI = 0, C = 0, P = 1, M = 0, L = 0 */
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_SABM(sapi, c_r:=cr_MO_RSP,
p:=true, l3:=''O)));
+ /* Expect RSL ERR IND */
+ RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, '0C'O));
+ /* Expect fill frame C = 0, P = 0, M = 0, L = 0 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_UI(0, ?, ''O)));
+ /* Send RR command (P=1) SAPI = 0, C = 1, P = 1, M = 0, L = 0, N(R) = 0
*/
+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_RR(sapi, c_r:=cr_MO_CMD,
p:=true, nr:=0)));
+ /* Expect RR response (F=1) SAPI = 0, R = 1, F = 1, M = 0, L = 0, N(R)
= 1 */
+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=true, nr:=1)));
+
+ deactivate(d);
+
+ fp_common_fini();
+}
+testcase TC_sabm_incorrect_c() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1),
ts_RSL_ChanMode_SIGN));
+ f_testmatrix_each_chan(pars, refers(f_TC_sabm_incorrect_c));
+}
+
control {
execute(TC_foo());
execute(TC_sabm_ua_dcch_sapi0());
@@ -1071,6 +1120,7 @@
execute(TC_t200_n200());
execute(TC_rr_response_frame_loss());
execute(TC_incorrect_cr());
+ execute(TC_sabm_incorrect_c());
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14378
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4fbe7e708c9b1a2c04e5d24a205b5b5af20ff8c7
Gerrit-Change-Number: 14378
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bts: Add test csse for I frame with wrong C/R value
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350 to look at the new patch set (#4). Change subject: bts: Add test csse for I frame with wrong C/R value .. bts: Add test csse for I frame with wrong C/R value Implemented as BTS_Tests_LAPDm.TC_incorrect_cr() Related: OS#4032 Change-Id: I19e50049625bd31662a1e22b1394b69b2d249104 --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/14350/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I19e50049625bd31662a1e22b1394b69b2d249104 Gerrit-Change-Number: 14350 Gerrit-PatchSet: 4 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/db.c: get rid of hard-coded SMS expiry threshold
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13631 ) Change subject: libmsc/db.c: get rid of hard-coded SMS expiry threshold .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ce6b1ab50986dc69a2be4ea62b6a24c7f3f8f0a Gerrit-Change-Number: 13631 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:06:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: properly get / set TP-UD length (octets vs septets)
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13490 ) Change subject: libmsc/db.c: properly get / set TP-UD length (octets vs septets) .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I84f973bc6561a9822b4b26975a781abd2b6e026a Gerrit-Change-Number: 13490 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-MessageType: abandon
Change in ...osmo-msc[master]: libmsc/db.c: introduce and use parse_sm_ud_from_result()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 to look at the new patch set (#7). Change subject: libmsc/db.c: introduce and use parse_sm_ud_from_result() .. libmsc/db.c: introduce and use parse_sm_ud_from_result() The following functions: - sms_from_result(), - sms_from_result_v3(), - sms_from_result_v4(), do retrieve the TP-UD, TP-UDL and text in the same way. A consequence of such duplication is [1], which fixed potential NULL-pointer dereference for sms_from_result(), but not for two other functions: sms_from_result_v3() and sms_from_result_v4(). [1] I545967464c406348b8505d1729213cfb4afcd3e2 Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 --- M src/libmsc/db.c 1 file changed, 37 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/13488/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 Gerrit-Change-Number: 13488 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/db.c: fix potential integer overflow
Hello pespin, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13470 to look at the new patch set (#9). Change subject: libmsc/db.c: fix potential integer overflow .. libmsc/db.c: fix potential integer overflow The value of 'sms->user_data_len' is fetched from the database: sms->user_data_len = dbi_result_get_field_length(result, "user_data"); and this is where the problem is. As per the libdbi's documentation (see 3.5.3), dbi_result_get_field_length() returns the length in bytes of the value stored in the specified field: unsigned int dbi_result_get_field_length(dbi_result Result, const char *fieldname) so 'unsigned int' is assigned to 'uint8_t', what could lead to an integer overflow if the value is grather than 0xff. As a result, if the database for some reason does contain such odd TP-UD, the truncation of 'user_data' would be done incorrectly. Let's avoid such direct assignment, and use a separate variable. Also, let's warn user if TP-UDL value is grether than 140, as per 3GPP TS 03.40. Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2 Related: OS#3684 --- M src/libmsc/db.c 1 file changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/13470/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2 Gerrit-Change-Number: 13470 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 ) Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: osmo-sgsn: add VTY parameter to toggle authentication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 ) Change subject: osmo-sgsn: add VTY parameter to toggle authentication .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9909145e7e0af587c28827e16301a61b13eedaa9 Gerrit-Change-Number: 14194 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 18:50:41 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: doc/manuals/vty: regenerate sgsn_vty_reference.xml
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 Change subject: doc/manuals/vty: regenerate sgsn_vty_reference.xml .. doc/manuals/vty: regenerate sgsn_vty_reference.xml Change-Id: I3dfe3598055457cc9724a371590e676f1920652b --- M doc/manuals/vty/sgsn_vty_reference.xml 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/77/14377/1 diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index 52d4213..7619215 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -222,6 +222,7 @@ + @@ -733,7 +734,7 @@ - + @@ -768,6 +769,7 @@ + @@ -1488,7 +1490,8 @@ - + + @@ -1518,7 +1521,7 @@ - + @@ -1553,6 +1556,7 @@ + @@ -1696,10 +1700,11 @@ - + + @@ -1762,7 +1767,7 @@ - + @@ -1772,6 +1777,7 @@ + @@ -2234,6 +2240,13 @@ + + + + + + + @@ -2325,7 +2338,8 @@ - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dfe3598055457cc9724a371590e676f1920652b Gerrit-Change-Number: 14377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-ggsn[master]: ggsn: vty: Require ggsn param in cmd
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 )
Change subject: ggsn: vty: Require ggsn param in cmd
..
ggsn: vty: Require ggsn param in cmd
Other similar commands already do it. This way we also get rid of
deprecated APIs, supporting search when more than one GSN is set up.
Related: OS#2873
Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea
---
M doc/manuals/vty/ggsn_vty_reference.xml
M ggsn/ggsn_vty.c
2 files changed, 22 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/doc/manuals/vty/ggsn_vty_reference.xml
b/doc/manuals/vty/ggsn_vty_reference.xml
index a226f8f..a395b23 100644
--- a/doc/manuals/vty/ggsn_vty_reference.xml
+++ b/doc/manuals/vty/ggsn_vty_reference.xml
@@ -351,10 +351,12 @@
-
+
+
+
@@ -709,10 +711,12 @@
-
+
+
+
diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c
index 9101361..eb7cca7 100644
--- a/ggsn/ggsn_vty.c
+++ b/ggsn/ggsn_vty.c
@@ -764,25 +764,35 @@
}
DEFUN(show_pdpctx_imsi, show_pdpctx_imsi_cmd,
- "show pdp-context imsi IMSI [<0-15>]",
+ "show pdp-context ggsn NAME imsi IMSI [<0-15>]",
SHOW_STR "Display information on PDP Context\n"
+ GGSN_STR "GGSN Name\n"
"PDP contexts for given IMSI\n"
"PDP context for given NSAPI\n")
{
- uint64_t imsi = strtoull(argv[0], NULL, 10);
+ struct ggsn_ctx *ggsn;
+ uint64_t imsi;
unsigned int nsapi;
struct pdp_t *pdp;
int num_found = 0;
- if (argc > 1) {
- nsapi = atoi(argv[1]);
- if (pdp_getimsi(, imsi, nsapi)) {
+ ggsn = ggsn_find(argv[0]);
+ if (!ggsn) {
+ vty_out(vty, "%% No such GGSN '%s'%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ imsi = strtoull(argv[1], NULL, 10);
+
+ if (argc > 2) {
+ nsapi = atoi(argv[2]);
+ if (gtp_pdp_getimsi(ggsn->gsn, , imsi, nsapi)) {
show_one_pdp(vty, pdp);
num_found++;
}
} else {
for (nsapi = 0; nsapi < PDP_MAXNSAPI; nsapi++) {
- if (pdp_getimsi(, imsi, nsapi))
+ if (gtp_pdp_getimsi(ggsn->gsn, , imsi, nsapi))
continue;
show_one_pdp(vty, pdp);
num_found++;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14298
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea
Gerrit-Change-Number: 14298
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-ggsn[master]: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 ) Change subject: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one .. sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one Related: OS#2873 Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/sgsnemu/sgsnemu.c b/sgsnemu/sgsnemu.c index 225dc59..36b52fc 100644 --- a/sgsnemu/sgsnemu.c +++ b/sgsnemu/sgsnemu.c @@ -1614,7 +1614,7 @@ /* Allocated here. */ /* If create context failes we have to deallocate ourselves. */ /* Otherwise it is deallocated by gtplib */ - pdp_newpdp(, myimsi, options.nsapi, NULL); + gtp_pdp_newpdp(gsn, , myimsi, options.nsapi, NULL); pdp->peer[0] = [n]; /* FIXME: support v4v6, have 2 peers */ pdp->ipif = tun;/* TODO */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b Gerrit-Change-Number: 14299 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in ...osmo-ggsn[master]: ggsn_vty_reference.xml: Update from last code changes
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 ) Change subject: ggsn_vty_reference.xml: Update from last code changes .. ggsn_vty_reference.xml: Update from last code changes Change-Id: I5de2e5223e4532bbbec77b928fbdecb57ef2bca7 --- M doc/manuals/vty/ggsn_vty_reference.xml 1 file changed, 52 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml index 7460026..a226f8f 100644 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ b/doc/manuals/vty/ggsn_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -214,6 +214,7 @@ + @@ -332,14 +333,22 @@ - + - - + + + + + + + + + + @@ -351,6 +360,16 @@ + + + + + + + + + + @@ -526,7 +545,7 @@ - + @@ -553,6 +572,7 @@ + @@ -671,14 +691,22 @@ - + - - + + + + + + + + + + @@ -690,6 +718,16 @@ + + + + + + + + + + @@ -821,7 +859,8 @@ - + + @@ -1020,7 +1059,7 @@ - + @@ -1047,6 +1086,7 @@ + @@ -1169,10 +1209,11 @@ - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5de2e5223e4532bbbec77b928fbdecb57ef2bca7 Gerrit-Change-Number: 14358 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged
Change in ...osmo-ggsn[master]: gtp: Make use of new libgtp APIs with multi-gsn support
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 )
Change subject: gtp: Make use of new libgtp APIs with multi-gsn support
..
gtp: Make use of new libgtp APIs with multi-gsn support
Drop use of deprecated APIs everywhere in libgtp and use the new ones instead.
Related: OS#2873
Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa
---
M gtp/gtp.c
1 file changed, 22 insertions(+), 23 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 84b8844..94c3245 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -156,9 +156,8 @@
for (n = 0; n < PDP_MAXNSAPI; n++) {
if (pdp->secondary_tei[n]) {
- if (pdp_getgtp1
- (_pdp,
-pdp->secondary_tei[n])) {
+ if (gtp_pdp_getgtp1(gsn, _pdp,
+pdp->secondary_tei[n])) {
LOGP(DLGTP, LOGL_ERROR,
"Unknown secondary PDP context\n");
continue;
@@ -1150,7 +1149,7 @@
Protocol Configuration Options */
if (pdp->secondary) {
- if (pdp_getgtp1(_pdp, pdp->teic_own)) {
+ if (gtp_pdp_getgtp1(gsn, _pdp, pdp->teic_own)) {
LOGP(DLGTP, LOGL_ERROR,
"Unknown linked PDP context: %u\n",
pdp->teic_own);
return EOF;
@@ -1430,7 +1429,7 @@
if (!gtpie_gettv1(ie, GTPIE_NSAPI, 1, _nsapi)) {
/* Find the primary PDP context */
- if (pdp_getgtp1(_pdp, get_tei(pack))) {
+ if (gtp_pdp_getgtp1(gsn, _pdp, get_tei(pack))) {
gsn->incorrect++;
GTP_LOGPKG(LOGL_ERROR, peer,
pack, len,
@@ -1613,9 +1612,9 @@
in_addr2gsna(>gsnlc, >gsnc);
in_addr2gsna(>gsnlu, >gsnu);
- DEBUGP(DLGTP, "gtp_create_pdp_ind: Before pdp_tidget\n");
+ DEBUGP(DLGTP, "gtp_create_pdp_ind: Before gtp_pdp_tidget\n");
- if (!pdp_getimsi(_old, pdp->imsi, pdp->nsapi)) {
+ if (!gtp_pdp_getimsi(gsn, _old, pdp->imsi, pdp->nsapi)) {
/* Found old pdp with same tid. Now the voodoo begins! */
/* 09.60 / 29.060 allows create on existing context to "steal"
*/
/* the context which was allready established */
@@ -1709,7 +1708,7 @@
return EOF;
/* Find the context in question */
- if (pdp_getgtp1(, get_tei(pack))) {
+ if (gtp_pdp_getgtp1(gsn, , get_tei(pack))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
"Unknown PDP context: %u\n", get_tei(pack));
@@ -2091,7 +2090,7 @@
pdp_set_imsi_nsapi(pdp, tid);
/* Find the context in question */
- if (pdp_getimsi(, imsi, nsapi)) {
+ if (gtp_pdp_getimsi(gsn, , imsi, nsapi)) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
len, "Unknown PDP context\n");
@@ -2113,7 +2112,7 @@
/* IMSI (conditional) */
if (gtpie_gettv0(ie, GTPIE_IMSI, 0, , sizeof(imsi))) {
/* Find the context in question */
- if (pdp_getgtp1(, get_tei(pack))) {
+ if (gtp_pdp_getgtp1(gsn, , get_tei(pack))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer,
pack, len, "Unknown PDP context: %u\n",
@@ -2124,7 +2123,7 @@
}
} else {
/* Find the context in question */
- if (pdp_getimsi(, imsi, nsapi)) {
+ if (gtp_pdp_getimsi(gsn, , imsi, nsapi)) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer,
pack, len, "Unknown PDP context\n");
@@ -2290,7 +2289,7 @@
return EOF;
/* Find the context in question */
- if (pdp_getgtp1(, get_tei(pack))) {
+ if (gtp_pdp_getgtp1(gsn, , get_tei(pack))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
"Unknown PDP context: %u\n", get_tei(pack));
@@ -2391,7 +2390,7 @@
{
struct pdp_t *linked_pdp;
- if (pdp_getgtp1(_pdp, pdp->teic_own)) {
+ if (gtp_pdp_getgtp1(gsn, _pdp, pdp->teic_own)) {
LOGP(DLGTP, LOGL_ERROR,
"Unknown
Change in ...osmo-ggsn[master]: gtp: Introduce new pdp APIs (and deprecate old ones) to support multi...
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14296 ) Change subject: gtp: Introduce new pdp APIs (and deprecate old ones) to support multiple GSN .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I653cbdc185165592d985e3efab6e3f1add97877b Gerrit-Change-Number: 14296 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: gtp: Make use of new libgtp APIs with multi-gsn support
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 ) Change subject: gtp: Make use of new libgtp APIs with multi-gsn support .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa Gerrit-Change-Number: 14297 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 ) Change subject: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b Gerrit-Change-Number: 14299 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: ggsn_vty_reference.xml: Update from last code changes
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 ) Change subject: ggsn_vty_reference.xml: Update from last code changes .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5de2e5223e4532bbbec77b928fbdecb57ef2bca7 Gerrit-Change-Number: 14358 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: ggsn: vty: Require ggsn param in cmd
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 ) Change subject: ggsn: vty: Require ggsn param in cmd .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea Gerrit-Change-Number: 14298 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: gtp: Introduce new pdp APIs (and deprecate old ones) to support multi...
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/14296 )
Change subject: gtp: Introduce new pdp APIs (and deprecate old ones) to support
multiple GSN
..
gtp: Introduce new pdp APIs (and deprecate old ones) to support multiple GSN
Move static global pdp storage arrays to be per GSN. This way now
several GSN per process are supported without collisions.
* pdp_init() is defined in public API but it's actually only intended
for use (and currently only used) internally in gtp_new(). So let's
document that and re-use it for backward compatibility with now
deprecated API, where only one GSN per process is supported.
* Back pointer to gsn_t (pdp->gsn) moved from gtp.c:gtp_new() to
gtp_pdp_newpdp(), since it makes more sense to have it there. This way
backpointer is always set, even in case were app calls pdp_newpdp() API
directly instead of creating them through gtp.c, like osmo-sgsn does.
* Create new versions of required APIs with a pointer to gsn_t where the
pdp ctx is to be created/found. Some APIs receiving a pointer to a pdp
ctx can be left intact because we have a backpointer to its gsn_t.
* pdp_getpdp() is nowhere used, and makes little sense now that we have
pdpa reachable in gsn->pdpa, so let's deprecate it without adding a
replacement.
* Deprecate gtp.h gtp_newpdp(), since it's nowhere used and useless
(does same as new gtp_pdp_newpdp() and doesn't allow for old_pdp to be
passed as parameter).
Fixes: OS#2873
Change-Id: I653cbdc185165592d985e3efab6e3f1add97877b
---
M TODO-RELEASE
M gtp/gtp.c
M gtp/gtp.h
M gtp/pdp.c
M gtp/pdp.h
5 files changed, 90 insertions(+), 37 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..a3d63ac 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,6 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+libgtp Several new APIs added see I653cbdc185165592d985e3efab6e3f1add97877b
+libgtp API (non-used externally) pdp_init modified see
I653cbdc185165592d985e3efab6e3f1add97877b
+libgtp Several pdp_* APIs marked as deprecated see
I653cbdc185165592d985e3efab6e3f1add97877b
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 2b14026..84b8844 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -131,16 +131,12 @@
{ 0, NULL }
};
-/* gtp_new */
-/* gtp_free */
-
+/* Deprecated, use gtp_pdp_newpdp() instead */
int gtp_newpdp(struct gsn_t *gsn, struct pdp_t **pdp,
uint64_t imsi, uint8_t nsapi)
{
int rc;
- rc = pdp_newpdp(pdp, imsi, nsapi, NULL);
- if (!rc && *pdp)
- (*pdp)->gsn = gsn;
+ rc = gtp_pdp_newpdp(gsn, pdp, imsi, nsapi, NULL);
return rc;
}
@@ -849,7 +845,7 @@
queue_new(&(*gsn)->queue_resp);
/* Initialise pdp table */
- pdp_init();
+ pdp_init(*gsn);
/* Initialise call back functions */
(*gsn)->cb_create_context_ind = 0;
@@ -1681,9 +1677,7 @@
}
}
- pdp_newpdp(, pdp->imsi, pdp->nsapi, pdp);
- if (pdp)
- pdp->gsn = gsn;
+ gtp_pdp_newpdp(gsn, , pdp->imsi, pdp->nsapi, pdp);
/* Callback function to validate login */
if (gsn->cb_create_context_ind != 0)
diff --git a/gtp/gtp.h b/gtp/gtp.h
index ec6aef3..c2c5122 100644
--- a/gtp/gtp.h
+++ b/gtp/gtp.h
@@ -15,6 +15,8 @@
#include
#include
+#include "pdp.h"
+
#define GTP_MODE_GGSN 1
#define GTP_MODE_SGSN 2
@@ -263,6 +265,9 @@
struct queue_t *queue_req; /* Request queue */
struct queue_t *queue_resp; /* Response queue */
+ struct pdp_t pdpa[PDP_MAX]; /* PDP storage */
+ struct pdp_t *hashtid[PDP_MAX]; /* Hash table for IMSI + NSAPI */
+
/* Call back functions */
int (*cb_delete_context) (struct pdp_t *);
int (*cb_create_context_ind) (struct pdp_t *);
@@ -307,7 +312,7 @@
extern int gtp_free(struct gsn_t *gsn);
extern int gtp_newpdp(struct gsn_t *gsn, struct pdp_t **pdp,
- uint64_t imsi, uint8_t nsapi);
+ uint64_t imsi, uint8_t nsapi) OSMO_DEPRECATED("Use
gtp_pdp_newpdp() instead");
extern int gtp_freepdp(struct gsn_t *gsn, struct pdp_t *pdp);
extern int gtp_freepdp_teardown(struct gsn_t *gsn, struct pdp_t *pdp);
diff --git a/gtp/pdp.c b/gtp/pdp.c
index a5146e9..d745916 100644
--- a/gtp/pdp.c
+++ b/gtp/pdp.c
@@ -33,13 +33,6 @@
#include "lookupa.h"
/* ***
- * Global variables TODO: most should be moved to gsn_t
- */
-
-static struct pdp_t pdpa[PDP_MAX]; /* PDP storage */
-static struct pdp_t *hashtid[PDP_MAX]; /* Hash
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371 )
Change subject: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
..
BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 98d439a..e10d967 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -491,7 +491,7 @@
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_RSSI(rssi)));
}
-private function f_trx_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
+private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
var TrxcMessage ret;
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(toffs256)));
}
@@ -1863,7 +1863,7 @@
if (mp_bts_trxc_port != -1) {
f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp));
- f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
+ f_trxc_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
}
f_est_dchan();
@@ -2031,7 +2031,7 @@
RSL.clear;
/* tell fake_trx to use a given timing offset for all bursts */
- f_trx_fake_toffs256(ta_to_test*256);
+ f_trxc_fake_toffs256(ta_to_test*256);
f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE,
RSL_IE_Body:{timing_adv := ta_to_test}))} );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af
Gerrit-Change-Number: 14371
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: correct error messages about TRXC connection
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369 )
Change subject: BTS_Tests.ttcn: correct error messages about TRXC connection
..
BTS_Tests.ttcn: correct error messages about TRXC connection
Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
---
M bts/BTS_Tests.ttcn
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Hoernchen: Looks good to me, but someone else must approve
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index e48c05a..ba67889 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -465,7 +465,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
@@ -1436,7 +1438,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
Gerrit-Change-Number: 14369
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 )
Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and
ConnHdlr
..
BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Before this patch, sending special TRXC commands to FakeTRX, such as
FAKE_TOA and FAKE_RSSI, from ConnHdlr resulted in a receive timeout
waiting for the response.
As it turned out, both the test_CT and the ConnHdlr have a TRXC port,
as depending on the test one would want to globally control it
from test_CT or from within a ConnHdlr.
However, only one of the two should be active (connected) at any given
point in time. Otherwise we'll have two UDP sockets on the same bind
port, and it's more or less random on which of them it ends up.
Let's add an optional parameter 'trxc_comp', which would indicate
whether we need to control TRXC from ConnHdlr or not.
Let's get rid of both f_trxc_connect() and f_main_trxc_connect(),
which basically do the same, but run on different components.
Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1
Closes: OS#4039
---
M bts/BTS_Tests.ttcn
1 file changed, 37 insertions(+), 37 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index ba67889..50aaee7 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -117,7 +117,7 @@
/* L1CTL port (for classic tests) */
port L1CTL_PT L1CTL;
- /* TRXC port (for classic tests) */
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -160,6 +160,7 @@
type component ConnHdlr extends RSL_DchanHdlr, lapdm_test_CT {
port L1CTL_PT L1CTL;
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -333,6 +334,20 @@
}
}
+private function f_init_trxc(TRXC_CODEC_PT pt, charstring id,
+out integer trxc_conn_id) {
+ var Result res;
+
+ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(pt, mp_bts_trxc_ip,
mp_bts_trxc_port,
+ "", -1, -1, { udp := {}
}, {});
+ if (not ispresent(res.connId)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
+ }
+ trxc_conn_id := res.connId;
+}
+
/* global init function */
function f_init() runs on test_CT {
var charstring id := testcasename();
@@ -398,8 +413,12 @@
if (mp_bts_trxc_port != -1) {
var TrxcMessage ret;
+
+ /* Init TRXC interface to FakeTRX */
+ map(self:BTS_TRXC, system:BTS_TRXC);
+ f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);
+
/* start with a default moderate timing offset equalling TA=2 */
- f_main_trxc_connect();
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(2*256)));
}
@@ -417,7 +436,9 @@
type function void_fn(charstring id) runs on ConnHdlr;
/* create a new test component */
-function f_start_handler(void_fn fn, ConnHdlrPars pars, boolean pcu_comp :=
false)
+function f_start_handler(void_fn fn, ConnHdlrPars pars,
+boolean pcu_comp := false,
+boolean trxc_comp := false)
runs on test_CT return ConnHdlr {
var charstring id := testcasename();
var ConnHdlr vc_conn;
@@ -426,13 +447,18 @@
/* connect to RSL Emulation main component */
connect(vc_conn:RSL, vc_RSL:CLIENT_PT);
connect(vc_conn:RSL_PROC, vc_RSL:RSL_PROC);
+
+ /* The ConnHdlr component may want to talk to some ports directly,
+* so we disconnect it from the test_CT and connect it to the component.
+* This obviously only works for one component, i.e. no concurrency. */
if (pcu_comp) {
- /* the ConnHdlr component wants to talk directly to the PCU, so
disconnect
-* it from the test_CT and connect it to the component. This
obviously only
-* works for one component, i.e. no concurrency */
unmap(self:PCU, system:PCU);
map(vc_conn:PCU, system:PCU);
}
+ if (trxc_comp) {
+ unmap(self:BTS_TRXC, system:BTS_TRXC);
+ map(vc_conn:BTS_TRXC, system:BTS_TRXC);
+ }
vc_conn.start(f_handler_init(fn, id, pars));
return vc_conn;
@@ -459,19 +485,6 @@
f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);
}
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 ) Change subject: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX .. BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved Hoernchen: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 50aaee7..98d439a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -418,8 +418,9 @@ map(self:BTS_TRXC, system:BTS_TRXC); f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id); - /* start with a default moderate timing offset equalling TA=2 */ + /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */ ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60))); } /* Wait some extra time to make sure the BTS emits a stable carrier. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 Gerrit-Change-Number: 14375 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 ) Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Gerrit-Change-Number: 14370 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 04 Jun 2019 18:46:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 397s] | #define HAVE_STRINGS_H 1 [ 397s] | #define HAVE_INTTYPES_H 1 [ 397s] | #define HAVE_STDINT_H 1 [ 397s] | #define HAVE_UNISTD_H 1 [ 397s] | #define HAVE_DLFCN_H 1 [ 397s] | #define LT_OBJDIR ".libs/" [ 397s] | #define HAVE_LIBSCTP 1 [ 397s] | #define BUILD_SMPP 1 [ 397s] | #define BUILD_IU 1 [ 397s] | #define STDC_HEADERS 1 [ 397s] | #define HAVE_DBI_DBD_H 1 [ 397s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 397s] | [ 397s] | configure: exit 0 [ 397s] [ 397s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 397s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 397s] make: *** [debian/rules:45: build] Error 2 [ 397s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 397s] [ 397s] lamb24 failed "build osmo-msc_1.3.1.133.9d61.dsc" at Tue Jun 4 17:31:13 UTC 2019. [ 397s] [ 397s] ### VM INTERACTION START ### [ 400s] [ 381.778623] sysrq: SysRq : Power Off [ 400s] [ 381.794831] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] lamb24 failed "build osmo-msc_1.3.1.133.9d61.dsc" at Tue Jun 4 17:31:18 UTC 2019. [ 400s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-msc in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 262s] | #define HAVE_STRINGS_H 1 [ 262s] | #define HAVE_INTTYPES_H 1 [ 262s] | #define HAVE_STDINT_H 1 [ 262s] | #define HAVE_UNISTD_H 1 [ 262s] | #define HAVE_DLFCN_H 1 [ 262s] | #define LT_OBJDIR ".libs/" [ 262s] | #define HAVE_LIBSCTP 1 [ 262s] | #define BUILD_SMPP 1 [ 262s] | #define BUILD_IU 1 [ 262s] | #define STDC_HEADERS 1 [ 262s] | #define HAVE_DBI_DBD_H 1 [ 262s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 262s] | [ 262s] | configure: exit 0 [ 262s] [ 262s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 262s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 262s] make: *** [debian/rules:45: build] Error 2 [ 262s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 262s] [ 262s] sheep83 failed "build osmo-msc_1.3.1.133.9d61.dsc" at Tue Jun 4 17:26:29 UTC 2019. [ 262s] [ 262s] ### VM INTERACTION START ### [ 265s] [ 253.308619] sysrq: SysRq : Power Off [ 265s] [ 253.314714] reboot: Power down [ 265s] ### VM INTERACTION END ### [ 265s] [ 265s] sheep83 failed "build osmo-msc_1.3.1.133.9d61.dsc" at Tue Jun 4 17:26:33 UTC 2019. [ 265s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/openbsc in Debian_Unstable/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Unstable/x86_64
Package network:osmocom:latest/openbsc failed to build in Debian_Unstable/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest openbsc
Last lines of build log:
[ 378s] | pkg_cv_LIBOSMOABIS_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOABIS_LIBS=-losmoabis
[ 378s] | pkg_cv_LIBOSMOCORE_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOCORE_LIBS='-ltalloc -losmocore'
[ 378s] | pkg_cv_LIBOSMOCTRL_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOCTRL_LIBS='-ltalloc -losmoctrl -losmogsm -losmocore'
[ 378s] | pkg_cv_LIBOSMOGB_CFLAGS='-fno-strict-aliasing -I/usr/include/'
[ 378s] | pkg_cv_LIBOSMOGB_LIBS='-ltalloc -losmogb -losmovty -losmocore'
[ 378s] | pkg_cv_LIBOSMOGSM_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOGSM_LIBS='-ltalloc -losmogsm -losmocore'
[ 378s] | pkg_cv_LIBOSMONETIF_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMONETIF_LIBS=-losmonetif
[ 378s] | pkg_cv_LIBOSMOSCCP_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOSCCP_LIBS=-lsccp
[ 378s] | pkg_cv_LIBOSMOVTY_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBOSMOVTY_LIBS='-ltalloc -losmovty -losmocore'
[ 378s] | pkg_cv_LIBSMPP34_CFLAGS=-I/usr/include/
[ 378s] | pkg_cv_LIBSMPP34_LIBS=-lsmpp34
[ 378s] |
[ 378s] | ## - ##
[ 378s] | ## Output variables. ##
[ 378s] | ## - ##
[ 378s] |
[ 381s] | ACLOCAL='${SHELL} /usr[ 329.626881] sysrq: SysRq : Power Off
[ 381s] [ 329.667802] reboot: Power down
[ 383s] ### VM INTERACTION END ###
[ 383s]
[ 383s] cloud109 failed "build openbsc_1.2.0.dsc" at Tue Jun 4 17:18:10 UTC
2019.
[ 383s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/openbsc in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/openbsc/Debian_Testing/x86_64 Package network:osmocom:latest/openbsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest openbsc Last lines of build log: [ 176s] | #define HAVE_MEMORY_H 1 [ 176s] | #define HAVE_STRINGS_H 1 [ 176s] | #define HAVE_INTTYPES_H 1 [ 176s] | #define HAVE_STDINT_H 1 [ 176s] | #define HAVE_UNISTD_H 1 [ 176s] | #define HAVE_DLFCN_H 1 [ 176s] | #define LT_OBJDIR ".libs/" [ 176s] | #define BUILD_SMPP 1 [ 176s] | #define STDC_HEADERS 1 [ 176s] | #define HAVE_DBI_DBD_H 1 [ 176s] | #define HAVE_PCAP_PCAP_H 1 [ 176s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 176s] | [ 176s] | configure: exit 0 [ 176s] [ 176s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 176s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 176s] make: *** [debian/rules:13: build] Error 2 [ 176s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 176s] [ 176s] build33 failed "build openbsc_1.2.0.dsc" at Tue Jun 4 17:16:27 UTC 2019. [ 176s] [ 176s] ### VM INTERACTION START ### [ 179s] [ 159.776433] sysrq: SysRq : Power Off [ 179s] [ 159.790215] reboot: Power down [ 180s] ### VM INTERACTION END ### [ 180s] [ 180s] build33 failed "build openbsc_1.2.0.dsc" at Tue Jun 4 17:16:31 UTC 2019. [ 180s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-sysmon in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Testing/x86_64
Package network:osmocom:latest/osmo-sysmon failed to build in
Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest osmo-sysmon
Last lines of build log:
[ 110s] #define VERSION "0.1[ 88.954107] serial8250: too much work for irq4
[ 110s] .0"
[ 110s] #define STDC_HEADERS 1
[ 110s] #define HAVE_SYS_TYPES_H 1
[ 110s] #define HAVE_SYS_STAT_H 1
[ 110s] #define HAVE_STDLIB_H 1
[ 110s] #define HAVE_STRING_H 1
[ 110s] #define HAVE_MEMORY_H 1
[ 110s] #define HAVE_STRINGS_H 1
[ 110s] #define HAVE_INTTYPES_H 1
[ 110s] #define HAVE_STDINT_H 1
[ 110s] #define HAVE_UNISTD_H 1
[ 110s] #define HAVE_DLFCN_H 1
[ 110s] #define LT_OBJDIR ".libs/"
[ 110s]
[ 110s] configure: exit 1
[ 110s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu
--libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking returned exit code 1
[ 110s] make: *** [debian/rules:45: build] Error 2
[ 110s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 110s]
[ 110s] cloud118 failed "build osmo-sysmon_0.1.0.dsc" at Tue Jun 4 17:12:54
UTC 2019.
[ 110s]
[ 110s] ### VM INTERACTION START ###
[ 113s] [ 92.176632] sysrq: SysRq : Power Off
[ 113s] [ 92.181103] reboot: Power down
[ 113s] ### VM INTERACTION END ###
[ 113s]
[ 113s] cloud118 failed "build osmo-sysmon_0.1.0.dsc" at Tue Jun 4 17:12:58
UTC 2019.
[ 113s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-sysmon in Debian_Unstable/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sysmon/Debian_Unstable/x86_64
Package network:osmocom:latest/osmo-sysmon failed to build in
Debian_Unstable/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest osmo-sysmon
Last lines of build log:
[ 135s] #define PACKAGE "osmo-sysmon"
[ 135s] #define VERSION "0.1.0"
[ 135s] #define STDC_HEADERS 1
[ 135s] #define HAVE_SYS_TYPES_H 1
[ 135s] #define HAVE_SYS_STAT_H 1
[ 135s] #define HAVE_STDLIB_H 1
[ 135s] #define HAVE_STRING_H 1
[ 135s] #define HAVE_MEMORY_H 1
[ 135s] #define HAVE_STRINGS_H 1
[ 135s] #define HAVE_INTTYPES_H 1
[ 135s] #define HAVE_STDINT_H 1
[ 135s] #define HAVE_UNISTD_H 1
[ 135s] #define HAVE_DLFCN_H 1
[ 135s] #define LT_OBJDIR ".libs/"
[ 135s]
[ 135s] configure: exit 1
[ 135s] dh_auto_configure: ./configure --build=x86_64-linux-gnu --prefix=/usr
--includedir=\${prefix}/include --mandir=\${prefix}/share/man
--infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
--disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu
--libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode
--disable-dependency-tracking returned exit code 1
[ 135s] make: *** [debian/rules:45: build] Error 2
[ 135s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 135s]
[ 135s] cloud121 failed "build osmo-sysmon_0.1.0.dsc" at Tue Jun 4 17:11:46
UTC 2019.
[ 135s]
[ 135s] ### VM INTERACTION START ###
[ 138s] [ 107.343938] sysrq: SysRq : Power Off
[ 138s] [ 107.357044] reboot: Power down
[ 139s] ### VM INTERACTION END ###
[ 139s]
[ 139s] cloud121 failed "build osmo-sysmon_0.1.0.dsc" at Tue Jun 4 17:11:51
UTC 2019.
[ 139s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 ) Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9 Gerrit-Change-Number: 14372 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-MessageType: abandon
Change in ...docker-playground[master]: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14376 ) Change subject: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bfb4483f39d4dbf3f506f86470e4f2d3b6b7af2 Gerrit-Change-Number: 14376 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Comment-Date: Tue, 04 Jun 2019 16:36:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file
Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14376 ) Change subject: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file .. ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file There's a number of new tests that aren't executed yet. Change-Id: I3bfb4483f39d4dbf3f506f86470e4f2d3b6b7af2 --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved; Verified diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 9567845..7e734c8 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -20,3 +20,4 @@ [EXECUTE] BTS_Tests.control BTS_Tests_SMSCB.control +BTS_Tests_LAPDm.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bfb4483f39d4dbf3f506f86470e4f2d3b6b7af2 Gerrit-Change-Number: 14376 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-MessageType: merged
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPPHI
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14373 ) Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPPHI .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 Gerrit-Change-Number: 14373 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 16:36:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPPHI
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/14373 )
Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPPHI
..
bts-trx: trx_if.c: Introduce logging macro LOGPPHI
This way we unify format. We take the chance to add related information
to some log messages which were not printing that information (and was
confusing when using more than one phy instance).
Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568
---
M include/osmo-bts/phy_link.h
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/trx_if.c
3 files changed, 38 insertions(+), 44 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h
index 812f186..273103c 100644
--- a/include/osmo-bts/phy_link.h
+++ b/include/osmo-bts/phy_link.h
@@ -173,3 +173,5 @@
}
int bts_model_phy_link_open(struct phy_link *plink);
+
+#define LOGPPHI(pinst, section, lvl, fmt, args...) LOGP(section, lvl, "%s: "
fmt, phy_instance_name(pinst), ##args)
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 290ceee..e6e384a 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -159,20 +159,20 @@
enum gsm_phys_chan_config pchan;
if (tn >= TRX_NR_TS) {
- LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param
TN (%" PRIu8 ")\n",
-phy_instance_name(pinst), tn);
+ LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid
param TN (%" PRIu8 ")\n",
+ tn);
return;
}
pchan = transceiver_chan_type_2_pchan(type);
if (pchan == GSM_PCHAN_UNKNOWN) {
- LOGP(DL1C, LOGL_ERROR, "transceiver (%s) SETSLOT invalid param
TS_TYPE (%" PRIu8 ")\n",
-phy_instance_name(pinst), type);
+ LOGPPHI(pinst, DL1C, LOGL_ERROR, "transceiver SETSLOT invalid
param TS_TYPE (%" PRIu8 ")\n",
+ type);
return;
}
ts = >ts[tn];
- LOGP(DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s),"
+ LOGPPHI(pinst, DL1C, LOGL_DEBUG, "%s l1if_setslot_cb(as_pchan=%s),"
" calling cb_ts_connected(rc=%d)\n",
gsm_ts_name(ts), gsm_pchan_name(pchan), rc);
cb_ts_connected(ts, rc);
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index ec879c7..2805260 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -155,7 +155,7 @@
len = snprintf(buf, sizeof(buf), "CMD %s%s%s", tcm->cmd,
tcm->params_len ? " ":"", tcm->params);
OSMO_ASSERT(len < sizeof(buf));
- LOGP(DTRX, LOGL_DEBUG, "Sending control '%s' to %s\n", buf,
phy_instance_name(l1h->phy_inst));
+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Sending control '%s'\n", buf);
/* send command */
send(l1h->trx_ofd_ctrl.fd, buf, len+1, 0);
@@ -173,8 +173,7 @@
OSMO_ASSERT(!llist_empty(>trx_ctrl_list));
tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list);
- LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for
%s (CMD %s%s%s)\n",
- phy_instance_name(l1h->phy_inst),
+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE, "No satisfactory response
from transceiver(CMD %s%s%s)\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
trx_ctrl_send(l1h);
@@ -208,8 +207,8 @@
if (!transceiver_available &&
!(!strcmp(cmd, "POWEROFF") || !strcmp(cmd, "POWERON"))) {
- LOGP(DTRX, LOGL_ERROR, "CTRL %s ignored: No clock from "
-"transceiver, please fix!\n", cmd);
+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "CTRL %s ignored: No
clock from "
+ "transceiver, please fix!\n", cmd);
return -EIO;
}
@@ -241,7 +240,7 @@
if (!pending ||
!(strcmp(tcm->cmd, prev->cmd) == 0 && strcmp(tcm->params,
prev->params) == 0)) {
- LOGP(DTRX, LOGL_INFO, "Enqueuing TRX control command 'CMD
%s%s%s'\n",
+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_INFO, "Enqueuing TRX control
command 'CMD %s%s%s'\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
llist_add_tail(>list, >trx_ctrl_list);
}
@@ -449,14 +448,13 @@
unsigned int tn, ts_type;
if (rsp->status)
- LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT failed with
status %d\n",
-phy_instance_name(pinst), rsp->status);
+ LOGPPHI(pinst, DTRX, LOGL_ERROR, "transceiver SETSLOT failed
with status %d\n",
+ rsp->status);
/* Since message was already validated against CMD we sent, we know
format
* of params is: " " */
if (sscanf(rsp->params, "%u %u", ,
Change in ...osmo-ggsn[master]: gtp: Make use of new libgtp APIs with multi-gsn support
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 ) Change subject: gtp: Make use of new libgtp APIs with multi-gsn support .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa Gerrit-Change-Number: 14297 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 16:35:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPPHI
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 to look at the new patch set (#2). Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPPHI .. bts-trx: trx_if.c: Introduce logging macro LOGPPHI This way we unify format. We take the chance to add related information to some log messages which were not printing that information (and was confusing when using more than one phy instance). Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 --- M include/osmo-bts/phy_link.h M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c 3 files changed, 38 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/14373/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 Gerrit-Change-Number: 14373 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 ) Change subject: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 Gerrit-Change-Number: 14375 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:47:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: correct error messages about TRXC connection
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369 ) Change subject: BTS_Tests.ttcn: correct error messages about TRXC connection .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3 Gerrit-Change-Number: 14369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:48:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 ) Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Gerrit-Change-Number: 14370 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:47:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371 ) Change subject: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af Gerrit-Change-Number: 14371 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:47:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one
Hello fixeria, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 to look at the new patch set (#4). Change subject: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one .. sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one Related: OS#2873 Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/99/14299/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b Gerrit-Change-Number: 14299 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-ggsn[master]: gtp: Make use of new libgtp APIs with multi-gsn support
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 to look at the new patch set (#3). Change subject: gtp: Make use of new libgtp APIs with multi-gsn support .. gtp: Make use of new libgtp APIs with multi-gsn support Drop use of deprecated APIs everywhere in libgtp and use the new ones instead. Related: OS#2873 Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa --- M gtp/gtp.c 1 file changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/97/14297/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa Gerrit-Change-Number: 14297 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Hoernchen has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 )
Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of
messages
..
Patch Set 3: Code-Review-1
(1 comment)
https://gerrit.osmocom.org/#/c/14372/2/library/TRXC_CodecPort.ttcn
File library/TRXC_CodecPort.ttcn:
https://gerrit.osmocom.org/#/c/14372/2/library/TRXC_CodecPort.ttcn@31
PS2, Line 31: log("Rx TRXC message: ", oct2char(pin.msg));
> doesn't the IPL4asp_PT log that by itself? Or, if it doesn't, can't we
> simply enable related loggin […]
As far as this issue is concerned the existing logging was sufficient - it was
just not obvious that it arrived at the wrong port. I don't think this change
is necessary.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9
Gerrit-Change-Number: 14372
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: Harald Welte
Gerrit-Comment-Date: Tue, 04 Jun 2019 15:46:46 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Harald Welte
Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file
Harald Welte has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14376 Change subject: ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file .. ttcn3-bts-tests: Add BTS_Tests_LAPDm.control to config file There's a number of new tests that aren't executed yet. Change-Id: I3bfb4483f39d4dbf3f506f86470e4f2d3b6b7af2 --- M ttcn3-bts-test/BTS_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/76/14376/1 diff --git a/ttcn3-bts-test/BTS_Tests.cfg b/ttcn3-bts-test/BTS_Tests.cfg index 9567845..7e734c8 100644 --- a/ttcn3-bts-test/BTS_Tests.cfg +++ b/ttcn3-bts-test/BTS_Tests.cfg @@ -20,3 +20,4 @@ [EXECUTE] BTS_Tests.control BTS_Tests_SMSCB.control +BTS_Tests_LAPDm.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bfb4483f39d4dbf3f506f86470e4f2d3b6b7af2 Gerrit-Change-Number: 14376 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14356 ) Change subject: db_sms_test: Remove libdbi expected driver load errors .. Abandoned Abandoned in favour of https://gerrit.osmocom.org/c/osmo-msc/+/14362 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I06dfdc5a7415a4d3b34a3b25f11c8abda1a63f92 Gerrit-Change-Number: 14356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: abandon
Change in ...osmo-bts[master]: l1sap: Compute statistics on FN advance in PH-RTS.ind
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14336 to look at the new patch set (#2). Change subject: l1sap: Compute statistics on FN advance in PH-RTS.ind .. l1sap: Compute statistics on FN advance in PH-RTS.ind Let's keep some statistics about the min/max/average frame number advance that we're observing above L1SAP when comparing the time in the PH-RTS.ind and the frame number we observe in PH-DATA.ind of data that was received on the uplink. The statistics are currently only shown in the VTY, but this is a precursor to using them to correctly advance the LAPDm timers in a follow-up patch. Change-Id: I8f739fdb808a614f080afbc4654641ec3df19eb2 Related: OS#2294 Related: OS#3906 --- M include/osmo-bts/bts.h M include/osmo-bts/gsm_data_shared.h M src/common/bts.c M src/common/l1sap.c M src/common/vty.c 5 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/36/14336/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8f739fdb808a614f080afbc4654641ec3df19eb2 Gerrit-Change-Number: 14336 Gerrit-PatchSet: 2 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: common/scheduler.c: refactor description of TRXC_* lchans
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14322 ) Change subject: common/scheduler.c: refactor description of TRXC_* lchans .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9d5d49ec569f133d37b8164b22607d4700474315 Gerrit-Change-Number: 14322 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:31:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: gsm0808_utils: Add gsm0808_decode_cell_id_u()
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/13888 )
Change subject: gsm0808_utils: Add gsm0808_decode_cell_id_u()
..
gsm0808_utils: Add gsm0808_decode_cell_id_u()
This function parses a single Cell ID list element into a
'union gsm0808_cell_id_u'. This function is going to be used
by the upcoming CBSP support.
Related: OS#3537
Change-Id: I08b33881667aa32f01e53ccb70d44d5b79c7c986
---
M include/osmocom/gsm/gsm0808_utils.h
M src/gsm/gsm0808_utils.c
M src/gsm/libosmogsm.map
3 files changed, 60 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/include/osmocom/gsm/gsm0808_utils.h
b/include/osmocom/gsm/gsm0808_utils.h
index 9cfaea6..76db2b6 100644
--- a/include/osmocom/gsm/gsm0808_utils.h
+++ b/include/osmocom/gsm/gsm0808_utils.h
@@ -94,6 +94,7 @@
const struct osmo_cell_global_id *cgi);
int gsm0808_cell_id_to_cgi(struct osmo_cell_global_id *cgi, const struct
gsm0808_cell_id *cid);
void gsm0808_msgb_put_cell_id_u(struct msgb *msg, enum CELL_IDENT id_discr,
const union gsm0808_cell_id_u *u);
+int gsm0808_decode_cell_id_u(union gsm0808_cell_id_u *out, enum CELL_IDENT
discr, const uint8_t *buf, unsigned int len);
uint8_t gsm0808_enc_cause(struct msgb *msg, uint16_t cause);
uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg,
diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c
index 70eed15..afff59a 100644
--- a/src/gsm/gsm0808_utils.c
+++ b/src/gsm/gsm0808_utils.c
@@ -193,6 +193,17 @@
#endif /* HAVE_SYS_SOCKET_H */
+/* Decode 5-byte LAI list element data (see TS 08.08 3.2.2.27) into
MCC/MNC/LAC. */
+static void decode_lai(const uint8_t *data, struct osmo_location_area_id
*decoded)
+{
+ struct gsm48_loc_area_id lai;
+
+ /* Copy data to stack to prevent unaligned access in
gsm48_decode_lai2(). */
+ memcpy(, data, sizeof(lai)); /* don't byte swap yet */
+
+ gsm48_decode_lai2(, decoded);
+}
+
/* Helper function for gsm0808_enc_speech_codec()
* and gsm0808_enc_speech_codec_list() */
static uint8_t enc_speech_codec(struct msgb *msg,
@@ -756,6 +767,53 @@
return (int)(elem - old_elem);
}
+/*! Decode a single GSM 08.08 Cell ID list element payload
+ * \param[out] out caller-provided output union
+ * \param[in] discr Cell ID discriminator describing type to be decoded
+ * \param[in] buf User-provided input buffer containing binary Cell ID list
element
+ * \param[in] len Length of buf
+ * \returns 0 on success; negative on error */
+int gsm0808_decode_cell_id_u(union gsm0808_cell_id_u *out, enum CELL_IDENT
discr, const uint8_t *buf, unsigned int len)
+{
+ switch (discr) {
+ case CELL_IDENT_WHOLE_GLOBAL:
+ if (len < 7)
+ return -EINVAL;
+ decode_lai(buf, >global.lai);
+ out->global.cell_identity = osmo_load16be(buf + sizeof(struct
gsm48_loc_area_id));
+ break;
+ case CELL_IDENT_LAC_AND_CI:
+ if (len < 4)
+ return -EINVAL;
+ out->lac_and_ci.lac = osmo_load16be(buf);
+ out->lac_and_ci.ci = osmo_load16be(buf + sizeof(uint16_t));
+ break;
+ case CELL_IDENT_CI:
+ if (len < 2)
+ return -EINVAL;
+ out->ci = osmo_load16be(buf);
+ break;
+ case CELL_IDENT_LAI_AND_LAC:
+ if (len < 5)
+ return -EINVAL;
+ decode_lai(buf, >lai_and_lac);
+ break;
+ case CELL_IDENT_LAC:
+ if (len < 2)
+ return -EINVAL;
+ out->lac = osmo_load16be(buf);
+ break;
+ case CELL_IDENT_BSS:
+ case CELL_IDENT_NO_CELL:
+ /* Does not have any list items */
+ break;
+ default:
+ /* Remaining cell identification types are not implemented. */
+ return -EINVAL;
+ }
+ return 0;
+}
+
void gsm0808_msgb_put_cell_id_u(struct msgb *msg, enum CELL_IDENT id_discr,
const union gsm0808_cell_id_u *u)
{
switch (id_discr) {
@@ -865,17 +923,6 @@
return *tlv_len + 2;
}
-/* Decode 5-byte LAI list element data (see TS 08.08 3.2.2.27) into
MCC/MNC/LAC. */
-static void decode_lai(const uint8_t *data, struct osmo_location_area_id
*decoded)
-{
- struct gsm48_loc_area_id lai;
-
- /* Copy data to stack to prevent unaligned access in
gsm48_decode_lai2(). */
- memcpy(, data, sizeof(lai)); /* don't byte swap yet */
-
- gsm48_decode_lai2(, decoded);
-}
-
static int parse_cell_id_global_list(struct gsm0808_cell_id_list2 *cil, const
uint8_t *data, size_t remain,
size_t *consumed)
{
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
Change in ...libosmocore[master]: gsm0808_utils: Add gsm0808_decode_cell_id_u()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13888 ) Change subject: gsm0808_utils: Add gsm0808_decode_cell_id_u() .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08b33881667aa32f01e53ccb70d44d5b79c7c986 Gerrit-Change-Number: 13888 Gerrit-PatchSet: 5 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 15:30:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 ) Change subject: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 Gerrit-Change-Number: 14375 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:30:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: lms: Fix stream_stats checks with overrun/underrun
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14368 ) Change subject: lms: Fix stream_stats checks with overrun/underrun .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6 Gerrit-Change-Number: 14368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:29:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: lms: Drop unusued variable masterClockRate
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14367 ) Change subject: lms: Drop unusued variable masterClockRate .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19192925d008046f474615a0476b52ddee9a9d78 Gerrit-Change-Number: 14367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:29:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 to look at the new patch set (#2). Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr .. BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr Before this patch, sending special TRXC commands to FakeTRX, such as FAKE_TOA and FAKE_RSSI, from ConnHdlr resulted in a receive timeout waiting for the response. As it turned out, both the test_CT and the ConnHdlr have a TRXC port, as depending on the test one would want to globally control it from test_CT or from within a ConnHdlr. However, only one of the two should be active (connected) at any given point in time. Otherwise we'll have two UDP sockets on the same bind port, and it's more or less random on which of them it ends up. Let's add an optional parameter 'trxc_comp', which would indicate whether we need to control TRXC from ConnHdlr or not. Let's get rid of both f_trxc_connect() and f_main_trxc_connect(), which basically do the same, but run on different components. Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Closes: OS#4039 --- M bts/BTS_Tests.ttcn 1 file changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/14370/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Gerrit-Change-Number: 14370 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 Change subject: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX .. BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/14375/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 50aaee7..98d439a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -418,8 +418,9 @@ map(self:BTS_TRXC, system:BTS_TRXC); f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id); - /* start with a default moderate timing offset equalling TA=2 */ + /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */ ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60))); } /* Wait some extra time to make sure the BTS emits a stable carrier. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 Gerrit-Change-Number: 14375 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Rename and move STOP signal from Transceiver to main
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14366 ) Change subject: Rename and move STOP signal from Transceiver to main .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb Gerrit-Change-Number: 14366 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:27:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14167 ) Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 15:26:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Harald Welte has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 )
Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of
messages
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/#/c/14372/2/library/TRXC_CodecPort.ttcn
File library/TRXC_CodecPort.ttcn:
https://gerrit.osmocom.org/#/c/14372/2/library/TRXC_CodecPort.ttcn@31
PS2, Line 31: log("Rx TRXC message: ", oct2char(pin.msg));
doesn't the IPL4asp_PT log that by itself? Or, if it doesn't, can't we simply
enable related logging of it by tuning the logging parameters? This looks like
something that we shouldn't [have to] do by hand.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9
Gerrit-Change-Number: 14372
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: Harald Welte
Gerrit-Comment-Date: Tue, 04 Jun 2019 15:23:35 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371 ) Change subject: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af Gerrit-Change-Number: 14371 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:22:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: correct error messages about TRXC connection
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369 ) Change subject: BTS_Tests.ttcn: correct error messages about TRXC connection .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3 Gerrit-Change-Number: 14369 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:21:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPL1H
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14373 ) Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPL1H .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14373/1/src/osmo-bts-trx/trx_if.c File src/osmo-bts-trx/trx_if.c: https://gerrit.osmocom.org/#/c/14373/1/src/osmo-bts-trx/trx_if.c@61 PS1, Line 61: LOGPL1H a) this is not "L1 handle" (which is bts model specific) but "phy instance" so something like LOGPPHI or the like would be more logical. b) as phy_instance is common, the macro should be shared wih other backends so they can use it, too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 Gerrit-Change-Number: 14373 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:21:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 ) Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 15:19:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/14374/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPL1H
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14373
Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPL1H
..
bts-trx: trx_if.c: Introduce logging macro LOGPL1H
This way we unify format. We take the chance to add related information
to some log messages which were not printing that information (and was
confusing when using more than one phy instance).
Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 33 insertions(+), 40 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/14373/1
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index ec879c7..8d9fedb 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -58,6 +58,8 @@
* socket helper functions
*/
+#define LOGPL1H(l1h, section, lvl, fmt, args...) LOGP(section, lvl, "%s: "
fmt, phy_instance_name(l1h->phy_inst), ##args)
+
/*! convenience wrapper to open socket + fill in osmo_fd */
static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char
*host_local,
uint16_t port_local, const char *host_remote, uint16_t
port_remote,
@@ -155,7 +157,7 @@
len = snprintf(buf, sizeof(buf), "CMD %s%s%s", tcm->cmd,
tcm->params_len ? " ":"", tcm->params);
OSMO_ASSERT(len < sizeof(buf));
- LOGP(DTRX, LOGL_DEBUG, "Sending control '%s' to %s\n", buf,
phy_instance_name(l1h->phy_inst));
+ LOGPL1H(l1h, DTRX, LOGL_DEBUG, "Sending control '%s'\n", buf);
/* send command */
send(l1h->trx_ofd_ctrl.fd, buf, len+1, 0);
@@ -173,8 +175,7 @@
OSMO_ASSERT(!llist_empty(>trx_ctrl_list));
tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list);
- LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for
%s (CMD %s%s%s)\n",
- phy_instance_name(l1h->phy_inst),
+ LOGPL1H(l1h, DTRX, LOGL_NOTICE, "No satisfactory response from
transceiver(CMD %s%s%s)\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
trx_ctrl_send(l1h);
@@ -208,8 +209,8 @@
if (!transceiver_available &&
!(!strcmp(cmd, "POWEROFF") || !strcmp(cmd, "POWERON"))) {
- LOGP(DTRX, LOGL_ERROR, "CTRL %s ignored: No clock from "
-"transceiver, please fix!\n", cmd);
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "CTRL %s ignored: No clock from "
+ "transceiver, please fix!\n", cmd);
return -EIO;
}
@@ -241,7 +242,7 @@
if (!pending ||
!(strcmp(tcm->cmd, prev->cmd) == 0 && strcmp(tcm->params,
prev->params) == 0)) {
- LOGP(DTRX, LOGL_INFO, "Enqueuing TRX control command 'CMD
%s%s%s'\n",
+ LOGPL1H(l1h, DTRX, LOGL_INFO, "Enqueuing TRX control command
'CMD %s%s%s'\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
llist_add_tail(>list, >trx_ctrl_list);
}
@@ -445,18 +446,16 @@
static int trx_ctrl_rx_rsp_setslot(struct trx_l1h *l1h, struct trx_ctrl_rsp
*rsp)
{
trx_if_cmd_setslot_cb *cb = (trx_if_cmd_setslot_cb*) rsp->cb;
- struct phy_instance *pinst = l1h->phy_inst;
unsigned int tn, ts_type;
if (rsp->status)
- LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT failed with
status %d\n",
-phy_instance_name(pinst), rsp->status);
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "transceiver SETSLOT failed with
status %d\n",
+ rsp->status);
/* Since message was already validated against CMD we sent, we know
format
* of params is: " " */
if (sscanf(rsp->params, "%u %u", , _type) < 2) {
- LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT unable to
parse params\n",
-phy_instance_name(pinst));
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "transceiver SETSLOT unable to
parse params\n");
return -EINVAL;
}
@@ -481,9 +480,9 @@
phy_link_state_set(pinst->phy_link,
PHY_LINK_CONNECTED);
return 0;
} else {
- LOGP(DTRX, LOGL_NOTICE,
-"transceiver (%s) rejected POWERON command (%d),
re-trying in a few seconds\n",
-phy_instance_name(pinst), rsp->status);
+ LOGPL1H(l1h, DTRX, LOGL_NOTICE,
+ "transceiver rejected POWERON command (%d),
re-trying in a few seconds\n",
+ rsp->status);
if (pinst->phy_link->state != PHY_LINK_SHUTDOWN)
phy_link_state_set(pinst->phy_link,
PHY_LINK_SHUTDOWN);
return 5;
@@ -493,10 +492,10 @@
}
if (rsp->status) {
-
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 to look at the new patch set (#2). Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages .. library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9 --- M library/TRXC_CodecPort.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/14372/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9 Gerrit-Change-Number: 14372 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: correct error messages about TRXC connection
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369
Change subject: BTS_Tests.ttcn: correct error messages about TRXC connection
..
BTS_Tests.ttcn: correct error messages about TRXC connection
Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
---
M bts/BTS_Tests.ttcn
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/69/14369/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index e48c05a..ba67889 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -465,7 +465,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
@@ -1436,7 +1438,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
Gerrit-Change-Number: 14369
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370
Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and
ConnHdlr
..
BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Before this patch, sending special TRXC commands to FakeTRX, such as
FAKE_TOA and FAKE_RSSI, from ConnHdlr resulted in a receive timeout
waiting for the response.
As it turned out, both the test_CT and the ConnHdlr have a TRXC port,
as depending on the test one would want to globally control it
from test_CT or from within a ConnHdlr.
However, only one of the two should be active (connected) at any given
point in time. Otherwise we'll have two UDP sockets on the same bind
port, and it's more or less random on which of them it ends up.
Let's add an optional parameter 'trxc_comp', which would indicate
whether we need to control TRXC from ConnHdlr or not.
Let's get rid of both f_trxc_connect() and f_main_trxc_connect(),
which basically do the same, but run on different components.
Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1
Closes: OS#4039
---
M bts/BTS_Tests.ttcn
1 file changed, 35 insertions(+), 37 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/70/14370/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index ba67889..b9091cc 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -117,7 +117,7 @@
/* L1CTL port (for classic tests) */
port L1CTL_PT L1CTL;
- /* TRXC port (for classic tests) */
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -160,6 +160,7 @@
type component ConnHdlr extends RSL_DchanHdlr, lapdm_test_CT {
port L1CTL_PT L1CTL;
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -333,6 +334,22 @@
}
}
+private function f_init_trxc(TRXC_CODEC_PT pt, charstring id,
+out integer trxc_conn_id) {
+ var Result res;
+
+ map(self:BTS_TRXC, system:BTS_TRXC);
+
+ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(pt, mp_bts_trxc_ip,
mp_bts_trxc_port,
+ "", -1, -1, { udp := {}
}, {});
+ if (not ispresent(res.connId)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
+ }
+ trxc_conn_id := res.connId;
+}
+
/* global init function */
function f_init() runs on test_CT {
var charstring id := testcasename();
@@ -399,7 +416,7 @@
if (mp_bts_trxc_port != -1) {
var TrxcMessage ret;
/* start with a default moderate timing offset equalling TA=2 */
- f_main_trxc_connect();
+ f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(2*256)));
}
@@ -417,7 +434,9 @@
type function void_fn(charstring id) runs on ConnHdlr;
/* create a new test component */
-function f_start_handler(void_fn fn, ConnHdlrPars pars, boolean pcu_comp :=
false)
+function f_start_handler(void_fn fn, ConnHdlrPars pars,
+boolean pcu_comp := false,
+boolean trxc_comp := false)
runs on test_CT return ConnHdlr {
var charstring id := testcasename();
var ConnHdlr vc_conn;
@@ -426,13 +445,18 @@
/* connect to RSL Emulation main component */
connect(vc_conn:RSL, vc_RSL:CLIENT_PT);
connect(vc_conn:RSL_PROC, vc_RSL:RSL_PROC);
+
+ /* The ConnHdlr component may want to talk to some ports directly,
+* so we disconnect it from the test_CT and connect it to the component.
+* This obviously only works for one component, i.e. no concurrency. */
if (pcu_comp) {
- /* the ConnHdlr component wants to talk directly to the PCU, so
disconnect
-* it from the test_CT and connect it to the component. This
obviously only
-* works for one component, i.e. no concurrency */
unmap(self:PCU, system:PCU);
map(vc_conn:PCU, system:PCU);
}
+ if (trxc_comp) {
+ unmap(self:BTS_TRXC, system:BTS_TRXC);
+ map(vc_conn:BTS_TRXC, system:BTS_TRXC);
+ }
vc_conn.start(f_handler_init(fn, id, pars));
return vc_conn;
@@ -459,19 +483,6 @@
f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);
}
-private function f_trxc_connect() runs on ConnHdlr {
- map(self:BTS_TRXC, system:BTS_TRXC);
- var Result res;
- res
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371
Change subject: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
..
BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/71/14371/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index b9091cc..406b749 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -488,7 +488,7 @@
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_RSSI(rssi)));
}
-private function f_trx_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
+private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
var TrxcMessage ret;
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(toffs256)));
}
@@ -1860,7 +1860,7 @@
if (mp_bts_trxc_port != -1) {
f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp));
- f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
+ f_trxc_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
}
f_est_dchan();
@@ -2028,7 +2028,7 @@
RSL.clear;
/* tell fake_trx to use a given timing offset for all bursts */
- f_trx_fake_toffs256(ta_to_test*256);
+ f_trxc_fake_toffs256(ta_to_test*256);
f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE,
RSL_IE_Body:{timing_adv := ta_to_test}))} );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af
Gerrit-Change-Number: 14371
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of
messages
..
library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9
---
M library/TRXC_CodecPort.ttcn
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/72/14372/1
diff --git a/library/TRXC_CodecPort.ttcn b/library/TRXC_CodecPort.ttcn
index 09b2977..7dee369 100644
--- a/library/TRXC_CodecPort.ttcn
+++ b/library/TRXC_CodecPort.ttcn
@@ -28,6 +28,7 @@
}
private function IPL4_to_TRXC_RecvFrom(in ASP_RecvFrom pin, out TRXC_RecvFrom
pout) {
+ log("Rx TRXC message: ", oct2char(pin.msg));
pout.connId := pin.connId;
pout.remName := pin.remName;
pout.remPort := pin.remPort;
@@ -73,6 +74,7 @@
}
};
}
+ log("Tx TRXC message: ", tx);
pt.send(ts_TRXC_Send(conn_id, tx));
T.start;
alt {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9
Gerrit-Change-Number: 14372
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Rename and move STOP signal from Transceiver to main
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/14366
Change subject: Rename and move STOP signal from Transceiver to main
..
Rename and move STOP signal from Transceiver to main
The callback actually belongs there, since it's the code/thread in main the one
actually in charge of stopping everything. It simplifies current code,
and more important, allows for new clients of this signal to use it.
This callback will also be used in forthcoming commits by code
controlling rate_ctr thresholds to stop the process if the VTY
configured threshold is used.
Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb
---
M CommonLibs/osmo_signal.h
M Transceiver52M/Transceiver.cpp
M Transceiver52M/Transceiver.h
M Transceiver52M/osmo-trx.cpp
4 files changed, 9 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/66/14366/1
diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h
index 7299171..6ee1bf9 100644
--- a/CommonLibs/osmo_signal.h
+++ b/CommonLibs/osmo_signal.h
@@ -26,13 +26,13 @@
/* Signalling subsystems */
enum signal_subsystems {
- SS_TRANSC,
+ SS_MAIN,
SS_DEVICE,
};
-/* SS_TRANSC signals */
-enum SS_TRANSC {
- S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be
stopped */
+/* SS_MAIN signals */
+enum SS_MAIN {
+ S_MAIN_STOP_REQUIRED, /* TRX fatal error, it should be stopped */
};
/* SS_DEVICE signals */
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 54b9ddd..9c55d02 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -119,7 +119,7 @@
: mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-rssiOffset(wRssiOffset), sig_cbfn(NULL),
+rssiOffset(wRssiOffset),
mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false),
mForceClockInterface(false),
mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0),
mMaxExpectedDelayNB(0),
mWriteBurstToDiskMask(0)
@@ -225,17 +225,6 @@
return true;
}
-void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn)
-{
- if (this->sig_cbfn)
-osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL);
-
- if (cbfn) {
-this->sig_cbfn = cbfn;
-osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL);
- }
-}
-
/*
* Start the transceiver
*
@@ -910,7 +899,7 @@
usleep(10);
} else if (rc < 0) {
LOG(FATAL) << "radio Interface receive failed, requesting stop.";
-osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this);
+osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
} else if (mForceClockInterface || mTransmitDeadlineClock >
mLastClockUpdateTime + GSM::Time(216,0)) {
mForceClockInterface = false;
writeClockInterface();
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index 432e3b4..4614efe 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -130,8 +130,6 @@
/** accessor for number of channels */
size_t numChans() const { return mChans; };
- void setSignalHandler(osmo_signal_cbfn cbfn);
-
/** Codes for channel combinations */
typedef enum {
FILL, ///< Channel is transmitted, but unused
@@ -181,8 +179,6 @@
double rssiOffset; ///< RSSI to dBm conversion offset
- osmo_signal_cbfn *sig_cbfn; ///< Registered Signal Handler to
announce events.
-
/** modulate and add a burst to the transmit queue */
void addRadioVector(size_t chan, BitVector ,
int RSSI, GSM::Time );
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index a79c26e..05489bd 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -123,7 +123,7 @@
void *handler_data, void *signal_data)
{
switch (signal) {
- case S_TRANSC_STOP_REQUIRED:
+ case S_MAIN_STOP_REQUIRED:
gshutdown = true;
break;
default:
@@ -152,8 +152,6 @@
return -1;
}
-transceiver->setSignalHandler(transc_sig_cb);
-
for (size_t i = 0; i < trx->cfg.num_chans; i++) {
fifo = radio->receiveFIFO(i);
if (fifo && transceiver->receiveFIFO(fifo, i))
@@ -627,6 +625,7 @@
return EXIT_FAILURE;
}
+ osmo_signal_register_handler(SS_MAIN, transc_sig_cb, NULL);
trx_rate_ctr_init(tall_trx_ctx, g_trx_ctx);
srandom(time(NULL));
@@ -641,5 +640,6 @@
osmo_fd_unregister(_ofd);
osmo_fd_close(_ofd);
+ osmo_signal_unregister_handler(SS_MAIN, transc_sig_cb, NULL);
return 0;
}
--
To view, visit
