Build failure of network:osmocom:latest/ulfius in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Unstable/x86_64 Package network:osmocom:latest/ulfius failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest ulfius Last lines of build log: [ 155s] 75%: Checks: 4, Failures: 0, Errors: 1 [ 155s] /usr/src/packages/BUILD/test/websocket.c:73:P:test_ulfius_websocket:test_websocket_ulfius_set_websocket_response:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:89:P:test_ulfius_websocket:test_websocket_ulfius_set_websocket_request:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:106:P:test_ulfius_websocket:test_websocket_ulfius_open_websocket_client_connection_error:0: Passed [ 155s] /usr/src/packages/BUILD/test/websocket.c:131:E:test_ulfius_websocket:test_websocket_ulfius_websocket_client:0: (after this point) Test timeout expired [ 155s] [ 155s] [ 155s] 75% tests passed, 1 tests failed out of 4 [ 155s] [ 155s] Total Test time (real) = 30.03 sec [ 155s] [ 155s] The following tests FAILED: [ 155s] 4 - websocket (Failed) [ 155s] Errors while running CTest [ 155s] make[1]: *** [Makefile:144: test] Error 8 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD/build' [ 155s] dh_auto_test: cd build && make -j6 test ARGS\+=-j6 returned exit code 2 [ 155s] make: *** [debian/rules:9: build] Error 255 [ 155s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 155s] [ 155s] morla5 failed "build ulfius_2.5.2-4.1.dsc" at Fri Aug 9 04:18:29 UTC 2019. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 143.618289] sysrq: SysRq : Power Off [ 158s] [ 143.625185] reboot: Power down [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] morla5 failed "build ulfius_2.5.2-4.1.dsc" at Fri Aug 9 04:18:32 UTC 2019. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-gsm-manuals in Raspbian_10/armv7l
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Raspbian_10/armv7l
Package network:osmocom:nightly/osmo-gsm-manuals failed to build in
Raspbian_10/armv7l
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-gsm-manuals
Last lines of build log:
[ 523s] asciidoc: sigtran-osmocom.adoc: line 220: evaluating:
{set2:target:test-usermanual__53.png}
[ 523s] asciidoc: sigtran-simple-2g.dot: line 22: filtering:
"/usr/bin/python2" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o
"/usr/src/packages/BUILD/tests/test-usermanual__53.png" -L dot -F png -
[ 523s] Execute: dot -Tpng
"/usr/src/packages/BUILD/tests/test-usermanual__53.txt" >
"/usr/src/packages/BUILD/tests/test-usermanual__53.png"
[ 523s] asciidoc: include:
/usr/src/packages/BUILD/common/chapters/sigtran-simple-3g.dot
[ 523s] asciidoc: sigtran-osmocom.adoc: line 251: reading:
/usr/src/packages/BUILD/common/chapters/sigtran-simple-3g.dot
[ 523s] asciidoc: sigtran-osmocom.adoc: line 250: evaluating:
{counter2:target-number}
[ 523s] asciidoc: sigtran-osmocom.adoc: line 250: evaluating:
{set2:target:test-usermanual__54.png}
[ 523s] asciidoc: sigtran-simple-3g.dot: line 24: filtering:
"/usr/bin/python2" "/etc/asciidoc/filters/graphviz/graphviz2png.py" -v -o
"/usr/src/packages/BUILD/tests/test-usermanual__54.png" -L dot -F png -
[ 523s] Execute: dot -Tpng
"/usr/src/packages/BUILD/tests/test-usermanual__54.txt" >
"/usr/src/packages/BUILD/tests/test-usermanual__54.png"
[ 523s]
[ 523s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf]
Error 1
[ 523s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests'
[ 523s] make[2]: *** [Makefile:438: all-recursive] Error 1
[ 523s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[ 523s] make[1]: *** [Makefile:362: all] Error 2
[ 523s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 523s] dh_auto_build: make -j1 returned exit code 2
[ 523s] make: *** [debian/rules:5: binary] Error 2
[ 523s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess
returned exit status 2
[ 523s]
[ 523s] armbuild21 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 9
01:54:13 UTC 2019.
[ 523s]
[ 523s] ### VM INTERACTION START ###
[ 526s] [ 501.204638] sysrq: SysRq : Power Off
[ 526s] [ 501.238991] reboot: Power down
[ 527s] ### VM INTERACTION END ###
[ 527s]
[ 527s] armbuild21 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Fri Aug 9
01:54:17 UTC 2019.
[ 527s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-mgw in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Testing/x86_64
Package network:osmocom:nightly/osmo-mgw failed to build in
Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-mgw
Last lines of build log:
[ 351s] #define STDC_HEADERS 1
[ 351s] #define HAVE_SYS_TYPES_H 1
[ 351s] #define HAVE_SYS_STAT_H 1
[ 351s] #define HAVE_STDLIB_H 1
[ 351s] #define HAVE_STRING_H 1
[ 351s] #define HAVE_MEMORY_H 1
[ 351s] #define HAVE_STRINGS_H 1
[ 351s] #define HAVE_INTTYPES_H 1
[ 351s] #define HAVE_STDINT_H 1
[ 351s] #define HAVE_UNISTD_H 1
[ 351s] #define HAVE_DLFCN_H 1
[ 351s] #define LT_OBJDIR ".libs/"
[ 351s]
[ 351s] configure: exit 1
[ 351s] 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 --with-systemdsystemunitdir=/lib/systemd/system
--enable-manuals returned exit code 1
[ 351s] make[1]: *** [debian/rules:33: override_dh_auto_configure] Error 255
[ 351s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 351s] make: *** [debian/rules:17: build] Error 2
[ 351s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 351s]
[ 351s] build34 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 01:52:47 UTC
2019.
[ 351s]
[ 351s] ### VM INTERACTION START ###
[ 354s] [ 331.970059] sysrq: SysRq : Power Off
[ 354s] [ 331.974723] reboot: Power down
[ 355s] ### VM INTERACTION END ###
[ 355s]
[ 355s] build34 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 01:52:51 UTC
2019.
[ 355s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-netif in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_Testing/x86_64
Package network:osmocom:nightly/libosmo-netif failed to build in
Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly libosmo-netif
Last lines of build log:
[ 144s] | am_cv_prog_cc_c_o=yes
[ 144s] | lt_cv_ar_at_file=@
[ 144s] | lt_cv_archive_cmds_need_lc=no
[ 144s] | lt_cv_deplibs_check_method=pass_all
[ 144s] | lt_cv_file_magic_cmd='$MAGIC_CMD'
[ 144s] | lt_cv_file_magic_test_file=
[ 144s] | lt_cv_ld_reload_flag=-r
[ 144s] | lt_cv_nm_interface='BSD nm'
[ 144s] | lt_cv_objdir=.libs
[ 144s] | lt_cv_path_LD=/usr/bin/ld
[ 144s] | lt_cv_path_NM='/usr/bin/nm -B'
[ 144s] | lt_cv_path_mainfest_tool=no
[ 144s] | lt_cv_prog_compiler_c_o=yes
[ 144s] | lt_cv_prog_compiler_pic='-fPIC -DPIC'
[ 144s] | lt_cv_prog_compiler_pic_works=yes
[ 144s] | lt_cv_prog_compiler_rtti_exceptions=no
[ 144s] | lt_cv_prog_compiler_static_works=yes
[ 144s] | lt_cv_prog_gnu_ld=yes
[ 144s] | lt_cv_sharedlib_from_linklib_cmd='printf %s\n'
[ 144s] | lt_cv_shlibpath_overrides_runpath=yes
[ 144s] | lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[
]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][
]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'' | sed '\''/ __gnu_lto/d'\'''
[ 144s] | lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \(.*\)
.*$/ {"\1", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/
{"\1", (void *) \&\1},/p'\'''
[ 144s] | lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e
'\''s/^: \(.*\) .*$/ {"\1", (void *) 0},/p'\'' -e
'\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(lib.*\)$/ {"\1", (void *) \&\1},/p'\''
-e '\''s/^[ABCDGIRSTW][ABCDGIRSTW]* .* \(.*\)$/ {"lib\1", (void *)
\&\1},/p'\'''
[ 147s] | lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T [ 132.595095]
sysrq: SysRq : Power Off
[ 147s] [ 132.600503] reboot: Power down
[ 147s] ### VM INTERACTION END ###
[ 147s]
[ 147s] build85 failed "build libosmo-netif_0.6.0.dsc" at Fri Aug 9 01:46:34
UTC 2019.
[ 147s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/x86_64
Package network:osmocom:nightly/simtrace2 failed to build in
xUbuntu_16.04/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly simtrace2
Last lines of build log:
[ 252s] libcommon/source/usb.c:692:15: error: redefinition of 'i'
[ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i <
ARRAY_SIZE(usb_strings_extended); i++) {
[ 252s]^
[ 252s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was
here
[ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) {
[ 252s]^
[ 252s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations
are only allowed in C99 or C11 mode
[ 252s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i <
ARRAY_SIZE(usb_strings_extended); i++) {
[ 252s] ^
[ 252s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed
[ 252s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1
[ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware'
[ 252s] Makefile:11: recipe for target 'fw-simtrace-trace' failed
[ 252s] make[1]: *** [fw-simtrace-trace] Error 2
[ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 252s] dh_auto_build: make -j1 returned exit code 2
[ 252s] debian/rules:4: recipe for target 'build' failed
[ 252s] make: *** [build] Error 2
[ 252s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 252s]
[ 252s] lamb22 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9
01:41:13 UTC 2019.
[ 252s]
[ 252s] ### VM INTERACTION START ###
[ 256s] [ 227.973445] sysrq: SysRq : Power Off
[ 256s] [ 228.004375] reboot: Power down
[ 256s] ### VM INTERACTION END ###
[ 256s]
[ 256s] lamb22 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9
01:41:17 UTC 2019.
[ 256s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_16.04/i586
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_16.04/i586
Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_16.04/i586
Check out the package for editing:
osc checkout network:osmocom:nightly simtrace2
Last lines of build log:
[ 217s] libcommon/source/usb.c:692:15: error: redefinition of 'i'
[ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i <
ARRAY_SIZE(usb_strings_extended); i++) {
[ 217s]^
[ 217s] libcommon/source/usb.c:686:15: note: previous definition of 'i' was
here
[ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(git_version) - 1; i++) {
[ 217s]^
[ 217s] libcommon/source/usb.c:692:2: error: 'for' loop initial declarations
are only allowed in C99 or C11 mode
[ 217s] for (uint8_t i = 0; i < ARRAY_SIZE(usb_strings) && i <
ARRAY_SIZE(usb_strings_extended); i++) {
[ 217s] ^
[ 217s] Makefile:227: recipe for target 'obj/simtrace/flash_usb.o' failed
[ 217s] make[2]: *** [obj/simtrace/flash_usb.o] Error 1
[ 217s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware'
[ 217s] Makefile:11: recipe for target 'fw-simtrace-trace' failed
[ 217s] make[1]: *** [fw-simtrace-trace] Error 2
[ 217s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 217s] dh_auto_build: make -j1 returned exit code 2
[ 217s] debian/rules:4: recipe for target 'build' failed
[ 217s] make: *** [build] Error 2
[ 217s] dpkg-buildpackage: error: debian/rules build gave error exit status 2
[ 217s]
[ 217s] lamb25 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9
01:39:17 UTC 2019.
[ 217s]
[ 217s] ### VM INTERACTION START ###
[ 221s] [ 205.704624] sysrq: SysRq : Power Off
[ 221s] [ 205.774967] reboot: Power down
[ 221s] ### VM INTERACTION END ###
[ 221s]
[ 221s] lamb25 failed "build simtrace2_0.5.1.34.e026.dsc" at Fri Aug 9
01:39:20 UTC 2019.
[ 221s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-sip-connector[master]: avoid bogus error logs when no cmd_timer is set
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142
Change subject: avoid bogus error logs when no cmd_timer is set
..
avoid bogus error logs when no cmd_timer is set
mncc.c often calls stop_cmd_timer() even if no timer is running. If no timer is
set, this causes bogus ERROR logs saying:
Wanted response() but got ()
Instead do nothing if no timer is pending at all.
Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581
---
M src/mncc.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector
refs/changes/42/15142/1
diff --git a/src/mncc.c b/src/mncc.c
index f5a44d5..d223906 100644
--- a/src/mncc.c
+++ b/src/mncc.c
@@ -71,6 +71,8 @@
static void stop_cmd_timer(struct mncc_call_leg *leg, uint32_t got_res)
{
+ if (!osmo_timer_pending(>cmd_timeout))
+ return;
if (leg->rsp_wanted != got_res) {
LOGP(DMNCC, LOGL_ERROR, "Wanted response(%s) but got(%s) for
leg(%u)\n",
osmo_mncc_name(leg->rsp_wanted),
osmo_mncc_name(got_res), leg->callref);
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15142
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I70f85a71df55ab8618ed78864cefb6fe5b26f581
Gerrit-Change-Number: 15142
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 286s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 287s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 288s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 288s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 288s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 288s] #include [ 288s] ^~~~ [ 288s] compilation terminated. [ 288s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 288s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 288s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 288s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 288s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 288s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 288s] make[1]: *** [Makefile:380: all] Error 2 [ 288s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 288s] dh_auto_build: make -j1 returned exit code 2 [ 288s] make: *** [debian/rules:45: build] Error 255 [ 288s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 288s] [ 288s] build77 failed "build osmo-bsc_1.5.0.dsc" at Fri Aug 9 00:45:32 UTC 2019. [ 288s] [ 288s] ### VM INTERACTION START ### [ 291s] [ 275.716113] sysrq: SysRq : Power Off [ 291s] [ 275.718042] reboot: Power down [ 291s] ### VM INTERACTION END ### [ 291s] [ 291s] build77 failed "build osmo-bsc_1.5.0.dsc" at Fri Aug 9 00:45:35 UTC 2019. [ 291s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64
Package network:osmocom:latest/osmo-trx failed to build in
Debian_Unstable/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest osmo-trx
Last lines of build log:
[ 1214s] #define HAVE_STDLIB_H 1
[ 1214s] #define HAVE_STRING_H 1
[ 1214s] #define HAVE_MEMORY_H 1
[ 1214s] #define HAVE_STRINGS_H 1
[ 1214s] #define HAVE_INTTYPES_H 1
[ 1214s] #define HAVE_STDINT_H 1
[ 1214s] #define HAVE_UNISTD_H 1
[ 1214s] #define HAVE_DLFCN_H 1
[ 1214s] #define LT_OBJDIR ".libs/"
[ 1214s] #define STDC_HEADERS 1
[ 1214s] #define HAVE_BYTESWAP_H 1
[ 1214s] #define TIME_WITH_SYS_TIME 1
[ 1214s]
[ 1214s] configure: exit 1
[ 1214s] 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 --with-uhd --with-usrp1 --with-lms
--with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit
code 1
[ 1214s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255
[ 1214s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 1214s] make: *** [debian/rules:6: build] Error 2
[ 1214s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 1214s]
[ 1214s] cloud131 failed "build osmo-trx_1.1.0.dsc" at Fri Aug 9 00:44:28 UTC
2019.
[ 1214s]
[ 1214s] ### VM INTERACTION START ###
[ 1218s] [ 1167.619593] sysrq: SysRq : Power Off
[ 1218s] [ 1167.818003] reboot: Power down
[ 1220s] ### VM INTERACTION END ###
[ 1220s]
[ 1220s] cloud131 failed "build osmo-trx_1.1.0.dsc" at Fri Aug 9 00:44:36 UTC
2019.
[ 1220s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 320s] asciidoc -v -f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -f /usr/share/osmo-gsm-manuals/build/python2-filter.conf -a srcdir='.' osmomgw-usermanual.adoc > osmomgw-usermanual.check 2>&1 [ 325s] # Make absolutely sure that the %.check target is updated. [ 325s] touch osmomgw-usermanual.check [ 325s] # Do print the WARNING output but return error if any was found [ 325s] # (grep -v would omit the WARNING output from the log). [ 325s] asciidoc: WARNING: osmomgw-usermanual.adoc: line 23: include file not found: /usr/src/packages/BUILD/doc/manuals/common/chapters/osmux/osmux.adoc [ 325s] make[5]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:95: osmomgw-usermanual.check] Error 1 [ 325s] make[5]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 325s] make[4]: *** [Makefile:380: check-recursive] Error 1 [ 325s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc' [ 325s] make[3]: *** [Makefile:499: check-recursive] Error 1 [ 325s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make[2]: *** [Makefile:793: check] Error 2 [ 325s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 325s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 325s] make[1]: *** [debian/rules:30: override_dh_auto_test] Error 1 [ 325s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 325s] make: *** [debian/rules:17: build] Error 2 [ 325s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 325s] [ 325s] lamb16 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 00:39:34 UTC 2019. [ 325s] [ 325s] ### VM INTERACTION START ### [ 328s] [ 310.891033] sysrq: SysRq : Power Off [ 328s] [ 310.895480] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] lamb16 failed "build osmo-mgw_1.6.0.dsc" at Fri Aug 9 00:39:37 UTC 2019. [ 328s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bsc[master]: add vty 'no neighbors' to remove all HO targets
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14768 ) Change subject: add vty 'no neighbors' to remove all HO targets .. Patch Set 3: I am tempted to merge this myself soon, being a low-risk patch, comments addressed sufficiently (IMHO) and this patch blocking the neighbor config and ttcn test patches... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211 Gerrit-Change-Number: 14768 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 09 Aug 2019 00:39:53 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: rename codecs_cmp() to codecs_same()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15130
Change subject: rename codecs_cmp() to codecs_same()
..
rename codecs_cmp() to codecs_same()
The name 'cmp' implies a return value of -1, 0, 1 to indicate smaller, match or
larger. Since this function returns bool, it should not be named with 'cmp'.
Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8
---
M src/libosmo-mgcp/mgcp_codec.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/15130/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index 8be4c3c..e9e2c62 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -352,7 +352,7 @@
/* Compare two codecs, all parameters must match up, except for the payload
type
* number. */
-static bool codecs_cmp(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec
*codec_b)
+static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec
*codec_b)
{
if (codec_a->rate != codec_b->rate)
return false;
@@ -406,7 +406,7 @@
codecs_assigned = rtp_dst->codecs_assigned;
OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS);
for (i = 0; i < codecs_assigned; i++) {
- if (codecs_cmp(codec_src, _dst->codecs[i])) {
+ if (codecs_same(codec_src, _dst->codecs[i])) {
codec_dst = _dst->codecs[i];
break;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15130
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I2d41b1a32300e295551e85d3f9ab82dd2b0e86b8
Gerrit-Change-Number: 15130
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: mgcp_codec: codec_set(): log about all possible errors
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15138
Change subject: mgcp_codec: codec_set(): log about all possible errors
..
mgcp_codec: codec_set(): log about all possible errors
In codec_set(), for each 'goto error', log the specific error cause.
Also add a TODO and a FIXME comment about inventing dynamic payload type
numbers.
Change-Id: I0b44b574c814882b6f8ae7cd738a6f481cd721fd
---
M src/libosmo-mgcp/mgcp_codec.c
1 file changed, 27 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/38/15138/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index a947bb3..93a8157 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -121,12 +121,13 @@
if (payload_type != PTYPE_UNDEFINED) {
/* Make sure we do not get any reserved or undefined type
numbers */
/* See also:
https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */
- if (payload_type == 1 || payload_type == 2 || payload_type ==
19)
+ if ((payload_type == 1 || payload_type == 2 || payload_type ==
19)
+ || (payload_type >= 72 && payload_type <= 76)
+ || (payload_type >= 127)) {
+ LOGP(DLMGCP, LOGL_ERROR, "Cannot add codec, payload
type number %d is reserved\n",
+payload_type);
goto error;
- if (payload_type >= 72 && payload_type <= 76)
- goto error;
- if (payload_type >= 127)
- goto error;
+ }
codec->payload_type = payload_type;
}
@@ -152,6 +153,8 @@
/* The given payload type is not known to us, or it
* it is a dynamic payload type for which we do not
* know the audio name. We must give up here */
+ LOGP(DLMGCP, LOGL_ERROR, "No audio codec name given,
and payload type %d unknown\n",
+payload_type);
goto error;
}
}
@@ -159,16 +162,23 @@
/* Now we extract the codec subtype name, rate and channels. The latter
* two are optional. If they are not present we use the safe defaults
* above. */
- if (strlen(audio_name) > sizeof(audio_codec))
+ if (strlen(audio_name) > sizeof(audio_codec)) {
+ LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n",
osmo_quote_str(audio_name, -1));
goto error;
+ }
channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS;
rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE;
- if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, , )
< 1)
+ if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, , )
< 1) {
+ LOGP(DLMGCP, LOGL_ERROR, "Invalid audio codec: %s\n",
osmo_quote_str(audio_name, -1));
goto error;
+ }
/* Note: We only accept configurations with one audio channel! */
- if (channels != 1)
+ if (channels != 1) {
+ LOGP(DLMGCP, LOGL_ERROR, "Cannot handle audio codec with more
than one channel: %s\n",
+osmo_quote_str(audio_name, -1));
goto error;
+ }
codec->rate = rate;
codec->channels = channels;
@@ -186,6 +196,9 @@
/* Derive the payload type if it is unknown */
if (codec->payload_type == PTYPE_UNDEFINED) {
+ /* TODO: since all codecs are ultimately added by SDP lines
like 'a=rtpmap:98 AMR/8000' I can't
+* currently see any practical use case for this condition: is
there really ever a situation where the
+* payload type number is unknown in this function??? */
/* For the known codecs from the static range we restore
* the IANA or 3GPP assigned payload type number */
@@ -221,9 +234,14 @@
* 110 onwards 3gpp defines prefered codec types, which are
* also fixed, see above) */
if (codec->payload_type < 0) {
+ /* FIXME: pt_offset is completely unrelated and useless
here, any of those numbers may already
+* have been added to the codecs. Instead, there should
be an iterator checking for an actually
+* unused dynamic payload type number. */
codec->payload_type = 96 + pt_offset;
- if (codec->payload_type > 109)
+ if (codec->payload_type > 109) {
+ LOGP(DLMGCP, LOGL_ERROR, "Ran out of payload
type numbers to assign dynamically\n");
goto error;
+ }
}
}
--
To view,
Change in ...osmo-mgw[master]: test_mgcp_codec_pt_translate(): more tests
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15135
Change subject: test_mgcp_codec_pt_translate(): more tests
..
test_mgcp_codec_pt_translate(): more tests
Change-Id: I334a075ac2800ae4a7c4e2d6eaeb17dd8c6b09a1
---
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
2 files changed, 112 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/15135/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 2c1e690..44e8234 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1770,6 +1770,49 @@
},
},
{
+ .descr = "different order and different payload type numbers",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ { 112, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .payload_type_map = {111, 97} },
+ { .payload_type_map = {123, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "both sides have the same payload_type numbers
assigned to conflicting codecs",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "GSM-HR-08/8000/1", NULL, },
+ { 97, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 96, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {96, 97}, },
+ { .payload_type_map = {97, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .end = true },
+ },
+ },
+ {
.descr = "conn0 has no codecs",
.codecs = {
{
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 6f4da10..13d1870 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -1218,6 +1218,75 @@
p10, aPCMU -> (null)
'10,a :PCMU' -> '(null)'
+Testing mgcp_codec_pt_translate()
+#0: same order, but differing payload type numbers
+ - add codecs on conn0:
+0: 112 AMR/8000/1 octet-aligned=1 -> rc=0
+1: 0 PCMU/8000/1 -> rc=0
+2: 111 GSM-HR-08/8000/1 -> rc=0
+ - add codecs on conn1:
+0: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+1: 0 PCMU/8000/1 -> rc=0
+2: 97 GSM-HR-08/8000/1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
+ - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
+#1: different order and different payload type numbers
+ - add codecs on conn0:
+0: 0 PCMU/8000/1 -> rc=0
+1: 111 GSM-HR-08/8000/1 -> rc=0
+2: 112 AMR/8000/1 octet-aligned=1 -> rc=0
+ - add codecs on conn1:
+0: 97 GSM-HR-08/8000/1 -> rc=0
+1: 0 PCMU/8000/1 -> rc=0
+2: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
+ - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
+ - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
+ - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
+ - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
+ - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
+#2: both sides have the same payload_type numbers assigned to conflicting
codecs
+ - add codecs on conn0:
+0: 0 PCMU/8000/1 -> rc=0
+1: 96 GSM-HR-08/8000/1 -> rc=0
+2: 97 AMR/8000/1 octet-aligned=1 -> rc=0
+ - add codecs on conn1:
+0: 97 GSM-HR-08/8000/1 -> rc=0
+1: 0 PCMU/8000/1 -> rc=0
+2: 96 AMR/8000/1 octet-aligned=1 -> rc=0
+ - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97
+ - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96
+ - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96
+ -
Change in ...osmo-mgw[master]: SDP: store all ptmap entries
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15141
Change subject: SDP: store all ptmap entries
..
SDP: store all ptmap entries
If a ptmap appears in the SDP, always store it in the ptmap array. No longer
attempt to drop entries if they match the conventional payload type number.
- One reason is that the past code only matched full explicit "FOO/8000/1"
strings, while the channel number "/1" can be omitted to imply 1; by simply
storing everything received in the SDP, there is no need to add complexity
to match both "FOO/8000" and "FOO/8000/1".
- The other reason is to rather parse exactly what was received, instead of
filtering entries, to take away a degree of implied magic.
Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 8 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/41/15141/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index 6275385..5823e2b 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -337,7 +337,7 @@
{
unsigned int pt;
char codec_resp[64];
- unsigned int codec;
+ enum mgcp_codecs codec;
#define A_PTIME "a=ptime:"
#define A_RTPMAP "a=rtpmap:"
@@ -354,26 +354,14 @@
"Failed to parse SDP parameter, invalid rtpmap:
%s\n", osmo_quote_str(line, -1));
return -EINVAL;
}
- /* The MGW may assign an own payload type in the
-* response if the choosen codec falls into the IANA
-* assigned dynamic payload type range (96-127).
-* Normally the MGW should obey the 3gpp payload type
-* assignments, which are fixed, so we likely wont see
-* anything unexpected here. In order to be sure that
-* we will now check the codec string and if the result
-* does not match to what is IANA / 3gpp assigned, we
-* will create an entry in the ptmap table so we can
-* lookup later what has been assigned. */
- codec = map_str_to_codec(codec_resp);
- if (codec != pt) {
- if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) {
- LOGP(DLMGCP, LOGL_ERROR, "No more space in
ptmap array (len=%u)\n", r->ptmap_len);
- return -ENOSPC;
- }
- r->ptmap[r->ptmap_len].pt = pt;
- r->ptmap[r->ptmap_len].codec = codec;
- r->ptmap_len++;
+ if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) {
+ LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array
(len=%u)\n", r->ptmap_len);
+ return -ENOSPC;
}
+ codec = map_str_to_codec(codec_resp);
+ r->ptmap[r->ptmap_len].pt = pt;
+ r->ptmap[r->ptmap_len].codec = codec;
+ r->ptmap_len++;
}
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15141
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I2a69c21e68c602daf804744212d335ab1eafd81b
Gerrit-Change-Number: 15141
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: explicitly free codecs in mgcp_rtp_conn_cleanup()
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15139 Change subject: explicitly free codecs in mgcp_rtp_conn_cleanup() .. explicitly free codecs in mgcp_rtp_conn_cleanup() There are allocated bits in conn->end.codecs[], free them. This is not fixing a memleak, since mgcp_rtp_conn_cleanup() is currently only called from mgcp_conn_free(), which soon after frees the conn; the conn serves as talloc parent for the codec strings freed in this patch. The rationale: it is better style to explicitly free them, to also guard against future callers of mgcp_rtp_conn_cleanup() which might expect complete cleanup. Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 --- M src/libosmo-mgcp/mgcp_conn.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/39/15139/1 diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 772584b..60a1700 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -129,6 +129,7 @@ conn_osmux_disable(conn_rtp); mgcp_free_rtp_port(_rtp->end); rate_ctr_group_free(conn_rtp->rate_ctr_group); + mgcp_codec_reset_all(conn_rtp); } void mgcp_conn_watchdog_cb(void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic471107ce6e94d9ce582d887429c744ff93e3053 Gerrit-Change-Number: 15139 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: tweak mgcp_parse_audio_ptime_rtpmap()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15140
Change subject: tweak mgcp_parse_audio_ptime_rtpmap()
..
tweak mgcp_parse_audio_ptime_rtpmap()
- move the error logging up to the actual errors. Each appear only once, no
goto labels needed.
- instead of strstr("rtpmap"), use osmo_str_startswith("a=rtpmap:") to more
concisely trigger on the actual syntax of the audio parameters. Same for
"a=ptime:".
Change-Id: I730111e245da8485c1b5e8811f75d140e379cec6
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 33 insertions(+), 35 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/40/15140/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index 3f8e780..6275385 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -339,46 +339,44 @@
char codec_resp[64];
unsigned int codec;
+#define A_PTIME "a=ptime:"
+#define A_RTPMAP "a=rtpmap:"
- if (strstr(line, "ptime")) {
- if (sscanf(line, "a=ptime:%u", >ptime) != 1)
- goto response_parse_failure_ptime;
- } else if (strstr(line, "rtpmap")) {
- if (sscanf(line, "a=rtpmap:%d %63s", , codec_resp) == 2) {
- /* The MGW may assign an own payload type in the
-* response if the choosen codec falls into the IANA
-* assigned dynamic payload type range (96-127).
-* Normally the MGW should obey the 3gpp payload type
-* assignments, which are fixed, so we likely wont see
-* anything unexpected here. In order to be sure that
-* we will now check the codec string and if the result
-* does not match to what is IANA / 3gpp assigned, we
-* will create an entry in the ptmap table so we can
-* lookup later what has been assigned. */
- codec = map_str_to_codec(codec_resp);
- if (codec != pt) {
- if (r->ptmap_len < ARRAY_SIZE(r->ptmap)) {
- r->ptmap[r->ptmap_len].pt = pt;
- r->ptmap[r->ptmap_len].codec = codec;
- r->ptmap_len++;
- } else
- goto response_parse_failure_rtpmap;
+ if (osmo_str_startswith(line, A_PTIME)) {
+ if (sscanf(line, A_PTIME "%u", >ptime) != 1) {
+ LOGP(DLMGCP, LOGL_ERROR,
+"Failed to parse SDP parameter, invalid ptime
(%s)\n", line);
+ return -EINVAL;
+ }
+ } else if (osmo_str_startswith(line, A_RTPMAP)) {
+ if (sscanf(line, A_RTPMAP "%d %63s", , codec_resp) != 2) {
+ LOGP(DLMGCP, LOGL_ERROR,
+"Failed to parse SDP parameter, invalid rtpmap:
%s\n", osmo_quote_str(line, -1));
+ return -EINVAL;
+ }
+ /* The MGW may assign an own payload type in the
+* response if the choosen codec falls into the IANA
+* assigned dynamic payload type range (96-127).
+* Normally the MGW should obey the 3gpp payload type
+* assignments, which are fixed, so we likely wont see
+* anything unexpected here. In order to be sure that
+* we will now check the codec string and if the result
+* does not match to what is IANA / 3gpp assigned, we
+* will create an entry in the ptmap table so we can
+* lookup later what has been assigned. */
+ codec = map_str_to_codec(codec_resp);
+ if (codec != pt) {
+ if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) {
+ LOGP(DLMGCP, LOGL_ERROR, "No more space in
ptmap array (len=%u)\n", r->ptmap_len);
+ return -ENOSPC;
}
-
- } else
- goto response_parse_failure_rtpmap;
+ r->ptmap[r->ptmap_len].pt = pt;
+ r->ptmap[r->ptmap_len].codec = codec;
+ r->ptmap_len++;
+ }
}
return 0;
-
-response_parse_failure_ptime:
- LOGP(DLMGCP, LOGL_ERROR,
-"Failed to parse SDP parameter, invalid ptime (%s)\n", line);
- return -EINVAL;
-response_parse_failure_rtpmap:
- LOGP(DLMGCP, LOGL_ERROR,
-"Failed to parse SDP parameter, invalid rtpmap (%s)\n", line);
- return -EINVAL;
}
/* Parse a line like "c=IN IP4 10.11.12.13"
Change in ...osmo-mgw[master]: differentiate AMR octet-aligned=0 vs =1
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15136
Change subject: differentiate AMR octet-aligned=0 vs =1
..
differentiate AMR octet-aligned=0 vs =1
Add corresponding tests in mgcp_test.c
Change-Id: Ib8be73a7ca1b95ce794d130e8eb206dcee700124
---
M src/libosmo-mgcp/mgcp_codec.c
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
3 files changed, 95 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/36/15136/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index b27c60d..ead1412 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -358,6 +358,16 @@
return -EINVAL;
}
+/* Default to octet-aligned=0, i.e. bandwidth-efficient mode */
+static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec)
+{
+ if (!codec->param_present)
+ return false;
+ if (!codec->param.amr_octet_aligned_present)
+ return false;
+ return codec->param.amr_octet_aligned;
+}
+
/* Compare two codecs, all parameters must match up, except for the payload
type
* number. */
static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec
*codec_b)
@@ -374,6 +384,10 @@
return false;
if (strcmp(codec_a->subtype_name, codec_b->subtype_name))
return false;
+ if (!strcmp(codec_a->subtype_name, "AMR")) {
+ if (amr_is_octet_aligned(codec_a) !=
amr_is_octet_aligned(codec_b))
+ return false;
+ }
return true;
}
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 44e8234..5d4267f 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1716,7 +1716,6 @@
.amr_octet_aligned = true,
};
-#if 0
static const struct mgcp_codec_param amr_param_octet_aligned_false = {
.amr_octet_aligned_present = true,
.amr_octet_aligned = false,
@@ -1725,7 +1724,6 @@
static const struct mgcp_codec_param amr_param_octet_aligned_unset = {
.amr_octet_aligned_present = false,
};
-#endif
struct testcase_mgcp_codec_pt_translate_codec {
int payload_type;
@@ -1850,6 +1848,58 @@
{ .end = true },
},
},
+ {
+ .descr = "test AMR with differing octet-aligned settings",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
_param_octet_aligned_true, },
+ { 112, "AMR/8000",
_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000",
_param_octet_aligned_false, },
+ { 121, "AMR/8000",
_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, 121}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "test AMR with missing octet-aligned settings
(defaults to 0)",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
_param_octet_aligned_true, },
+ { 112, "AMR/8000",
_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000",
_param_octet_aligned_unset, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, -EINVAL}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "test AMR with NULL param (defaults to 0)",
+ .codecs = {
+ {
+ { 111, "AMR/8000",
_param_octet_aligned_true, },
+ { 112, "AMR/8000",
_param_octet_aligned_false, },
+ },
+ {
+ { 122, "AMR/8000", NULL, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {111, -EINVAL}, },
+ { .payload_type_map = {112, 122} },
+ { .end = true },
+ },
+ },
};
static void test_mgcp_codec_pt_translate(void)
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 13d1870..35ca92b 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -1286,6 +1286,35 @@
- mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
- mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
+#5: test AMR with differing octet-aligned
Change in ...osmo-mgw[master]: ptmap: implicitly match '/8000' and '/8000/1'
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15137
Change subject: ptmap: implicitly match '/8000' and '/8000/1'
..
ptmap: implicitly match '/8000' and '/8000/1'
In codecs_cmp(), do not compare the complete audio_name. The parts of it are
already checked individually:
- subtype_name ("AMR"),
- rate ("8000"; defaults to 8000 if omitted) and
- channels ("1"; defaults to 1 if omitted)
So by also checking the complete audio_name, we brushed over the match of
implicit "/8000" and "/8000/1", which otherwise works out fine.
As a result, translating payload type numbers in RTP headers now also works if
one conn of an endpoint set an rtpmap with "AMR/8000" and the other conn set
"AMR/8000/1".
It seems to me that most PBX out there generate ptmaps omitting the "/1", so
fixing this should make us more interoperable with third party SDP.
See IETF RFC4566 section 6. SDP Attributes:
For audio streams, indicates the number
of audio channels. This parameter is OPTIONAL and may be
omitted if the number of channels is one, provided that no
additional parameters are needed.
Also allowing to omit the "/8000" is a mere side effect of this patch.
Omitting the rate does not seem to be specified in an RFC, but is logical for
audio codecs defined to require exactly 8000 set as rate (most GSM codecs).
Add tests in mgcp_test.c.
Change-Id: Iab00bf9a55b1847f85999077114b37e70fb677c2
---
M src/libosmo-mgcp/mgcp_codec.c
M tests/mgcp/mgcp_test.c
M tests/mgcp/mgcp_test.ok
3 files changed, 92 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/15137/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index ead1412..a947bb3 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -380,8 +380,6 @@
return false;
if (codec_a->frame_duration_den != codec_b->frame_duration_den)
return false;
- if (strcmp(codec_a->audio_name, codec_b->audio_name))
- return false;
if (strcmp(codec_a->subtype_name, codec_b->subtype_name))
return false;
if (!strcmp(codec_a->subtype_name, "AMR")) {
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 5d4267f..8a37ef0 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1900,6 +1900,70 @@
{ .end = true },
},
},
+ {
+ .descr = "match FOO/8000/1 and FOO/8000 as identical, single
channel is implicit",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ { 112, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08/8000", NULL, },
+ { 0, "PCMU/8000", NULL, },
+ { 96, "AMR/8000",
_param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .payload_type_map = {111, 97} },
+ { .payload_type_map = {123, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "match FOO/8000/1 and FOO as identical, 8k and single
channel are implicit",
+ .codecs = {
+ {
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ { 112, "AMR/8000/1",
_param_octet_aligned_true, },
+ },
+ {
+ { 97, "GSM-HR-08", NULL, },
+ { 0, "PCMU", NULL, },
+ { 96, "AMR", _param_octet_aligned_true, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .payload_type_map = {111, 97} },
+ { .payload_type_map = {123, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "test whether channel number matching is waterproof",
+ .codecs = {
+ {
+ { 111, "GSM-HR-08/8000", },
+ { 112, "GSM-HR-08/8000/2", .expect_rc = -22},
+ { 113, "GSM-HR-08/8000/3", .expect_rc = -22},
+ },
+ {
+
Change in ...osmo-mgw[master]: mgcp_codec: split codec_free() off of codec_init()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15132
Change subject: mgcp_codec: split codec_free() off of codec_init()
..
mgcp_codec: split codec_free() off of codec_init()
Both are used only in the same .c file, so make them static.
Preparation to fix a memleak in a conn's codec list.
Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7
---
M src/libosmo-mgcp/mgcp_codec.c
1 file changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/32/15132/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index d5b99e8..4c14d12 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -76,18 +76,24 @@
}
/* Initalize or reset codec information with default data. */
-void codec_init(struct mgcp_rtp_codec *codec)
+static void codec_init(struct mgcp_rtp_codec *codec)
+{
+ *codec = (struct mgcp_rtp_codec){
+ .payload_type = -1,
+ .frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM,
+ .frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN,
+ .rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE,
+ .channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS,
+ };
+}
+
+static void codec_free(struct mgcp_rtp_codec *codec)
{
if (codec->subtype_name)
talloc_free(codec->subtype_name);
if (codec->audio_name)
talloc_free(codec->audio_name);
- memset(codec, 0, sizeof(*codec));
- codec->payload_type = -1;
- codec->frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM;
- codec->frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN;
- codec->rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE;
- codec->channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS;
+ *codec = (struct mgcp_rtp_codec){};
}
/*! Initalize or reset codec information with default data.
@@ -229,7 +235,7 @@
return 0;
error:
/* Make sure we leave a clean codec entry on error. */
- codec_init(codec);
+ codec_free(codec);
memset(codec, 0, sizeof(*codec));
return -EINVAL;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15132
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I120cab0a352a1e7b31c8f9c720c47b2c291311d7
Gerrit-Change-Number: 15132
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15134
Change subject: mgcp_test: extend / rewrite test_mgcp_codec_pt_translate()
..
mgcp_test: extend / rewrite test_mgcp_codec_pt_translate()
Instead of manually entering codec values, use mgcp_codec_add() to populate
test conns with codecs. The idea is to better test what actually happens when
parsing SDP codec strings.
Rewrite current test_mgcp_codec_pt_translate() from procedural to a data model
with human readable stdout logging.
This prepares to enable interpreting codec strings like "FOO/8000/1" as
equivalent with "FOO/8000": the SDP standard defines the final "/1", indicating
the nr of channels, as optional for a single channel, but osmo-mgw currently is
unable to match these two formats as identical. So prepare the
test_mgcp_codec_pt_translate() so that upcoming patches can incorporate strings
with and without the final "/1" by extending the struct arrays.
Change-Id: I888000d77512cfecb0f199b86ef6003e7fc0e6cb
---
M tests/mgcp/mgcp_test.c
1 file changed, 166 insertions(+), 86 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/15134/1
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index 39fe5d0..2c1e690 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -1711,98 +1711,178 @@
OSMO_ASSERT(check_local_cx_options(ctx, ",,,") == -1);
}
-static void test_mgcp_codec_pt_translate_pars(struct mgcp_rtp_codec *c)
-{
- c->rate = 8000;
- c->channels = 1;
- c->frame_duration_num = 23;
- c->frame_duration_den = 42;
-}
+static const struct mgcp_codec_param amr_param_octet_aligned_true = {
+ .amr_octet_aligned_present = true,
+ .amr_octet_aligned = true,
+};
+
+#if 0
+static const struct mgcp_codec_param amr_param_octet_aligned_false = {
+ .amr_octet_aligned_present = true,
+ .amr_octet_aligned = false,
+};
+
+static const struct mgcp_codec_param amr_param_octet_aligned_unset = {
+ .amr_octet_aligned_present = false,
+};
+#endif
+
+struct testcase_mgcp_codec_pt_translate_codec {
+ int payload_type;
+ const char *audio_name;
+ const struct mgcp_codec_param *param;
+ int expect_rc;
+};
+
+struct testcase_mgcp_codec_pt_translate_expect {
+ bool end;
+ int payload_type_map[2];
+};
+
+struct testcase_mgcp_codec_pt_translate {
+ const char *descr;
+ /* two conns on an endpoint, each with N configured codecs */
+ struct testcase_mgcp_codec_pt_translate_codec codecs[2][10];
+ struct testcase_mgcp_codec_pt_translate_expect expect[32];
+};
+
+static const struct testcase_mgcp_codec_pt_translate
test_mgcp_codec_pt_translate_cases[] = {
+ {
+ .descr = "same order, but differing payload type numbers",
+ .codecs = {
+ {
+ { 112, "AMR/8000/1",
_param_octet_aligned_true, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ },
+ {
+ { 96, "AMR/8000/1",
_param_octet_aligned_true, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, 96}, },
+ { .payload_type_map = {0, 0}, },
+ { .payload_type_map = {111, 97} },
+ { .payload_type_map = {123, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "conn0 has no codecs",
+ .codecs = {
+ {
+ /* no codecs */
+ },
+ {
+ { 96, "AMR/8000/1",
_param_octet_aligned_true, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 97, "GSM-HR-08/8000/1", NULL, },
+ },
+ },
+ .expect = {
+ { .payload_type_map = {112, -EINVAL}, },
+ { .payload_type_map = {0, -EINVAL}, },
+ { .payload_type_map = {111, -EINVAL} },
+ { .end = true },
+ },
+ },
+ {
+ .descr = "conn1 has no codecs",
+ .codecs = {
+ {
+ { 112, "AMR/8000/1",
_param_octet_aligned_true, },
+ { 0, "PCMU/8000/1", NULL, },
+ { 111, "GSM-HR-08/8000/1", NULL, },
+ },
+ {
+ /* no codecs */
+
Change in ...osmo-mgw[master]: fix memleak: actually free strings in mgcp_codec_reset_all()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15133
Change subject: fix memleak: actually free strings in mgcp_codec_reset_all()
..
fix memleak: actually free strings in mgcp_codec_reset_all()
The audio_name and subtype_name are allocated from talloc, so they need to be
freed before resetting the codec array. Use mgcp_codec_free() to ensure this.
Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f
---
M src/libosmo-mgcp/mgcp_codec.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/15133/1
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index 4c14d12..b27c60d 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -100,7 +100,9 @@
* \param[out] conn related rtp-connection. */
void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn)
{
- memset(conn->end.codecs, 0, sizeof(conn->end.codecs));
+ int i;
+ for (i = 0; i < conn->end.codecs_assigned; i++)
+ codec_free(>end.codecs[i]);
conn->end.codecs_assigned = 0;
conn->end.codec = NULL;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15133
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I07f207dcb7ce66bbf3445a30af41e696677b384f
Gerrit-Change-Number: 15133
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: mgcp_codec: constify 'param' arg
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15131
Change subject: mgcp_codec: constify 'param' arg
..
mgcp_codec: constify 'param' arg
Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba
---
M include/osmocom/mgcp/mgcp_codec.h
M src/libosmo-mgcp/mgcp_codec.c
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/31/15131/1
diff --git a/include/osmocom/mgcp/mgcp_codec.h
b/include/osmocom/mgcp/mgcp_codec.h
index 2bbb86e..3ead60a 100644
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -2,6 +2,6 @@
void mgcp_codec_summary(struct mgcp_conn_rtp *conn);
void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn);
-int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, struct mgcp_codec_param *param);
+int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, const struct mgcp_codec_param *param);
int mgcp_codec_decide(struct mgcp_conn_rtp *conn);
int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct
mgcp_conn_rtp *conn_dst, int payload_type);
diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c
index e9e2c62..d5b99e8 100644
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -101,7 +101,7 @@
/* Set members of struct mgcp_rtp_codec, extrapolate in missing information.
Param audio_name is expected in uppercase. */
static int codec_set(void *ctx, struct mgcp_rtp_codec *codec, int
payload_type, const char *audio_name,
-unsigned int pt_offset, struct mgcp_codec_param *param)
+unsigned int pt_offset, const struct mgcp_codec_param
*param)
{
int rate;
int channels;
@@ -242,7 +242,7 @@
* \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1").
* \param[in] param optional codec parameters (set to NULL when unused).
* \returns 0 on success, -EINVAL on failure. */
-int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, struct mgcp_codec_param *param)
+int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char
*audio_name, const struct mgcp_codec_param *param)
{
int rc;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15131
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I3ec6b57298f78604d5cd453f1db6d90ddfd6a2ba
Gerrit-Change-Number: 15131
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#10). Change subject: Implement a global switch on the network to disable call waiting. .. Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 54 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#9). Change subject: Implement a global switch on the network to disable call waiting. .. Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. .. Patch Set 8: (1 comment) https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c@360 PS8, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE); > (still think it would be good to omit the default, but you decide) Ah! yeah.. OK that's pretty standard to omit the default. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:38:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/15127 to look at the new patch set (#2). Change subject: osmo-release.sh: Support releasing openbsc.git .. osmo-release.sh: Support releasing openbsc.git openbsc's directory structure is a bit different (has most stuff inside an extra subdir). Let's account for that. Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 --- M osmo-release.sh 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15127/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8 Gerrit-Change-Number: 15127 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. .. Patch Set 8: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/#/c/15120/8/src/libmsc/msc_vty.c@360 PS8, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE); (still think it would be good to omit the default, but you decide) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:16:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/15127 )
Change subject: osmo-release.sh: Support releasing openbsc.git
..
Patch Set 1:
(2 comments)
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh
File osmo-release.sh:
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh@27
PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then
> (add "$GIT_TOPDIR")
Ack
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh@171
PS1, Line 171: git add ${GIT_TOPDIR}/debian/changelog
> unmentioned / unrelated fix?
That's needed, because script in this case (at least for me) runs
CWD=openbsc/openbsc. So this way it works no matter the place or repository,
because debian dir is always directly under the GIT_TOPDIR.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: neels
Gerrit-Comment-Date: Thu, 08 Aug 2019 16:15:59 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/15127 )
Change subject: osmo-release.sh: Support releasing openbsc.git
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh
File osmo-release.sh:
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh@171
PS1, Line 171: git add ${GIT_TOPDIR}/debian/changelog
unmentioned / unrelated fix?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: neels
Gerrit-Comment-Date: Thu, 08 Aug 2019 16:07:37 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/15127 )
Change subject: osmo-release.sh: Support releasing openbsc.git
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh
File osmo-release.sh:
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh@27
PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then
> would prefer […]
(add "$GIT_TOPDIR")
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: neels
Gerrit-Comment-Date: Thu, 08 Aug 2019 16:05:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/15127 )
Change subject: osmo-release.sh: Support releasing openbsc.git
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh
File osmo-release.sh:
https://gerrit.osmocom.org/#/c/15127/1/osmo-release.sh@27
PS1, Line 27: if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then
would prefer
if [ -f "openbsc/configure.ac" ]; then
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: neels
Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:42 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...openbsc[master]: Bump version: 1.3.0.5-38ea → 1.3.1
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15126 ) Change subject: Bump version: 1.3.0.5-38ea → 1.3.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0 Gerrit-Change-Number: 15126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/openbsc/+/15125 ) Change subject: debian/control: Match dependency versions against configure.ac .. debian/control: Match dependency versions against configure.ac Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 --- M debian/control 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/control b/debian/control index 557467e..b9008ef 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,16 @@ autotools-dev, autoconf-archive, pkg-config, - libosmocore-dev, - libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, dh-systemd (>= 1.5), - libosmo-abis-dev, - libosmo-netif-dev, + libsmpp34-dev (>= 1.13.0), + libosmocore-dev (>= 1.0.1), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-sccp-dev (>= 1.0.0), libdbd-sqlite3, - libpcap-dev, - libsmpp34-dev + libpcap-dev Standards-Version: 3.9.8 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...openbsc[master]: Bump version: 1.3.0.5-38ea → 1.3.1
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/openbsc/+/15126 )
Change subject: Bump version: 1.3.0.5-38ea → 1.3.1
..
Bump version: 1.3.0.5-38ea → 1.3.1
Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0
---
M debian/changelog
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 51bc211..ec4e072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openbsc (1.3.1) unstable; urgency=medium
+
+ [ Daniel Willmann ]
+ * manuals: Update osmonitb counter/vty documentation
+ * manuals: Generate vty/counter documentation for osmo-bscnat
+
+ [ Pau Espin Pedrol ]
+ * nat: Remove unused func bsc_vty_init()
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * debian/control: Match dependency versions against configure.ac
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 17:32:51 +0200
+
openbsc (1.3.0) unstable; urgency=medium
[ Keith ]
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0
Gerrit-Change-Number: 15126
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/15125 ) Change subject: debian/control: Match dependency versions against configure.ac .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:04:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Bump version: 1.2.0.25-ff8a → 1.3.0
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 )
Change subject: Bump version: 1.2.0.25-ff8a → 1.3.0
..
Bump version: 1.2.0.25-ff8a → 1.3.0
Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c
---
M debian/changelog
1 file changed, 41 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 8e570cb..bbe3db5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+osmo-sip-connector (1.3.0) unstable; urgency=medium
+
+ [ Keith ]
+ * Support International Caller ID
+ * Support Emergency Calling
+ * Add media mode parameter to sdp_create_file()
+ * Handle SIP re-INVITEs
+ * Prepare to support MO Call HOLD
+ * Add support for MNCC HOLD/RETRIEVE
+ * Only send update to MNCC if media info changed.
+ * IPs stored in the call struct are NETWORK byte order
+ * Following from previous commit, assume other->ip is network byte order
+ * inet_ntoa() is deprecated, use inet_ntop() instead
+ * Fix bug with MO calls not connecting.
+ * Define hold/retrieve functions for MO calls
+ * Cosmetic: Logging and Comments, spelling and clarity changes
+ * Handle case where SIP side hangsup while MNCC is on hold
+ * Logging: Make use of Levels, clarify some messages
+ * In hold/retrieve/reinvite, add check that other_leg exists
+
+ [ Harald Welte ]
+ * cosmetic: use OSMO_STRLCPY_ARRAY() instead of osmo_strlcpy()
+ * MNCC: Do not continue with B leg if A leg is cancelled.
+
+ [ Rafael Diniz ]
+ * Added daemonize feature to osmo-sip-connector
+
+ [ Daniel Willmann ]
+ * Properly indent config file
+
+ [ Oliver Smith ]
+ * Cosmetic: debian: build-depends in multiple lines
+ * debian: create -doc subpackage with pdf manuals
+ * contrib/jenkins.sh: run "make maintainer-clean"
+
+ [ Pau Espin Pedrol ]
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * Require newer libosmocore 1.0.0
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 17:54:49 +0200
+
osmo-sip-connector (1.2.0) unstable; urgency=medium
[ Keith ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c
Gerrit-Change-Number: 15129
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 ) Change subject: Require newer libosmocore 1.0.0 .. Require newer libosmocore 1.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 407bd9e..5fe30f0 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/control b/debian/control index 38de657..bac9b13 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, - libosmocore-dev, libsofia-sip-ua-glib-dev, libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, + libosmocore-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 ) Change subject: Require newer libosmocore 1.0.0 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:02:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Bump version: 1.2.0.25-ff8a → 1.3.0
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 ) Change subject: Bump version: 1.2.0.25-ff8a → 1.3.0 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 16:02:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Require newer versions of dependencies
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 )
Change subject: Require newer versions of dependencies
..
Require newer versions of dependencies
New APIs only available since libgtp 1.4.0 are needed, and in turn that
libgtp version requires newer libosmocore 1.1.0.
osmo-sgsn itself requires libosmocore 1.2.0 since it uses
GSM23003_TMSI_SGSN_MASK.
Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae
---
M configure.ac
M debian/control
2 files changed, 17 insertions(+), 17 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index a7d3717..02dcf05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,12 +39,12 @@
AC_SUBST(LIBRARY_DL)
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.2.0)
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)
-PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)
PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0)
@@ -61,7 +61,7 @@
AC_SUBST(osmo_ac_iu)
-PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0)
+PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0)
PKG_CHECK_MODULES(LIBCARES, libcares)
dnl checks for header files
diff --git a/debian/control b/debian/control
index 9ad95a1..df1f070 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,17 @@
automake,
libtool,
pkg-config,
- libasn1c-dev,
libtalloc-dev,
libc-ares-dev,
- libgtp-dev,
- libosmocore-dev,
- libosmo-abis-dev,
- libosmo-ranap-dev,
- libosmo-sccp-dev,
- libosmo-sigtran-dev,
- libosmo-netif-dev,
- libosmo-gsup-client-dev,
+ libgtp-dev (>= 1.4.0),
+ libosmocore-dev (>= 1.2.0),
+ libosmo-abis-dev (>= 0.6.0),
+ libosmo-netif-dev (>= 0.4.0),
+ libosmo-gsup-client-dev (>= 1.0.0),
+ libasn1c-dev (>= 0.9.30),
+ libosmo-ranap-dev (>= 0.4.0),
+ libosmo-sigtran-dev (>= 1.0.0),
+ libosmo-sccp-dev (>= 1.0.0),
osmo-gsm-manuals-dev
Standards-Version: 3.9.8
Vcs-Git: git://git.osmocom.org/osmo-sgsn.git
@@ -32,14 +32,14 @@
Architecture: any
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
+Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
Package: osmo-sgsn-dbg
Section: debug
Architecture: any
Multi-Arch: same
Depends: osmo-sgsn (= ${binary:Version}), ${misc:Depends}
-Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
+Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
Package: osmo-gtphub
Architecture: any
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae
Gerrit-Change-Number: 15123
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: Require newer versions of dependencies
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 ) Change subject: Require newer versions of dependencies .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae Gerrit-Change-Number: 15123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:58:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Bump version: 1.4.1 → 1.5.0
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 ) Change subject: Bump version: 1.4.1 → 1.5.0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2 Gerrit-Change-Number: 15124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:58:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Bump version: 1.4.1 → 1.5.0
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15124 )
Change subject: Bump version: 1.4.1 → 1.5.0
..
Bump version: 1.4.1 → 1.5.0
Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2
---
M debian/changelog
1 file changed, 66 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 5461745..02ec236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+osmo-sgsn (1.5.0) unstable; urgency=medium
+
+ [ Max ]
+ * Improve 'show subscriber cache' vty command
+ * GMM: permit VLR_ANSWERED event in attach FSM
+ * Fix IMSI padding in imsi-acl
+
+ [ Harald Welte ]
+ * gbproxy_test: Fix test expectations of gprs_ns_rcvmsg()
+ * LLC XID: Fix string representation of N201_U
+ * LLC: Don't blindly assume all LLC frames have data payload
+ * LLC: Avoid NOTICE message on LLC NULL
+ * gprs_llc: Correctly refuse any ABM command (SABM, DISC) with DM
+ * LLC: Store the XID inside the LLC Entity, not LLC Mgmg Entity
+ * gb_proxy.h: Add missing comments; improve comments
+ * gb_proxy: cosmetic: Use 'bool' in data structures where applicable
+
+ [ efistokl ]
+ * gsm0408_rcv_gmm: send Iu-ReleaseCommand upon receiving Attach Complete.
+ * gprs_gmm: send Service Reject when no PDP ctxs are available.
+
+ [ Alexander Couzens ]
+ * gprs_gmm: reintroduce calling gsm48_gmm_authorize when not handling GMM
Attach Requests
+ * gbproxy: parse dtap GSM48_MT_GSM_DEACT_PDP_REQ|ACK
+
+ [ Pau Espin Pedrol ]
+ * gprs_sndcp_comp_free: Replace ifelse with switch and better handling of
error
+ * sgsn: vty: Improve log warning content with spec section
+ * Document max retransmit times for T3395
+ * sgsn: Fix echo timer not started upon first pdp ctx created
+ * sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
+ * sgsn: Have authentication required on by default
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * Require newer versions of dependencies
+
+ [ Keith ]
+ * Echo zero byte XID-Field of Type L3_PAR
+
+ [ Oliver Smith ]
+ * debian: create -doc subpackage with pdf manuals
+ * contrib/jenkins.sh: run "make maintainer-clean"
+ * osmo-gtphub.cfg: fix conflict with osmo-sgsn.cfg
+ * osmo-gbproxy.cfg: fix conflict with osmo-sgsn.cfg
+
+ [ Vadim Yanitskiy ]
+ * doc/manuals/vty: regenerate sgsn_vty_reference.xml
+ * osmo-sgsn: add VTY parameter to toggle authentication
+ * sgsn_mm_ctx_find_ggsn_ctx(): fix: always set gsm_cause
+
+ [ Eric Wild ]
+ * replace magic tmsi constant with define
+ * turn -Werror=null-dereference into a warning
+
+ [ Daniel Willmann ]
+ * manuals: Add script to regenerate vty/counter documentation
+ * manuals: Update vty/counter documentation
+ * Add/fix help string for version option
+ * osmo-sgsn: Fix outdated information in usermanual
+ * configuration.adoc: Small fixes
+ * configuration.adoc: Add a section about encryption
+
+ [ Ruben Undheim ]
+ * Spelling fixes
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 16:46:31 +0200
+
osmo-sgsn (1.4.0) unstable; urgency=medium
[ Alexander Couzens ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2
Gerrit-Change-Number: 15124
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-msc[master]: Bump version: 1.4.0 → 1.5.0
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 ) Change subject: Bump version: 1.4.0 → 1.5.0 .. Bump version: 1.4.0 → 1.5.0 Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 --- M debian/changelog 1 file changed, 227 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8aec381..ec9671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,230 @@ +osmo-msc (1.5.0) unstable; urgency=medium + + [ Max ] + * Handle LCLS-NOTIFICATION message from BSS + * Various logging fixes + * VLR tests: use msgb_eq_data_print() for comparison + * transaction: drop meaningless ti_flag of trans_assign_trans_id() + * transaction: clarify magic 0xff transaction ID + + [ Vadim Yanitskiy ] + * transaction.c: cosmetic: use 'default' branch in trans_free() + * libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces + * transaction: change arguments of trans_find_by_sm_rp_mr() + * libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions + * libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() + * libmsc/gsm_04_80.c: use gsm0480_create_release_complete() + * libmsc/gsm_04_80.c: add msc_send_ussd_release_complete_cause() + * libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' + * transaction: fix description of trans_assign_trans_id() + * transaction.h: use #pragma once as include guard + * libmsc/gsm_09_11.c: implement guard timer for NCSS sessions + * libmsc/ran_conn.c: add missing 'break' to OSMO_RAT_EUTRAN_SGS + * libmsc/sgs_iface.c: fix SGS_STATE_NS11 counter reference + * libmsc/sgs_vty.c: always write server address and VLR name + * libmsc/msc_vty.c: drop dead comparison against null + * libmsc/sgs_iface.c: fix copy-paste error + * libmsc/sgs_iface.c: register sgs_vlr_reset_fsm on DSO load + * libmsc/sgs_vty.c: don't print SGs socket error twice + * libmsc: fix: properly initialize the SGs server + * libmsc/sms_queue.c: fix memleak in smsq_take_next_sms() + * tests/sms_queue: track the use of NULL talloc memory contexts + * msc/gsm_data.h: drop unused SMS_HDR_SIZE macro + * configure.ac: drop rudimentary check for -fvisibility=hidden + * configure.ac: drop useless SQLite3 dependency + * libmsc/db.c: print info about database name and libdbi version + * libmsc/gsm_04_11.c: clarify implicit CP-ACK handling + * libmsc/ran_peer.c: fix msgb memleak in ran_peer_rx_reset() + * libmsc/gsm_04_11.c: properly handle TP-User-Data-Length + * libmsc/gsm_04_11.c: fix double init of both SMR and SMC FSMs + * libmsc/gsm_04_11.c: cosmetic: restructure gsm411_mm_send() + * libmsc/gsm_04_08.c: fix: print proper length value + * libmsc/gsm_04_08.c: refactor CM Service Request parsing + * libmsc/gsm_04_08.c: clarify IMEI rejection in gsm48_rx_mm_serv_req() + * libmsc/gsm_04_11_gsup.c: cosmetic: drop useless variable + * tests/.../Makefile.am avoid redundant linkage with librt + * libmsc/sgs_server.c: do not override rc in case of SCTP_SHUTDOWN_EVENT + * libmsc/msc_ho.c: fix unreacheable check of MSC-T role allocation + * libmsc/msc_a.c: fix possible NULL-pointer dereferences + * sms_queue_test: assert return value of osmo_use_count_get_put() + * libmsc/gsm_04_11.c: fix NULL-pointer dereference in gsm340_rx_tpdu() + * libmsc/ran_msg_a.c: avoid ternary operator in struct initialization + * libmsc/ran_msg_a.c: refactor ran_a_decode_lcls_notification() + * libmsc/ran_msg_a.c: prevent chosen_encryption->key buffer overrun + * libmsc/mncc_call.c: fix uninitialized access of stack memory + * libmsc/ran_peer.c: fix msgb memleaks in ran_peer_down_paging() + * libmsc/ran_peer.c: avoid unreasonable use of goto in ran_peer_down_paging() + * libmsc/msc_vty.c: fix: use msub_for_vsub() in subscr_dump_full_vty() + * libmsc/msc_vty.c: fix documentation of 'show subscriber id' + * libmsc/msc_vty.c: use llist_count() in subscr_dump_full_vty() + * libmsc/rtp_stream.c: prevent NULL-pointer dereference + * libmsc/gsm_04_11.c: properly handle MMTS indication + * transaction: accept trans_type enum in trans_log_subsys() + * Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm + * libmsc/msc_vty.c: refactor 'show subscr / conn / trans' commands + * libmsc/msc_vty.c: do not abuse strlen() to check char buffers + * tests: share stubs.h from msc_vlr_test as stubs.c + * Introduce initial unit test for db_sms_* API + * libmsc/db.c: fix storing SMS with empty TP-User-Data + * debian/control: add missing libdbd-sqlite3 to Build-Depends + * libmsc/db.c: fix potential integer overflow + * libmsc/db.c: introduce and use parse_sm_ud_from_result() + * libmsc/db.c: warn user about SMS text truncation + * libmsc/db.c: get rid of hard-coded SMS expiry threshold + * libmsc/mncc_builtin.c: drop dummy switch in int_mncc_recv() + *
Change in ...osmo-msc[master]: Bump version: 1.4.0 → 1.5.0
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 ) Change subject: Bump version: 1.4.0 → 1.5.0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15122 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 Gerrit-Change-Number: 15122 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:57:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Fix dependency version requirements
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements .. Fix dependency version requirements libosmocore 1.1.0 0e8df1c7e48bcae2285c7c138bd50f932049bd24 osmo_use_count() Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb libosmocore 1.2.0 cdac620579b5bf44970b5f4bb11734fdfdf5bf59 GSM23003_MSISDN_MAX_DIGITS Fixes: 8b0737fa71ea4b04cee8dc61c79a1f93779e66dc libosmo-sccp 1.1.0 21ff9ae4264de159784a59ce4421365007bde08d osmo_sccp_addr_ri_cmp() Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 osmo-mgw 1.6.0 538d2c53d90074267e7a70a90c773baa03d6ec04 mgcp_client_endpoint_fsm.h Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 libosmo-netif 0.6.0 needed by osmo-mgw 1.6.0 libsmpp34 1.14.0 required due to needed heap allocation function overrides from smpp34_heap.h Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 --- M configure.ac M debian/control 2 files changed, 20 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/configure.ac b/configure.ac index bb8fb39..5aa652d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS @@ -91,7 +91,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) +PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.14.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") diff --git a/debian/control b/debian/control index 887e386..f7a336a 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,17 @@ libdbd-sqlite3, libsctp-dev, libtalloc-dev, - libsmpp34-dev (>= 1.12), - libasn1c-dev (>= 0.9.28), - libosmocore-dev (>= 0.10.0), - libosmo-sccp-dev, - libosmo-sigtran-dev (>= 0.8.0), - libosmo-abis-dev, - libosmo-mgcp-client-dev (>= 1.1.0), - libosmo-gsup-client-dev (>= 0.2.1), - libosmo-netif-dev (>= 0.1.0), - libosmo-ranap-dev (>= 0.2.0), - osmo-gsm-manuals-dev + libsmpp34-dev (>= 1.14.0), + libasn1c-dev (>= 0.9.30), + libosmocore-dev (>= 1.2.0), + libosmo-sccp-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.1.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-gsup-client-dev (>= 1.0.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-ranap-dev (>= 0.3.0), + osmo-gsm-manuals-dev (>= 0.2.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-msc[master]: Fix dependency version requirements
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:57:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 to look at the new patch set (#2). Change subject: Require newer libosmocore 1.0.0 .. Require newer libosmocore 1.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/15128/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-sip-connector[master]: Bump version: 1.2.0.25-ff8a → 1.3.0
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 ) Change subject: Bump version: 1.2.0.25-ff8a → 1.3.0 .. Bump version: 1.2.0.25-ff8a → 1.3.0 Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c --- M debian/changelog 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/29/15129/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c Gerrit-Change-Number: 15129 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-sip-connector[master]: Bump version: 1.2.0.25-7304 → 1.3.0
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129
Change subject: Bump version: 1.2.0.25-7304 → 1.3.0
..
Bump version: 1.2.0.25-7304 → 1.3.0
Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c
---
M debian/changelog
1 file changed, 41 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector
refs/changes/29/15129/1
diff --git a/debian/changelog b/debian/changelog
index 8e570cb..c73771c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,44 @@
+osmo-sip-connector (1.3.0) unstable; urgency=medium
+
+ [ Keith ]
+ * Support International Caller ID
+ * Support Emergency Calling
+ * Add media mode parameter to sdp_create_file()
+ * Handle SIP re-INVITEs
+ * Prepare to support MO Call HOLD
+ * Add support for MNCC HOLD/RETRIEVE
+ * Only send update to MNCC if media info changed.
+ * IPs stored in the call struct are NETWORK byte order
+ * Following from previous commit, assume other->ip is network byte order
+ * inet_ntoa() is deprecated, use inet_ntop() instead
+ * Fix bug with MO calls not connecting.
+ * Define hold/retrieve functions for MO calls
+ * Cosmetic: Logging and Comments, spelling and clarity changes
+ * Handle case where SIP side hangsup while MNCC is on hold
+ * Logging: Make use of Levels, clarify some messages
+ * In hold/retrieve/reinvite, add check that other_leg exists
+
+ [ Harald Welte ]
+ * cosmetic: use OSMO_STRLCPY_ARRAY() instead of osmo_strlcpy()
+ * MNCC: Do not continue with B leg if A leg is cancelled.
+
+ [ Rafael Diniz ]
+ * Added daemonize feature to osmo-sip-connector
+
+ [ Daniel Willmann ]
+ * Properly indent config file
+
+ [ Oliver Smith ]
+ * Cosmetic: debian: build-depends in multiple lines
+ * debian: create -doc subpackage with pdf manuals
+ * contrib/jenkins.sh: run "make maintainer-clean"
+
+ [ Pau Espin Pedrol ]
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * Require newer libosmocore 1.0.0.0
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 17:52:51 +0200
+
osmo-sip-connector (1.2.0) unstable; urgency=medium
[ Keith ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15129
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: I3d3d048380753431c313cffa82de430dfbd3b93c
Gerrit-Change-Number: 15129
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-sip-connector[master]: Require newer libosmocore 1.0.0.0
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 Change subject: Require newer libosmocore 1.0.0.0 .. Require newer libosmocore 1.0.0.0 Use of osmo_mncc_name() requires libosmocore 0.12.0 Use of gsm48_cc_cause_name() requires libosmocore 1.0.0 Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c --- M configure.ac M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/28/15128/1 diff --git a/configure.ac b/configure.ac index 407bd9e..5fe30f0 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) PKG_CHECK_MODULES(SOFIASIP, sofia-sip-ua-glib >= 1.12.0) AC_ARG_ENABLE(sanitize, diff --git a/debian/control b/debian/control index 38de657..bac9b13 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, - libosmocore-dev, libsofia-sip-ua-glib-dev, libsofia-sip-ua-dev, dh-systemd (>= 1.5), dh-autoreconf, + libosmocore-dev (>= 1.0.0), osmo-gsm-manuals-dev Standards-Version: 3.8.4 Homepage: https://osmocom.org/projects/osmo-sip-conector/wiki -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/15128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I466140a9c1e05c191fe1b079cf3615fd6ac5fb8c Gerrit-Change-Number: 15128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/15127
Change subject: osmo-release.sh: Support releasing openbsc.git
..
osmo-release.sh: Support releasing openbsc.git
openbsc's directory structure is a bit different (has most stuff inside
an extra subdir). Let's account for that.
Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
---
M osmo-release.sh
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/27/15127/1
diff --git a/osmo-release.sh b/osmo-release.sh
index a779a26..d99745e 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -24,7 +24,12 @@
# Make sure that depedency requirement versions match in configure.ac vs
debian/control.
#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs
"libosmocore-dev (>= 1.0.0),"
check_configureac_debctrl_deps_match() {
- configureac_list=$(grep -e "PKG_CHECK_MODULES"
"${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed
"s/>=/ /g")
+ if [ "z$(basename ${GIT_TOPDIR})" = "zopenbsc" ]; then
+ configureac_file="openbsc/configure.ac"
+ else
+ configureac_file="configure.ac"
+ fi
+ configureac_list=$(grep -e "PKG_CHECK_MODULES"
"${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " |
sed "s/>=/ /g")
echo "$configureac_list" | \
{ return_error=0
while read -r dep ver; do
@@ -163,7 +168,7 @@
fi
gbp dch --debian-tag='%(version)s' --auto --meta --git-author
--multimaint-merge --ignore-branch --new-version="$NEW_VER"
dch -r -m --distribution "unstable" ""
-git add debian/changelog
+git add ${GIT_TOPDIR}/debian/changelog
bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER
--allow-dirty
git commit --amend # let the user add extra information to the release commit.
git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE."
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...openbsc[master]: debian/control: Match dependency versions against configure.ac
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/15125 Change subject: debian/control: Match dependency versions against configure.ac .. debian/control: Match dependency versions against configure.ac Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 --- M debian/control 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/25/15125/1 diff --git a/debian/control b/debian/control index 557467e..b9008ef 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,16 @@ autotools-dev, autoconf-archive, pkg-config, - libosmocore-dev, - libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, dh-systemd (>= 1.5), - libosmo-abis-dev, - libosmo-netif-dev, + libsmpp34-dev (>= 1.13.0), + libosmocore-dev (>= 1.0.1), + libosmo-abis-dev (>= 0.6.0), + libosmo-netif-dev (>= 0.4.0), + libosmo-sccp-dev (>= 1.0.0), libdbd-sqlite3, - libpcap-dev, - libsmpp34-dev + libpcap-dev Standards-Version: 3.9.8 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/15125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib789ee75ab14f2af9869c7259e278942fd5f2c75 Gerrit-Change-Number: 15125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...openbsc[master]: Bump version: 1.3.0.5-38ea → 1.3.1
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/openbsc/+/15126
Change subject: Bump version: 1.3.0.5-38ea → 1.3.1
..
Bump version: 1.3.0.5-38ea → 1.3.1
Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0
---
M debian/changelog
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/26/15126/1
diff --git a/debian/changelog b/debian/changelog
index 51bc211..ec4e072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openbsc (1.3.1) unstable; urgency=medium
+
+ [ Daniel Willmann ]
+ * manuals: Update osmonitb counter/vty documentation
+ * manuals: Generate vty/counter documentation for osmo-bscnat
+
+ [ Pau Espin Pedrol ]
+ * nat: Remove unused func bsc_vty_init()
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * debian/control: Match dependency versions against configure.ac
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 17:32:51 +0200
+
openbsc (1.3.0) unstable; urgency=medium
[ Keith ]
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/15126
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d06a8f8b7645803b581e8651f20497f80959ec0
Gerrit-Change-Number: 15126
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#8). Change subject: Implement a global switch on the network to disable call waiting. .. Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#7). Change subject: Implement a global switch on the network to disable call waiting. .. Implement a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implement a global switch on the network to disable call waiting.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implement a global switch on the network to disable call waiting. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG@22 PS1, Line 22: of call waiting. > would be nice to briefly mention or reference issues of the unpredictable > behavior I think I'll just drop this explaination and leave it as a feature. it stands. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:11:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#6). Change subject: Implements a global switch on the network to disable call waiting. .. Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#5). Change subject: Implements a global switch on the network to disable call waiting. .. Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#4). Change subject: Implements a global switch on the network to disable call waiting. .. Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 5 files changed, 57 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#3). Change subject: Implements a global switch on the network to disable call waiting. .. Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 6 files changed, 57 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h@258 PS1, Line 258: uint8_t callwaiting; > rather use bool oops, I thought I did.. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 15:04:57 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Bump version: 1.4.1 → 1.5.0
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15124
Change subject: Bump version: 1.4.1 → 1.5.0
..
Bump version: 1.4.1 → 1.5.0
Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2
---
M debian/changelog
1 file changed, 66 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/24/15124/1
diff --git a/debian/changelog b/debian/changelog
index 5461745..02ec236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+osmo-sgsn (1.5.0) unstable; urgency=medium
+
+ [ Max ]
+ * Improve 'show subscriber cache' vty command
+ * GMM: permit VLR_ANSWERED event in attach FSM
+ * Fix IMSI padding in imsi-acl
+
+ [ Harald Welte ]
+ * gbproxy_test: Fix test expectations of gprs_ns_rcvmsg()
+ * LLC XID: Fix string representation of N201_U
+ * LLC: Don't blindly assume all LLC frames have data payload
+ * LLC: Avoid NOTICE message on LLC NULL
+ * gprs_llc: Correctly refuse any ABM command (SABM, DISC) with DM
+ * LLC: Store the XID inside the LLC Entity, not LLC Mgmg Entity
+ * gb_proxy.h: Add missing comments; improve comments
+ * gb_proxy: cosmetic: Use 'bool' in data structures where applicable
+
+ [ efistokl ]
+ * gsm0408_rcv_gmm: send Iu-ReleaseCommand upon receiving Attach Complete.
+ * gprs_gmm: send Service Reject when no PDP ctxs are available.
+
+ [ Alexander Couzens ]
+ * gprs_gmm: reintroduce calling gsm48_gmm_authorize when not handling GMM
Attach Requests
+ * gbproxy: parse dtap GSM48_MT_GSM_DEACT_PDP_REQ|ACK
+
+ [ Pau Espin Pedrol ]
+ * gprs_sndcp_comp_free: Replace ifelse with switch and better handling of
error
+ * sgsn: vty: Improve log warning content with spec section
+ * Document max retransmit times for T3395
+ * sgsn: Fix echo timer not started upon first pdp ctx created
+ * sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
+ * sgsn: Have authentication required on by default
+ * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
+ * Require newer versions of dependencies
+
+ [ Keith ]
+ * Echo zero byte XID-Field of Type L3_PAR
+
+ [ Oliver Smith ]
+ * debian: create -doc subpackage with pdf manuals
+ * contrib/jenkins.sh: run "make maintainer-clean"
+ * osmo-gtphub.cfg: fix conflict with osmo-sgsn.cfg
+ * osmo-gbproxy.cfg: fix conflict with osmo-sgsn.cfg
+
+ [ Vadim Yanitskiy ]
+ * doc/manuals/vty: regenerate sgsn_vty_reference.xml
+ * osmo-sgsn: add VTY parameter to toggle authentication
+ * sgsn_mm_ctx_find_ggsn_ctx(): fix: always set gsm_cause
+
+ [ Eric Wild ]
+ * replace magic tmsi constant with define
+ * turn -Werror=null-dereference into a warning
+
+ [ Daniel Willmann ]
+ * manuals: Add script to regenerate vty/counter documentation
+ * manuals: Update vty/counter documentation
+ * Add/fix help string for version option
+ * osmo-sgsn: Fix outdated information in usermanual
+ * configuration.adoc: Small fixes
+ * configuration.adoc: Add a section about encryption
+
+ [ Ruben Undheim ]
+ * Spelling fixes
+
+ -- Pau Espin Pedrol Thu, 08 Aug 2019 16:46:31 +0200
+
osmo-sgsn (1.4.0) unstable; urgency=medium
[ Alexander Couzens ]
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15124
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Ife43559f395b9602f0b131a672f8d87d6ee48ea2
Gerrit-Change-Number: 15124
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: Require newer versions of dependencies
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15123
Change subject: Require newer versions of dependencies
..
Require newer versions of dependencies
New APIs only available since libgtp 1.4.0 are needed, and in turn that
libgtp version requires newer libosmocore 1.1.0.
osmo-sgsn itself requires libosmocore 1.2.0 since it uses
GSM23003_TMSI_SGSN_MASK.
Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae
---
M configure.ac
M debian/control
2 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/23/15123/1
diff --git a/configure.ac b/configure.ac
index a7d3717..02dcf05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,12 +39,12 @@
AC_SUBST(LIBRARY_DL)
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0)
+PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.2.0)
PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)
-PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.0.0)
PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)
PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0)
@@ -61,7 +61,7 @@
AC_SUBST(osmo_ac_iu)
-PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.3.0)
+PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.4.0)
PKG_CHECK_MODULES(LIBCARES, libcares)
dnl checks for header files
diff --git a/debian/control b/debian/control
index 9ad95a1..df1f070 100644
--- a/debian/control
+++ b/debian/control
@@ -10,17 +10,17 @@
automake,
libtool,
pkg-config,
- libasn1c-dev,
libtalloc-dev,
libc-ares-dev,
- libgtp-dev,
- libosmocore-dev,
- libosmo-abis-dev,
- libosmo-ranap-dev,
- libosmo-sccp-dev,
- libosmo-sigtran-dev,
- libosmo-netif-dev,
- libosmo-gsup-client-dev,
+ libgtp-dev (>= 1.4.0),
+ libosmocore-dev (>= 1.2.0),
+ libosmo-abis-dev (>= 0.6.0),
+ libosmo-netif-dev (>= 0.4.0),
+ libosmo-gsup-client-dev (>= 1.0.0),
+ libasn1c-dev (>= 0.9.30),
+ libosmo-ranap-dev (>= 0.4.0),
+ libosmo-sigtran-dev (>= 1.0.0),
+ libosmo-sccp-dev (>= 1.0.0),
osmo-gsm-manuals-dev
Standards-Version: 3.9.8
Vcs-Git: git://git.osmocom.org/osmo-sgsn.git
@@ -32,14 +32,14 @@
Architecture: any
Multi-Arch: foreign
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
+Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
Package: osmo-sgsn-dbg
Section: debug
Architecture: any
Multi-Arch: same
Depends: osmo-sgsn (= ${binary:Version}), ${misc:Depends}
-Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
+Description: OsmoSGSN: Osmocom's Serving GPRS Support Node for 2G and 3G
packet-switched mobile networks
Package: osmo-gtphub
Architecture: any
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15123
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1c67d3e7dda093b4869756c7a63dc7a4549084ae
Gerrit-Change-Number: 15123
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: Fix dependency version requirements
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG@10 PS1, Line 10: Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb > hmm, using the commit tag syntax is maybe not such a good idea? The "Fixes: " > tag at the beginning o […] Yes that's the osmo-msc hash. The hash on the other line is the commit in the library where that functionality was made available. Format here is not really important, it was a plus adding this information here since I already had the information while looking which versions were needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 14:41:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Fix dependency version requirements
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 ) Change subject: Fix dependency version requirements .. Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG@10 PS1, Line 10: Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb hmm, using the commit tag syntax is maybe not such a good idea? The "Fixes: " tag at the beginning of a line is often used to reference an open issue that gets fixed by this patch. I guess it would be better to omit the ':' to not confuse with that. Also I'm not sure what you mean by "Fixes:" -- is this an osmo-msc commit hash? Maybe "introduced in ..."? https://gerrit.osmocom.org/#/c/15121/1//COMMIT_MSG@24 PS1, Line 24: also: add missing version to libosmo-abis in debian/ fix libosmo-ranap version in debian/, out of sync with configure.ac -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 14:37:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
Hello neels, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 to look at the new patch set (#2). Change subject: Implements a global switch on the network to disable call waiting. .. Implements a global switch on the network to disable call waiting. Add a network -> callwaiting VTY command as boolean. When this is enabled (default) there is no change to operation previous to this commit. When this switch is disabled with "no callwaiting" in vty then when a call arrives, we will check if we have an active call transaction for this subscriber, no matter if it is establishing, established, or alerting, in any of these cases we will return USER BUSY to the calling party. The intention of this patch is for a production network to remove some of the slightly unpredictable behaviour of call waiting. Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_vty.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/test_nodes.vty 7 files changed, 71 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h@258 PS1, Line 258: uint8_t callwaiting; > rather use bool call_waiting -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 14:27:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG@7 PS1, Line 7: Implements a global switch on the network to disable call waiting. minor style: in general, always use the imperative form, "implement"; shorter even would be: "add 'no callwaiting'" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 08 Aug 2019 14:26:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/15120 )
Change subject: Implements a global switch on the network to disable call
waiting.
..
Patch Set 1: Code-Review-1
(11 comments)
build failure: you need to adjust the vty transcript test that failed. You
added the 'callwaiting' vty option, and the transcript test didn't expect that
to appear.
https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG
Commit Message:
https://gerrit.osmocom.org/#/c/15120/1//COMMIT_MSG@22
PS1, Line 22: of call waiting.
would be nice to briefly mention or reference issues of the unpredictable
behavior
https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h
File include/osmocom/msc/gsm_data.h:
https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/gsm_data.h@258
PS1, Line 258: uint8_t callwaiting;
rather use bool
https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/transaction.h
File include/osmocom/msc/transaction.h:
https://gerrit.osmocom.org/#/c/15120/1/include/osmocom/msc/transaction.h@142
PS1, Line 142: struct vlr_subscr *vsub);
Instead of adding this I would suggest the caller use
trans_find_by_type(msc_a_for_vsub(vsub, true), TRANS_CC);
(to avoid API clutter)
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c
File src/libmsc/gsm_04_08_cc.c:
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1806
PS1, Line 1806: struct gsm_trans *_trans = NULL;
> Not sure about this, but I got a segfault (in other code path) while testing,
> wasn't sure if it was […]
as I read the code there shouldn't be a segfault, but it is better style to use
a separate variable indeed.
Rather declare the separate variable at the start of the "if
(!net->callwaiting)" scope because it isn't used elsewhere, and rather name it
like existing_cc_trans or something to clarify.
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1879
PS1, Line 1879: if (!net->callwaiting) {
(put the trans var decl here)
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1880
PS1, Line 1880: _trans = trans_find_cc_by_vsub(net,
vsub);
(use trans_find_by_type() here, see below)
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1886
PS1, Line 1886: _trans->cc.state,
cosmetic: no need to log both the state number and the gsm48_cc_state_name(),
just the name is enough
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1894
PS1, Line 1894: if (!vsub->lu_complete) {
would make sense to keep this check before the callwaiting check. It's higher
up the priority of reject reasons. so... (read below)
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1902
PS1, Line 1902: }
<-- MARKER (see below)
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1917
PS1, Line 1917: msc_a = msc_a_for_vsub(vsub, true);
and here is an msc_a already.
So I would suggest:
- move this msc_a = msc_a_for_vsub() up to "MARKER" above.
- put the net->callwaiting check right below that
- use trans_find_by_type(msc_a, TRANS_CC) instead of adding API
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/msc_vty.c
File src/libmsc/msc_vty.c:
https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/msc_vty.c@360
PS1, Line 360: vty_out(vty, " callwaiting%s", VTY_NEWLINE);
(we often don't write back the default, so could only write 'no callwaiting' in
case it is false)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae
Gerrit-Change-Number: 15120
Gerrit-PatchSet: 1
Gerrit-Owner: keith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: keith
Gerrit-Reviewer: neels
Gerrit-Comment-Date: Thu, 08 Aug 2019 14:19:19 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: keith
Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Bump version: 1.4.0 → 1.5.0
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15122 Change subject: Bump version: 1.4.0 → 1.5.0 .. Bump version: 1.4.0 → 1.5.0 Change-Id: I9b79805c703f4bb860a07bf521ddbf8cb9b29d23 --- M debian/changelog 1 file changed, 227 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/22/15122/1 diff --git a/debian/changelog b/debian/changelog index 8aec381..ec9671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,230 @@ +osmo-msc (1.5.0) unstable; urgency=medium + + [ Max ] + * Handle LCLS-NOTIFICATION message from BSS + * Various logging fixes + * VLR tests: use msgb_eq_data_print() for comparison + * transaction: drop meaningless ti_flag of trans_assign_trans_id() + * transaction: clarify magic 0xff transaction ID + + [ Vadim Yanitskiy ] + * transaction.c: cosmetic: use 'default' branch in trans_free() + * libmsc/ran_conn.c: cosmetic: use tabs instead of N * 8 spaces + * transaction: change arguments of trans_find_by_sm_rp_mr() + * libmsc/gsm_04_11.c: also assign SM-RP-MR to MO transactions + * libmsc/gsm_04_11.c: introduce and use gsm411_assign_sm_rp_mr() + * libmsc/gsm_04_80.c: use gsm0480_create_release_complete() + * libmsc/gsm_04_80.c: add msc_send_ussd_release_complete_cause() + * libmsc/osmo_msc.c: move connection ref-counting code to 'ran_conn.c' + * transaction: fix description of trans_assign_trans_id() + * transaction.h: use #pragma once as include guard + * libmsc/gsm_09_11.c: implement guard timer for NCSS sessions + * libmsc/ran_conn.c: add missing 'break' to OSMO_RAT_EUTRAN_SGS + * libmsc/sgs_iface.c: fix SGS_STATE_NS11 counter reference + * libmsc/sgs_vty.c: always write server address and VLR name + * libmsc/msc_vty.c: drop dead comparison against null + * libmsc/sgs_iface.c: fix copy-paste error + * libmsc/sgs_iface.c: register sgs_vlr_reset_fsm on DSO load + * libmsc/sgs_vty.c: don't print SGs socket error twice + * libmsc: fix: properly initialize the SGs server + * libmsc/sms_queue.c: fix memleak in smsq_take_next_sms() + * tests/sms_queue: track the use of NULL talloc memory contexts + * msc/gsm_data.h: drop unused SMS_HDR_SIZE macro + * configure.ac: drop rudimentary check for -fvisibility=hidden + * configure.ac: drop useless SQLite3 dependency + * libmsc/db.c: print info about database name and libdbi version + * libmsc/gsm_04_11.c: clarify implicit CP-ACK handling + * libmsc/ran_peer.c: fix msgb memleak in ran_peer_rx_reset() + * libmsc/gsm_04_11.c: properly handle TP-User-Data-Length + * libmsc/gsm_04_11.c: fix double init of both SMR and SMC FSMs + * libmsc/gsm_04_11.c: cosmetic: restructure gsm411_mm_send() + * libmsc/gsm_04_08.c: fix: print proper length value + * libmsc/gsm_04_08.c: refactor CM Service Request parsing + * libmsc/gsm_04_08.c: clarify IMEI rejection in gsm48_rx_mm_serv_req() + * libmsc/gsm_04_11_gsup.c: cosmetic: drop useless variable + * tests/.../Makefile.am avoid redundant linkage with librt + * libmsc/sgs_server.c: do not override rc in case of SCTP_SHUTDOWN_EVENT + * libmsc/msc_ho.c: fix unreacheable check of MSC-T role allocation + * libmsc/msc_a.c: fix possible NULL-pointer dereferences + * sms_queue_test: assert return value of osmo_use_count_get_put() + * libmsc/gsm_04_11.c: fix NULL-pointer dereference in gsm340_rx_tpdu() + * libmsc/ran_msg_a.c: avoid ternary operator in struct initialization + * libmsc/ran_msg_a.c: refactor ran_a_decode_lcls_notification() + * libmsc/ran_msg_a.c: prevent chosen_encryption->key buffer overrun + * libmsc/mncc_call.c: fix uninitialized access of stack memory + * libmsc/ran_peer.c: fix msgb memleaks in ran_peer_down_paging() + * libmsc/ran_peer.c: avoid unreasonable use of goto in ran_peer_down_paging() + * libmsc/msc_vty.c: fix: use msub_for_vsub() in subscr_dump_full_vty() + * libmsc/msc_vty.c: fix documentation of 'show subscriber id' + * libmsc/msc_vty.c: use llist_count() in subscr_dump_full_vty() + * libmsc/rtp_stream.c: prevent NULL-pointer dereference + * libmsc/gsm_04_11.c: properly handle MMTS indication + * transaction: accept trans_type enum in trans_log_subsys() + * Use GSM23003_MSISDN_MAX_DIGITS from libosmogsm + * libmsc/msc_vty.c: refactor 'show subscr / conn / trans' commands + * libmsc/msc_vty.c: do not abuse strlen() to check char buffers + * tests: share stubs.h from msc_vlr_test as stubs.c + * Introduce initial unit test for db_sms_* API + * libmsc/db.c: fix storing SMS with empty TP-User-Data + * debian/control: add missing libdbd-sqlite3 to Build-Depends + * libmsc/db.c: fix potential integer overflow + * libmsc/db.c: introduce and use parse_sm_ud_from_result() + * libmsc/db.c: warn user about SMS text truncation + * libmsc/db.c: get rid of hard-coded SMS expiry threshold + * libmsc/mncc_builtin.c: drop dummy switch in int_mncc_recv() + *
Change in ...osmo-msc[master]: Fix dependency version requirements
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/15121 Change subject: Fix dependency version requirements .. Fix dependency version requirements libosmocore 1.1.0 0e8df1c7e48bcae2285c7c138bd50f932049bd24 osmo_use_count() Fixes: 7c5346cd7005ad469702a2f74572b79de738fbbb libosmocore 1.2.0 cdac620579b5bf44970b5f4bb11734fdfdf5bf59 GSM23003_MSISDN_MAX_DIGITS Fixes: 8b0737fa71ea4b04cee8dc61c79a1f93779e66dc libosmo-sccp 1.1.0 21ff9ae4264de159784a59ce4421365007bde08d osmo_sccp_addr_ri_cmp() Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 osmo-mgw 1.6.0 538d2c53d90074267e7a70a90c773baa03d6ec04 mgcp_client_endpoint_fsm.h Fixes: c4628a3ad4d3c5f65782b152b771bf80357235d6 libosmo-netif 0.6.0 needed by osmo-mgw 1.6.0 libsmpp34 1.14.0 required due to needed heap allocation function overrides from smpp34_heap.h Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 --- M configure.ac M debian/control 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/21/15121/1 diff --git a/configure.ac b/configure.ac index bb8fb39..5aa652d 100644 --- a/configure.ac +++ b/configure.ac @@ -35,15 +35,15 @@ ]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0) PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0) -PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0) -PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.0.0) -PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.6.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0) old_LIBS=$LIBS @@ -91,7 +91,7 @@ AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])], [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"]) if test "$osmo_ac_build_smpp" = "yes" ; then -PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.13.0) +PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.14.0) AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP]) fi AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes") diff --git a/debian/control b/debian/control index 887e386..f7a336a 100644 --- a/debian/control +++ b/debian/control @@ -13,17 +13,17 @@ libdbd-sqlite3, libsctp-dev, libtalloc-dev, - libsmpp34-dev (>= 1.12), - libasn1c-dev (>= 0.9.28), - libosmocore-dev (>= 0.10.0), - libosmo-sccp-dev, - libosmo-sigtran-dev (>= 0.8.0), - libosmo-abis-dev, - libosmo-mgcp-client-dev (>= 1.1.0), - libosmo-gsup-client-dev (>= 0.2.1), - libosmo-netif-dev (>= 0.1.0), - libosmo-ranap-dev (>= 0.2.0), - osmo-gsm-manuals-dev + libsmpp34-dev (>= 1.14.0), + libasn1c-dev (>= 0.9.30), + libosmocore-dev (>= 1.2.0), + libosmo-sccp-dev (>= 1.1.0), + libosmo-sigtran-dev (>= 1.1.0), + libosmo-abis-dev (>= 0.6.0), + libosmo-mgcp-client-dev (>= 1.6.0), + libosmo-gsup-client-dev (>= 1.0.0), + libosmo-netif-dev (>= 0.6.0), + libosmo-ranap-dev (>= 0.3.0), + osmo-gsm-manuals-dev (>= 0.2.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-msc.git Vcs-Browser: https://git.osmocom.org/osmo-msc/ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1cd2c7317933b416b74a412f10e4cad16ecd6e59 Gerrit-Change-Number: 15121 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/15120 ) Change subject: Implements a global switch on the network to disable call waiting. .. Patch Set 1: (1 comment) > Build Failed > > https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-msc/1824/ : > FAILURE Aw boo. It built for me. https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/#/c/15120/1/src/libmsc/gsm_04_08_cc.c@1806 PS1, Line 1806: struct gsm_trans *_trans = NULL; Not sure about this, but I got a segfault (in other code path) while testing, wasn't sure if it was due to my redefining trans below, so I left it here. As far as i can make out, if the code path continues, we are going to trans = trans_alloc() anyway. but may be something I'm doing wring here with memory. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae Gerrit-Change-Number: 15120 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Comment-Date: Thu, 08 Aug 2019 14:01:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: Implements a global switch on the network to disable call waiting.
keith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/15120
Change subject: Implements a global switch on the network to disable call
waiting.
..
Implements a global switch on the network to disable call waiting.
Add a network -> callwaiting VTY command as boolean.
When this is enabled (default) there is no change to
operation previous to this commit.
When this switch is disabled with "no callwaiting" in vty
then when a call arrives, we will check if we have an active
call transaction for this subscriber, no matter if it is
establishing, established, or alerting, in any of these cases we
will return USER BUSY to the calling party.
The intention of this patch is for a production network
to remove some of the slightly unpredictable behaviour
of call waiting.
Change-Id: I3eb6f23f7103e3002874fb5d3a30c9de952202ae
---
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/transaction.h
M src/libmsc/gsm_04_08_cc.c
M src/libmsc/msc_vty.c
M src/libmsc/transaction.c
M src/osmo-msc/msc_main.c
6 files changed, 69 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/15120/1
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index e926b3f..e0d6a6c 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -253,6 +253,9 @@
/* Whether we want to use Osmux against BSCs. Controlled via VTY */
enum osmux_usage use_osmux;
+
+ /* Whether to use call waiting on the network */
+ uint8_t callwaiting;
};
struct osmo_esme;
diff --git a/include/osmocom/msc/transaction.h
b/include/osmocom/msc/transaction.h
index 69cd652..b173f31 100644
--- a/include/osmocom/msc/transaction.h
+++ b/include/osmocom/msc/transaction.h
@@ -138,7 +138,8 @@
};
-
+struct gsm_trans *trans_find_cc_by_vsub(const struct gsm_network *net,
+ struct vlr_subscr *vsub);
struct gsm_trans *trans_find_by_type(const struct msc_a *msc_a, enum
trans_type type);
struct gsm_trans *trans_find_by_id(const struct msc_a *msc_a,
enum trans_type type, uint8_t trans_id);
diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c
index 03830de..37d0a07 100644
--- a/src/libmsc/gsm_04_08_cc.c
+++ b/src/libmsc/gsm_04_08_cc.c
@@ -1803,6 +1803,7 @@
int i, rc = 0;
struct msc_a *msc_a = NULL;
struct gsm_trans *trans = NULL;
+ struct gsm_trans *_trans = NULL;
const struct gsm_mncc *data;
/* handle special messages */
@@ -1874,6 +1875,21 @@
/* update the subscriber we deal with */
log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
+ /* If subscriber is BUSY and we do not DO call in call or
"call-waiting" */
+ if (!net->callwaiting) {
+ _trans = trans_find_cc_by_vsub(net, vsub);
+ if (_trans && _trans->cc.state != GSM_CSTATE_NULL) {
+ LOG_TRANS_CAT(_trans, DCC, LOGL_NOTICE,
+ "rx '%s' for subscriber %s with
trans state %d (%s)"
+ " rejecting with USER_BUSY\n",
+ get_mncc_name(msg->msg_type),
data->called.number,
+ _trans->cc.state,
+ gsm48_cc_state_name(_trans->cc.state));
+ return mncc_release_ind(net, NULL,
data->callref,
+
GSM48_CAUSE_LOC_PRN_S_LU,
+
GSM48_CC_CAUSE_USER_BUSY);
+ }
+ }
/* If subscriber is not "attached" */
if (!vsub->lu_complete) {
LOG_TRANS_CAT(trans, DCC, LOGL_ERROR, "rx %s for
subscriber that is not attached: %s\n",
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 5bf9701..13b9687 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -292,6 +292,29 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_net_call_wait, cfg_net_call_wait_cmd,
+ "callwaiting",
+ "Enable Call Waiting on the Network\n")
+{
+ struct gsm_network *net = vty->index;
+
+ net->callwaiting = true;
+
+ return CMD_SUCCESS;
+}
+
+DEFUN(cfg_net_no_call_wait, cfg_net_no_call_wait_cmd,
+ "no callwaiting",
+ NO_STR
+ "Disable Call Waiting on the Network\n")
+{
+ struct gsm_network *net = vty->index;
+
+ net->callwaiting = false;
+
+ return CMD_SUCCESS;
+}
+
static int config_write_net(struct vty *vty)
{
int i;
@@ -333,6 +356,11 @@
gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);
}
+ if (gsmnet->callwaiting)
+ vty_out(vty, " callwaiting%s",
Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace
neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15075 ) Change subject: run.sh: add comment to show how to enable MNCC udtrace .. run.sh: add comment to show how to enable MNCC udtrace Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 --- M net/templates/run.sh 1 file changed, 6 insertions(+), 0 deletions(-) diff --git a/net/templates/run.sh b/net/templates/run.sh index 3244b11..97592eb 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -66,6 +66,12 @@ hnbgw="osmo-hnbgw" msc="gdb -ex run --args $(which osmo-msc)" +# To enable udtrace on osmo-msc MNCC socket, use this with adjusted /path/to/udtrace: +# - LD_LIBRARY_PATH allows linking to titan if udtrace was compiled with titan support. +# - LD_PRELOAD of libasan allows building osmo-msc with the sanitize.opts. +# - the tee saves the stderr logging as well as the udtrace output to new file current_log/osmo-msc.out, since udtrace +# will not show in osmo-msc.log +#msc="LD_LIBRARY_PATH=/usr/lib/titan LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5:/path/to/udtrace/libudtrace.so osmo-msc 2>&1 | tee -a current_log/osmo-msc.out" gbproxy="osmo-gbproxy" sgsn="osmo-sgsn" ggsn="osmo-ggsn" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-dev[master]: kamailio: fixes and tweaks
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-dev/+/15077 )
Change subject: kamailio: fixes and tweaks
..
kamailio: fixes and tweaks
This is what I did to get external MNCC with kamailio to work.
(As before, only change MSC_MNCC from "internal" to "external ..." in config_*
to enable use of kamailio as external MNCC.)
Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899
---
M net/templates/kamailio.cfg
M net/templates/run.sh
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
keith: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/net/templates/kamailio.cfg b/net/templates/kamailio.cfg
index c5b0bf2..b0e2bf3 100644
--- a/net/templates/kamailio.cfg
+++ b/net/templates/kamailio.cfg
@@ -102,8 +102,8 @@
loadmodule "xlog.so"
loadmodule "sanity.so"
# loadmodule "ctl.so"
-loadmodule "cfg_rpc.so"
-loadmodule "mi_rpc.so"
+# loadmodule "cfg_rpc.so"
+# loadmodule "mi_rpc.so"
loadmodule "acc.so"
#!ifdef WITH_NAT
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 1697429..a42ec52 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -133,15 +133,9 @@
read enter_to_close
echo Closing...
-if [ "x${MSC_MNCC}" != "xinternal" ]; then
- kill %13 %14
- killall osmo-sip-connector
- killall kamailio
-fi
-
#ssh bts neels/stop_remote.sh
-kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12
+kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14
killall osmo-msc
killall osmo-bsc
killall osmo-gbproxy
@@ -153,6 +147,13 @@
sudo killall tcpdump
killall osmo-ggsn
+if [ "x${MSC_MNCC}" != "xinternal" ]; then
+ # 'killall' seems to work only with the shortened name
+ killall osmo-sip-connec
+ killall kamailio
+fi
+
+
set +e
cp *.cfg "$logdir"/
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899
Gerrit-Change-Number: 15077
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: keith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-dev[master]: run.sh: drop -M mncc-socket option from osmo-msc cmdline
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-dev/+/15119 )
Change subject: run.sh: drop -M mncc-socket option from osmo-msc cmdline
..
run.sh: drop -M mncc-socket option from osmo-msc cmdline
Since commit [1], the MNCC socket path is configured in the .cfg file. There is
no need to pass the -M option to osmo-msc on the cmdline anymore.
Also, the udtrace example to launch osmo-msc in run.sh includes a '| tee' so
that the -M would be passed as option to tee and breaks that example.
[1] cbdd7180a667c2b536ce13d06fa43f61eba215b0 /
Ie6352c584c0fce57c617387160c285abf40a5f90
Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e
---
M net/templates/run.sh
1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 97592eb..1697429 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -85,7 +85,6 @@
if [ "x${MSC_MNCC}" != "xinternal" ]; then
sipcon="osmo-sip-connector -c osmo-sip-connector.cfg"
- msc="$msc -M ${MSC_MNCC_SOCKET}"
# Require kamailio (PATH hack is needed for Debian)
kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15119
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e
Gerrit-Change-Number: 15119
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: merged
Change in ...osmo-dev[master]: add sysmobts-calib.py
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-dev/+/15074 )
Change subject: add sysmobts-calib.py
..
add sysmobts-calib.py
Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4
---
A sysmobts-calib.py
1 file changed, 200 insertions(+), 0 deletions(-)
diff --git a/sysmobts-calib.py b/sysmobts-calib.py
new file mode 100755
index 000..d3c
--- /dev/null
+++ b/sysmobts-calib.py
@@ -0,0 +1,200 @@
+#!/usr/bin/env python3
+doc = '''Remotely do a clock calibration of a sysmoBTS.
+
+You need is ssh root access to the BTS, and an antenna connected to the NWL.
+
+Remotely goes through the steps to obtain a OCXO calibration value from
netlisten.
+- Obtain the current calibration value from /etc/osmocom/osmo-bts-sysmo.cfg.
+- Stop the osmo-bts-sysmo.service.
+- Do a scan to get the strongest received ARFCN.
+- Run n passes of sysmobts-calib (default: 7) to obtain an average calibration
val.
+- Write this calibration value back to /etc/osmocom/osmo-bts-sysmo.cfg.
+- Start osmo-bts-sysmo.service.
+'''
+
+import sys
+import subprocess
+import re
+import shlex
+import argparse
+
+calib_val_re = re.compile(r'clock-calibration +([0-9]+)')
+result_re = re.compile('The calibration value is: ([0-9]*)')
+
+class Globals:
+orig_calib_val = None
+calib_val = None
+bts = 'bts0'
+band = '900'
+arfcn = None
+
+def error(*msgs):
+sys.stderr.write(''.join(str(m) for m in msgs))
+sys.stderr.write('\n')
+exit(1)
+
+def log(*msgs):
+print(''.join(str(m) for m in msgs))
+
+def cmd_to_str(cmd):
+return ' '.join(shlex.quote(c) for c in cmd)
+
+def call_output(*cmd):
+cmd = ('ssh', Globals.bts,) + cmd
+log('+ %s' % cmd_to_str(cmd))
+sys.stdout.flush()
+sys.stderr.flush()
+p = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
+o,e = p.communicate()
+return o.decode('utf-8')
+
+def call(*cmd):
+o = call_output(*cmd)
+if o:
+log(o)
+
+def reload_dsp():
+#call('/bin/sh', '-c', r"'cat /lib/firmware/sysmobts-v?.bit >
/dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out >
/dev/dspdl_dm644x_0; sleep 1s'")
+# systemd service contains the DSP reload commands in the ExecStopPost.
+# So starting and stopping the service is the easy way to reload the DSP.
+call('systemctl', 'start', 'osmo-bts-sysmo')
+call('systemctl', 'stop', 'osmo-bts-sysmo')
+
+def get_cfg_calib_val():
+o = call_output('grep', 'clock-calibration',
'/etc/osmocom/osmo-bts-sysmo.cfg')
+if not o:
+return None
+o = o.strip()
+m = calib_val_re.match(o)
+if not m:
+return None
+return m.group(1)
+
+def set_cfg_calib_val(calib_val):
+if get_cfg_calib_val() is None:
+call('sed', '-i', "'s/^ instance 0$/&\\n clock-calibration %s/'" %
calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg');
+else:
+call('sed', '-i', "'s/clock-calibration.*$/clock-calibration %s/'" %
calib_val, '/etc/osmocom/osmo-bts-sysmo.cfg');
+
+now = get_cfg_calib_val()
+if now != calib_val:
+print('Failed to set calibration value, set manually in
osmo-bts-sysmo.cfg')
+print('phy 0\n instance 0\n clock-calibration %s' % calib_val)
+
+
+def ask(*question, valid_answers=('*',)):
+while True:
+print('\n' + '\n '.join(question))
+
+answer = sys.stdin.readline().strip()
+for v in valid_answers:
+if v == answer:
+return answer
+if v == '*':
+return answer
+if v == '+' and len(answer):
+return answer
+
+def call_sysmobts_calib(mode, *args):
+o = call_output('sysmobts-calib', '-c', 'ocxo', '-s', 'netlisten', '-b',
Globals.band, '-i', Globals.calib_val, '-m', mode, *args)
+log(o)
+reload_dsp()
+return o
+
+def int_be_one(string):
+val = int(string)
+if val < 1:
+raise argparse.ArgumentTypeError('value must be at least 1')
+return val
+
+if __name__ == '__main__':
+parser = argparse.ArgumentParser(description=doc)
+parser.add_argument('-b', '--band', dest='band', default=None,
+help='Which GSM band to scan and calibrate to (850,
900, 1800, 1900)')
+parser.add_argument('-a', '--arfcn', dest='arfcn', default=None,
+help="Don't scan, directly use this ARFCN to calibrate
to")
+parser.add_argument('-i', '--initial-clock-correction', dest='calib_val',
default=None,
+help='Clock calibration value to start out with. If
omitted, this is obtained from'
+' /etc/osmocom/osmo-bts-sysmo.cfg from the BTS file
system.')
+parser.add_argument('-I', '--set-clock-correction', dest='set_calib_val',
default=None,
+help="Don't scan or calibrate, just set the given
value in the config file")
+parser.add_argument('-G',
Change in ...osmo-dev[master]: osmo-bsc.cfg: remove 'as' config from cs7
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-dev/+/15076 )
Change subject: osmo-bsc.cfg: remove 'as' config from cs7
..
osmo-bsc.cfg: remove 'as' config from cs7
It's not needed and causes confusion with routing-keys when more BSCs show up.
Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0
---
M net/templates/osmo-bsc.cfg
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg
index 7741b26..10aa0e3 100644
--- a/net/templates/osmo-bsc.cfg
+++ b/net/templates/osmo-bsc.cfg
@@ -20,9 +20,6 @@
cs7 instance 0
point-code ${BSC_PC}
asp asp-clnt-msc-0 2905 0 m3ua
- as as-clnt-msc-0 m3ua
- asp asp-clnt-msc-0
- routing-key 4 ${BSC_PC}
network
network country code ${MCC}
mobile network code ${MNC}
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15076
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0
Gerrit-Change-Number: 15076
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-dev[master]: run.sh: add comment to show how to enable MNCC udtrace
Hello pespin, keith, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 to look at the new patch set (#2). Change subject: run.sh: add comment to show how to enable MNCC udtrace .. run.sh: add comment to show how to enable MNCC udtrace Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 --- M net/templates/run.sh 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/75/15075/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5 Gerrit-Change-Number: 15075 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-dev[master]: add sysmobts-calib.py
Hello pespin, keith, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 to look at the new patch set (#2). Change subject: add sysmobts-calib.py .. add sysmobts-calib.py Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 --- A sysmobts-calib.py 1 file changed, 200 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/74/15074/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15074 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0cb372bddd115246ad1822dc06d318815387e8a4 Gerrit-Change-Number: 15074 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-dev[master]: run.sh: drop -M mncc-socket option from osmo-msc cmdline
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-dev/+/15119
Change subject: run.sh: drop -M mncc-socket option from osmo-msc cmdline
..
run.sh: drop -M mncc-socket option from osmo-msc cmdline
Since commit [1], the MNCC socket path is configured in the .cfg file. There is
no need to pass the -M option to osmo-msc on the cmdline anymore.
Also, the udtrace example to launch osmo-msc in run.sh includes a '| tee' so
that the -M would be passed as option to tee and breaks that example.
[1] cbdd7180a667c2b536ce13d06fa43f61eba215b0 /
Ie6352c584c0fce57c617387160c285abf40a5f90
Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e
---
M net/templates/run.sh
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/19/15119/1
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 97592eb..1697429 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -85,7 +85,6 @@
if [ "x${MSC_MNCC}" != "xinternal" ]; then
sipcon="osmo-sip-connector -c osmo-sip-connector.cfg"
- msc="$msc -M ${MSC_MNCC_SOCKET}"
# Require kamailio (PATH hack is needed for Debian)
kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15119
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e
Gerrit-Change-Number: 15119
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: vlr_lu_fsm: fix missing event for IMEISV
neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15111 ) Change subject: vlr_lu_fsm: fix missing event for IMEISV .. vlr_lu_fsm: fix missing event for IMEISV Event VLR_ULA_E_ID_IMEISV is listed as permitted in VLR_ULA_S_WAIT_LU_COMPL, but is missing from the switch() on the incoming event. So, sending an IMEISV identity during the WAIT_LU_COMPL state would crash osmo-msc. When receiving an IMEISV, vlr_subscr_set_imeisv() in turn calls vlr_subscr_set_imei(), so as far as the lu_fsm is concerned, receiving an IMEISV is identical to receiving an IMEI, and it can continue to send a Check IMEI request to the HLR. Thus simply add VLR_ULA_E_ID_IMEISV to the VLR_ULA_E_ID_IMEI switch case. Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad --- M src/libvlr/vlr_lu_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 87bf7a5..454709f 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -1253,6 +1253,7 @@ LU_COMPL_VLR_E_NEW_TMSI_ACK, NULL); break; case VLR_ULA_E_ID_IMEI: + case VLR_ULA_E_ID_IMEISV: /* Got the IMEI from ME, now send it to HLR */ vlr_subscr_tx_req_check_imei(lfp->vsub); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I11106cb108a4b1406ff9a8b8ff5761440a274dad Gerrit-Change-Number: 15111 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Bump version: 1.1.0-dirty → 1.1.1
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 ) Change subject: Bump version: 1.1.0-dirty → 1.1.1 .. Bump version: 1.1.0-dirty → 1.1.1 Patch release to have debian/patches/build-for-debian8.patch applying correctly again. Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb --- M debian/changelog M debian/patches/build-for-debian8.patch 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c88b703..96cd208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.1.1) unstable; urgency=medium + + * UNRELEASED + + -- Pau Espin Pedrol Thu, 08 Aug 2019 13:00:05 +0200 + osmo-trx (1.1.0) unstable; urgency=medium [ Sylvain Munaut ] diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index 6b917c4..cce063c 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, -libosmocore-dev (>= 0.10.0), +libosmocore-dev (>= 0.12.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...libusrp[master]: Bump version: 3.4.3.2-8646 → 3.4.4
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15116 ) Change subject: Bump version: 3.4.3.2-8646 → 3.4.4 .. Bump version: 3.4.3.2-8646 → 3.4.4 Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 877cc76..a62e533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libusrp (3.4.4) unstable; urgency=medium + + * debian/rules: Don't delete .tarball-version + * Fix UNKNOWN version in make dist + + -- Pau Espin Pedrol Thu, 08 Aug 2019 12:31:57 +0200 + libusrp (3.4.3) unstable; urgency=medium [ Pau Espin Pedrol ] -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 Gerrit-Change-Number: 15116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Bump version: 1.1.0-dirty → 1.1.1
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 ) Change subject: Bump version: 1.1.0-dirty → 1.1.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libusrp[master]: debian/rules: Don't delete .tarball-version
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libusrp/+/15114 )
Change subject: debian/rules: Don't delete .tarball-version
..
debian/rules: Don't delete .tarball-version
No other osmocom project does it.
Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4
---
M debian/rules
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/debian/rules b/debian/rules
index 5835e95..c00c435 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@
override_dh_clean:
dh_clean
- rm -f tests/package.m4 tests/testsuite .version .tarball-version
+ rm -f tests/package.m4 tests/testsuite .version
override_dh_auto_test:
dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
--
To view, visit https://gerrit.osmocom.org/c/libusrp/+/15114
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4
Gerrit-Change-Number: 15114
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15117 )
Change subject: osmo-release.sh: Check patches under debian/patches apply
..
osmo-release.sh: Check patches under debian/patches apply
Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439
---
M osmo-release.sh
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/osmo-release.sh b/osmo-release.sh
index 38f238d..a779a26 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -61,6 +61,22 @@
echo "OK: dependency specific versions in configure.ac and
debian/control match"
}
+# Make sure that patches under debian/patches/ apply:
+check_debian_patch_apply() {
+ if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then
+ return
+ fi
+ for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do
+ git apply --check $patch
+ if [ $? -ne 0 ]; then
+ echo "ERROR: patch no longer applies! $patch"
+ exit 1
+ else
+ echo "OK: patch applies: $patch"
+ fi
+ done
+}
+
BUMPVER=`command -v bumpversion`
GIT_TOPDIR="$(git rev-parse --show-toplevel)"
NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty |
awk -F '=' '{ print $2 }'`
@@ -81,6 +97,7 @@
echo "Releasing $VERSION -> $NEW_VER..."
check_configureac_debctrl_deps_match
+check_debian_patch_apply
if [ "z$LIBVERS" != "z" ]; then
if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ];
then
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439
Gerrit-Change-Number: 15117
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...libusrp[master]: Bump version: 3.4.3.2-8646 → 3.4.4
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15116 ) Change subject: Bump version: 3.4.3.2-8646 → 3.4.4 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: If47c3a8f03cfd2eaff84359a9a2bfce02f3b9a10 Gerrit-Change-Number: 15116 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15110 )
Change subject: osmo-release.sh: Verify consistency of dependency versions in
configure.ac and debian/control
..
osmo-release.sh: Verify consistency of dependency versions in configure.ac and
debian/control
Sample output for current osmo-msc master:
Releasing 1.3.1.191-7ea0d -> 1.4.0...
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control
!
ERROR: configure.ac does NOT match debian/control !
ERROR: configure.ac does NOT match debian/control
!
ERROR: exiting due to previous errors
make: *** [osmo-release.mk:9: release] Error 1
Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
---
M osmo-release.sh
1 file changed, 42 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/osmo-release.sh b/osmo-release.sh
index e9602aa..38f238d 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -21,6 +21,46 @@
echo "$major"
}
+# Make sure that depedency requirement versions match in configure.ac vs
debian/control.
+#eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs
"libosmocore-dev (>= 1.0.0),"
+check_configureac_debctrl_deps_match() {
+ configureac_list=$(grep -e "PKG_CHECK_MODULES"
"${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed
"s/>=/ /g")
+ echo "$configureac_list" | \
+ { return_error=0
+ while read -r dep ver; do
+
+ debctrl_match="$(grep -e "${dep}-dev"
${GIT_TOPDIR}/debian/control | grep ">=")"
+ debctrl_match_count="$(echo "$debctrl_match" | grep -c ">=")"
+ if [ "z$debctrl_match_count" != "z0" ]; then
+ #echo "Dependency <$dep, $ver> from configure.ac
matched in debian/control! ($debctrl_match_count)"
+ if [ "z$debctrl_match_count" != "z1" ]; then
+ echo "WARN: configure.ac <$dep, $ver> matches
debian/control $debctrl_match_count times, manual check required!"
+ else # 1 match:
+ parsed_match=$(echo "$debctrl_match" | tr -d
"(" | tr -d ")" | tr -d "," | tr -d " " | sed "s/>=/ /g")
+ debctrl_dep=$(echo "$parsed_match" | cut -d " "
-f 1 | sed "s/-dev//g")
+ debctrl_ver=$(echo "$parsed_match" | cut -d " "
-f 2)
+ if [ "z$dep" != "z$debctrl_dep" ] || [ "z$ver"
!= "z$debctrl_ver" ]; then
+ echo "ERROR: configure.ac <$dep, $ver>
does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
+ return_error=1
+ #else
+ # echo "OK: configure.ac <$dep, $ver>
matches debian/control <$debctrl_dep, $debctrl_ver>"
+ fi
+ fi
+ fi
+ done
+ if [ $return_error -ne 0 ]; then
+ exit 1
+ fi
+ }
+
+ # catch and forward exit from pipe subshell "while read":
+ if [ $? -ne 0 ]; then
+ echo "ERROR: exiting due to previous errors"
+ exit 1
+ fi
+ echo "OK: dependency specific versions in configure.ac and
debian/control match"
+}
+
BUMPVER=`command -v bumpversion`
GIT_TOPDIR="$(git rev-parse --show-toplevel)"
NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty |
awk -F '=' '{ print $2 }'`
@@ -40,6 +80,8 @@
echo "Releasing $VERSION -> $NEW_VER..."
+check_configureac_debctrl_deps_match
+
if [ "z$LIBVERS" != "z" ]; then
if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ];
then
echo "ERROR: Before releasing, please modify some of the
libversions: $LIBVERS"
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libusrp[master]: debian/rules: Don't delete .tarball-version
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15114 ) Change subject: debian/rules: Don't delete .tarball-version .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ieb3d8070b9a5764bf763fad4fa83f9976df34bd4 Gerrit-Change-Number: 15114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libusrp[master]: Fix UNKNOWN version in make dist
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/15115 ) Change subject: Fix UNKNOWN version in make dist .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 Gerrit-Change-Number: 15115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:30:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo-release.sh: Verify consistency of dependency versions in configu...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15110 ) Change subject: osmo-release.sh: Verify consistency of dependency versions in configure.ac and debian/control .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I702a82c1b0e21dbe71a334a6f8bc62efe07859a6 Gerrit-Change-Number: 15110 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 08 Aug 2019 11:29:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libusrp[master]: Fix UNKNOWN version in make dist
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libusrp/+/15115 ) Change subject: Fix UNKNOWN version in make dist .. Fix UNKNOWN version in make dist Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 --- M Makefile.am 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 553747e..eb149d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ EXTRA_DIST += \ usrp.pc.in \ usrp.iss.in \ - usrp.inf + usrp.inf \ + .version SUBDIRS = host fpga doc firmware @@ -34,4 +35,10 @@ pkgconfig_DATA = \ usrp.pc +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + @RELMAKE@ -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/15115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I94b2f2d00d73b62dcdbc85ae15d9b26de5a6f879 Gerrit-Change-Number: 15115 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15117 ) Change subject: osmo-release.sh: Check patches under debian/patches apply .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439 Gerrit-Change-Number: 15117 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 08 Aug 2019 11:29:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Bump version: 1.1.0-dirty → 1.1.1
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15118 Change subject: Bump version: 1.1.0-dirty → 1.1.1 .. Bump version: 1.1.0-dirty → 1.1.1 Patch release to have debian/patches/build-for-debian8.patch applying correctly again. Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb --- M debian/changelog M debian/patches/build-for-debian8.patch 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/18/15118/1 diff --git a/debian/changelog b/debian/changelog index c88b703..96cd208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-trx (1.1.1) unstable; urgency=medium + + * UNRELEASED + + -- Pau Espin Pedrol Thu, 08 Aug 2019 13:00:05 +0200 + osmo-trx (1.1.0) unstable; urgency=medium [ Sylvain Munaut ] diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch index 6b917c4..cce063c 100644 --- a/debian/patches/build-for-debian8.patch +++ b/debian/patches/build-for-debian8.patch @@ -7,7 +7,7 @@ libtalloc-dev, libusrp-dev, - liblimesuite-dev, -libosmocore-dev (>= 0.10.0), +libosmocore-dev (>= 0.12.0), osmo-gsm-manuals-dev Standards-Version: 3.9.6 @@ -30,7 +29,7 @@ Package: osmo-trx-dbg -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I27caf077abc400e9661549886bb8f7827dd299bb Gerrit-Change-Number: 15118 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...libosmocore[master]: osmo-release.sh: Check patches under debian/patches apply
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/15117
Change subject: osmo-release.sh: Check patches under debian/patches apply
..
osmo-release.sh: Check patches under debian/patches apply
Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439
---
M osmo-release.sh
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/15117/1
diff --git a/osmo-release.sh b/osmo-release.sh
index 38f238d..a779a26 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -61,6 +61,22 @@
echo "OK: dependency specific versions in configure.ac and
debian/control match"
}
+# Make sure that patches under debian/patches/ apply:
+check_debian_patch_apply() {
+ if [ ! -d "${GIT_TOPDIR}/debian/patches" ]; then
+ return
+ fi
+ for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do
+ git apply --check $patch
+ if [ $? -ne 0 ]; then
+ echo "ERROR: patch no longer applies! $patch"
+ exit 1
+ else
+ echo "OK: patch applies: $patch"
+ fi
+ done
+}
+
BUMPVER=`command -v bumpversion`
GIT_TOPDIR="$(git rev-parse --show-toplevel)"
NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty |
awk -F '=' '{ print $2 }'`
@@ -81,6 +97,7 @@
echo "Releasing $VERSION -> $NEW_VER..."
check_configureac_debctrl_deps_match
+check_debian_patch_apply
if [ "z$LIBVERS" != "z" ]; then
if [ "z$MAKEMOD" = "z" ] && [ "z$ALLOW_NO_LIBVERSION_CHANGE" = "z0" ];
then
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15117
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I614080361f3cc5bfb89994a8e8e36981529cd439
Gerrit-Change-Number: 15117
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/osmo-bsc in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Testing/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 374s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o abis_rsl.o abis_rsl.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o acc_ramp.o acc_ramp.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o arfcn_range_encode.o arfcn_range_encode.c [ 375s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../.. -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Werror=implicit -Werror=maybe-uninitialized -Werror=memset-transposed-args -Wnull-dereference -Werror=sizeof-array-argument -Werror=sizeof-pointer-memaccess -c -o assignment_fsm.o assignment_fsm.c [ 376s] assignment_fsm.c:26:10: fatal error: osmocom/mgcp_client/mgcp_client_endpoint_fsm.h: No such file or directory [ 376s] #include [ 376s] ^~~~ [ 376s] compilation terminated. [ 376s] make[4]: *** [Makefile:662: assignment_fsm.o] Error 1 [ 376s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bsc' [ 376s] make[3]: *** [Makefile:405: all-recursive] Error 1 [ 376s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 376s] make[2]: *** [Makefile:448: all-recursive] Error 1 [ 376s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 376s] make[1]: *** [Makefile:380: all] Error 2 [ 376s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 376s] dh_auto_build: make -j1 returned exit code 2 [ 376s] make: *** [debian/rules:45: build] Error 255 [ 376s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 376s] [ 376s] lamb27 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 10:54:28 UTC 2019. [ 376s] [ 376s] ### VM INTERACTION START ### [ 379s] [ 358.743454] sysrq: SysRq : Power Off [ 379s] [ 358.756472] reboot: Power down [ 379s] ### VM INTERACTION END ### [ 379s] [ 379s] lamb27 failed "build osmo-bsc_1.5.0.dsc" at Thu Aug 8 10:54:32 UTC 2019. [ 379s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-trx in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Testing/x86_64
Package network:osmocom:latest/osmo-trx failed to build in Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest osmo-trx
Last lines of build log:
[ 725s] #define HAVE_STDLIB_H 1
[ 725s] #define HAVE_STRING_H 1
[ 725s] #define HAVE_MEMORY_H 1
[ 725s] #define HAVE_STRINGS_H 1
[ 725s] #define HAVE_INTTYPES_H 1
[ 725s] #define HAVE_STDINT_H 1
[ 725s] #define HAVE_UNISTD_H 1
[ 725s] #define HAVE_DLFCN_H 1
[ 725s] #define LT_OBJDIR ".libs/"
[ 725s] #define STDC_HEADERS 1
[ 725s] #define HAVE_BYTESWAP_H 1
[ 725s] #define TIME_WITH_SYS_TIME 1
[ 725s]
[ 725s] configure: exit 1
[ 725s] 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 --with-uhd --with-usrp1 --with-lms
--with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit
code 1
[ 725s] make[1]: *** [debian/rules:12: override_dh_auto_configure] Error 255
[ 725s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 725s] make: *** [debian/rules:6: build] Error 2
[ 725s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 725s]
[ 725s] lamb60 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 10:43:17 UTC
2019.
[ 725s]
[ 725s] ### VM INTERACTION START ###
[ 729s] [ 665.150030] sysrq: SysRq : Power Off
[ 729s] [ 665.159490] reboot: Power down
[ 729s] ### VM INTERACTION END ###
[ 729s]
[ 729s] lamb60 failed "build osmo-trx_1.1.0.dsc" at Thu Aug 8 10:43:21 UTC
2019.
[ 729s]
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
