Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Testing/x86_64
Package network:osmocom:nightly/osmo-gsm-manuals failed to build in
Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-gsm-manuals
Last lines of build log:
[ 224s] asciidoc: gsup.adoc: line 1459: evaluating: {counter2:target-number}
[ 224s] asciidoc: gsup.adoc: line 1459: evaluating:
{set2:target:test-usermanual__52.png}
[ 224s] asciidoc: gsup.adoc: line 1474: filtering: packetdiag -o
"/usr/src/packages/BUILD/tests/test-usermanual__52.png" -Tpng - && echo " "
[ 224s] asciidoc: gsup.adoc: line 1542: evaluating: {counter2:target-number}
[ 224s] asciidoc: gsup.adoc: line 1542: evaluating:
{set2:target:test-usermanual__53.png}
[ 224s] asciidoc: gsup.adoc: line 1551: filtering: "/usr/bin/python2"
"./build/filter-wrapper.py" mscgen -o
"/usr/src/packages/BUILD/tests/test-usermanual__53.png" -Tpng -
[ 224s] asciidoc: gsup.adoc: line 1574: evaluating: {counter2:target-number}
[ 224s] asciidoc: gsup.adoc: line 1574: evaluating:
{set2:target:test-usermanual__54.png}
[ 224s] asciidoc: gsup.adoc: line 1584: filtering: packetdiag -o
"/usr/src/packages/BUILD/tests/test-usermanual__54.png" -Tpng - && echo " "
[ 224s]
[ 224s] make[3]: *** [../build/Makefile.asciidoc.inc:69: test-usermanual.pdf]
Error 1
[ 224s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests'
[ 224s] make[2]: *** [Makefile:438: all-recursive] Error 1
[ 224s] make[2]: Leaving directory '/usr/src/packages/BUILD'
[ 224s] make[1]: *** [Makefile:362: all] Error 2
[ 224s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 224s] dh_auto_build: make -j1 returned exit code 2
[ 224s] make: *** [debian/rules:5: binary] Error 255
[ 224s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess
returned exit status 2
[ 224s]
[ 224s] sheep84 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Tue Aug 20
04:23:02 UTC 2019.
[ 224s]
[ 224s] ### VM INTERACTION START ###
[ 227s] [ 215.759507] sysrq: SysRq : Power Off
[ 227s] [ 215.766287] reboot: Power down
[ 227s] ### VM INTERACTION END ###
[ 227s]
[ 227s] sheep84 failed "build osmo-gsm-manuals-dev_0.2.0.dsc" at Tue Aug 20
04:23:06 UTC 2019.
[ 227s]
--
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: [ 493s] ar: `u' modifier ignored since `D' is the default (see `U') [ 493s] libtool: link: ranlib .libs/libtransceiver_common.a [ 493s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 493s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -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 -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 493s] libtool: link: g++ -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 -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 493s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 493s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 493s] collect2: error: ld returned 1 exit status [ 493s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 493s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 493s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 493s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 493s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 493s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 493s] make[1]: *** [Makefile:444: all] Error 2 [ 493s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 493s] dh_auto_build: make -j1 returned exit code 2 [ 493s] make: *** [debian/rules:6: build] Error 255 [ 493s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 493s] [ 493s] morla3 failed "build osmo-trx_1.1.1.dsc" at Tue Aug 20 03:59:55 UTC 2019. [ 493s] [ 493s] ### VM INTERACTION START ### [ 497s] [ 473.273141] sysrq: SysRq : Power Off [ 497s] [ 473.317674] reboot: Power down [ 497s] ### VM INTERACTION END ### [ 497s] [ 497s] morla3 failed "build osmo-trx_1.1.1.dsc" at Tue Aug 20 03:59:59 UTC 2019. [ 497s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 to look at the new patch set (#2). Change subject: fix crashes: don't assert on incoming RTP packet size .. fix crashes: don't assert on incoming RTP packet size Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL and keep running. Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 28 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/15242/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2 Gerrit-Change-Number: 15242 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 to look at the new patch set (#2). Change subject: mgcp_send(): stop looping on conversion error .. mgcp_send(): stop looping on conversion error If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert() or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop situation for erratic packets? (Didn't check for that in detail.) Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/15243/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c Gerrit-Change-Number: 15243 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-mgw[master]: mgcp_send(): stop looping on conversion error
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15243
Change subject: mgcp_send(): stop looping on conversion error
..
mgcp_send(): stop looping on conversion error
If mgcp_send() runs a transcoder loop, break the loop if rfc5993_hr_convert()
or amr_oa_bwe_convert() return with error. Possibly fixes an infinite loop
situation for erratic packets? (Didn't check for that in detail.)
Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/15243/1
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index d5f197d..190ccd4 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -871,13 +871,23 @@
addr, buf, buflen);
if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) {
- amr_oa_bwe_convert(endp, buf, &buflen,
-
conn_dst->end.codec->param.amr_octet_aligned);
+ rc = amr_oa_bwe_convert(endp, buf, &buflen,
+
conn_dst->end.codec->param.amr_octet_aligned);
+ if (rc < 0) {
+ LOGPENDP(endp, DRTP, LOGL_ERROR,
+"Error in AMR octet-aligned
<-> bandwidth-efficient mode conversion\n");
+ break;
+ }
}
else if (rtp_end->rfc5993_hr_convert
&& strcmp(conn_src->end.codec->subtype_name,
"GSM-HR-08") == 0)
- rfc5993_hr_convert(endp, buf, &buflen);
+ rc = rfc5993_hr_convert(endp, buf, &buflen);
+ if (rc < 0) {
+ LOGPENDP(endp, DRTP, LOGL_ERROR, "Error
while converting to GSM-HR-08\n");
+ break;
+ }
+ }
LOGPENDP(endp, DRTP, LOGL_DEBUG,
"process/send to %s %s "
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15243
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Iba115a0b1d74e7cefba5dcdd777e98ddea9eba8c
Gerrit-Change-Number: 15243
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: fix crashes: don't assert on incoming RTP packet size
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/15242
Change subject: fix crashes: don't assert on incoming RTP packet size
..
fix crashes: don't assert on incoming RTP packet size
Remove various OSMO_ASSERT() on size of incoming packets. Doing an assert on
incoming data is a DoS attack vector, absolute no-go. Instead, return -EINVAL
and keep running.
Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2
---
M src/libosmo-mgcp/mgcp_network.c
1 file changed, 31 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/15242/1
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c
index bb29d2b..d5f197d 100644
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -475,7 +475,12 @@
uint8_t pt_in;
int pt_out;
- OSMO_ASSERT(len >= sizeof(struct rtp_hdr));
+ if (msg->len < sizeof(struct rtp_hdr)) {
+ LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u <
%zu)\n",
+msg->len, sizeof(struct rtp_hdr));
+ return -EINVAL;
+ }
+
rtp_hdr = (struct rtp_hdr *)data;
pt_in = rtp_hdr->payload_type;
@@ -641,7 +646,7 @@
* the receiving end expects GSM-HR data to be formated after RFC 5993, this
* function is used to convert between RFC 5993 and TS 101318, which we
normally
* use. */
-static void rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int
*len)
+static int rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len)
{
/* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is
* plenty of space available to store the slightly larger, converted
@@ -649,7 +654,12 @@
struct rtp_hdr *rtp_hdr;
- OSMO_ASSERT(*len >= sizeof(struct rtp_hdr));
+ if (*len < sizeof(struct rtp_hdr)) {
+ LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d
< %zu)\n",
+*len, sizeof(struct rtp_hdr));
+ return -EINVAL;
+ }
+
rtp_hdr = (struct rtp_hdr *)data;
if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) {
@@ -667,7 +677,9 @@
* packet. This is not supported yet. */
LOGPENDP(endp, DRTP, LOGL_ERROR,
"cannot figure out how to convert RTP packet\n");
+ return -ENOTSUP;
}
+ return 0;
}
/* For AMR RTP two framing modes are defined RFC3267. There is a bandwith
@@ -685,7 +697,11 @@
unsigned int payload_len;
int rc;
- OSMO_ASSERT(*len >= sizeof(struct rtp_hdr));
+ if (*len < sizeof(struct rtp_hdr)) {
+ LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d
< %zu)\n", *len, sizeof(struct rtp_hdr));
+ return -EINVAL;
+ }
+
rtp_hdr = (struct rtp_hdr *)data;
payload_len = *len - sizeof(struct rtp_hdr);
@@ -736,17 +752,21 @@
/* Check if a given RTP with AMR payload for octet-aligned mode */
-static bool amr_oa_check(char *data, int len)
+static int amr_oa_check(char *data, int len)
{
struct rtp_hdr *rtp_hdr;
unsigned int payload_len;
- OSMO_ASSERT(len >= sizeof(struct rtp_hdr));
+ if (len < sizeof(struct rtp_hdr))
+ return -EINVAL;
+
rtp_hdr = (struct rtp_hdr *)data;
payload_len = len - sizeof(struct rtp_hdr);
+ if (payload_len < sizeof(struct amr_hdr))
+ return -EINVAL;
- return osmo_amr_is_oa(rtp_hdr->data, payload_len);
+ return osmo_amr_is_oa(rtp_hdr->data, payload_len) ? 1 : 0;
}
/* Forward data to a debug tap. This is debug function that is intended for
@@ -1340,7 +1360,10 @@
* define, then we check if the incoming payload matches that
* expectation. */
if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
- if (amr_oa_check(buf, len) !=
conn_src->end.codec->param.amr_octet_aligned)
+ int oa = amr_oa_check(buf, len);
+ if (oa < 0)
+ return -1;
+ if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned)
return -1;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15242
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I6bc6ee950ce07bcc2c585c30fad02b81153bdde2
Gerrit-Change-Number: 15242
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 .. BSC_Tests: update number-of-bts to 4 Fix failing TC_ctrl test for ttcn3-bsc-test and -latest. Depends: I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 327326d..2bc1c62 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1188,7 +1188,7 @@ f_ctrl_get_exp(IPA_CTRL, "mcc", "001"); f_ctrl_get_exp(IPA_CTRL, "mnc", "01"); - f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "3"); + f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "4"); var integer bts_nr := 0; f_ctrl_get_exp_bts(IPA_CTRL, bts_nr, "location-area-code", "1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:27:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:27:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 ) Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST .. build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST $target/$target_os is never used, so AC_CANONICAL_TARGET is useless. $host is, so employ AC_CANONICAL_HOST. Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 4c39681..c8bfae9 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([.]) AC_CONFIG_TESTDIR(tests) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ggsn[master]: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 ) Change subject: build: switch AC_CANONICAL_TARGET for AC_CANONICAL_HOST .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/15219 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I6dc505888b42cfb686043470d3a3548c24cbe1f7 Gerrit-Change-Number: 15219 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:26:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 ) Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 19 Aug 2019 21:26:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/15210 )
Change subject: osmo-trx: log to stderr on signal received
..
osmo-trx: log to stderr on signal received
Since osmo-trx it's a big multithreaded process and shutdown sequence
can be complex, better use stderr to log signal received events to make
sure log is outputted straigh away and not buffered. In general stdout
is usually line-buffered, but buffering strategy can be more
conservative if output is for instance redirected to a file.
Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c
---
M Transceiver52M/osmo-trx.cpp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index 15f744c..ab0b631 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -173,11 +173,11 @@
action like printing */
return;
- fprintf(stdout, "signal %d received\n", signo);
+ fprintf(stderr, "signal %d received\n", signo);
switch (signo) {
case SIGINT:
case SIGTERM:
- fprintf(stdout, "shutting down\n");
+ fprintf(stderr, "shutting down\n");
gshutdown = true;
break;
case SIGABRT:
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c
Gerrit-Change-Number: 15210
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: osmo-trx: log to stderr on signal received
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/15210 ) Change subject: osmo-trx: log to stderr on signal received .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I70ba86919d1f7df41ef3db4916317d27697a025c Gerrit-Change-Number: 15210 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:25:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 ) Change subject: vty: Introduce cs7-instance-iu .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 21:24:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: examples: Add osmo-sgsn_custom-sccp.cfg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 ) Change subject: examples: Add osmo-sgsn_custom-sccp.cfg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d Gerrit-Change-Number: 15238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 19 Aug 2019 21:24:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 514s] ar: `u' modifier ignored since `D' is the default (see `U') [ 514s] libtool: link: ranlib .libs/libtransceiver_common.a [ 514s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 514s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -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 -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 514s] libtool: link: g++ -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 -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 515s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 515s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 515s] collect2: error: ld returned 1 exit status [ 515s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 515s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 515s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 515s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 515s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 515s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 515s] make[1]: *** [Makefile:444: all] Error 2 [ 515s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 515s] dh_auto_build: make -j1 returned exit code 2 [ 515s] make: *** [debian/rules:6: build] Error 255 [ 515s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 515s] [ 515s] lamb24 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:28:13 UTC 2019. [ 515s] [ 515s] ### VM INTERACTION START ### [ 518s] [ 493.615186] sysrq: SysRq : Power Off [ 518s] [ 493.623043] reboot: Power down [ 518s] ### VM INTERACTION END ### [ 518s] [ 518s] lamb24 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:28:17 UTC 2019. [ 518s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/15218 ) Change subject: osmo_tdef_get(): allow passing -1 as default timeout .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c File src/tdef.c: https://gerrit.osmocom.org/#/c/15218/2/src/tdef.c@186 PS2, Line 186: osmo_tdef_get > Alternatively, you could add another function without that optional > parameter, so it would simply cr […] quite possible, but osmo-bsc already uses the API as it was intended, so I'd rather just fix it here... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417 Gerrit-Change-Number: 15218 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 20:09:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in ...libosmocore[master]: osmo_tdef_get(): allow passing -1 as default timeout
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/15218 )
Change subject: osmo_tdef_get(): allow passing -1 as default timeout
..
osmo_tdef_get(): allow passing -1 as default timeout
The intention of osmo_tdef_get()'s val_if_not_present argument was to return a
default timeout, or to optionally abort the program for missing timer
definitions if the default timeout is < 0. This was the case in the original
implementation of this API in osmo-bsc, but in the migration to libosmocore,
the argument was by accident changed to an unsigned type. In consequence, the
assertion in the implementation that was intended to abort the program seemed
bogus to coverity, and was fixed by removal in
I7a544d2d43b83135def296674f777e48fe5fd80a -- the wrong direction, as is obvious
from the API doc for osmo_tdef_get().
Note that osmo-bsc master passes -1 in various places and expects the
program-abort behavior that was missing from the libosmocore implementation.
Change the val_if_not_present argument to a signed type, and revert removal of
the assertion, so that passing -1 has the effect described in the API doc:
program abort on missing timer definition.
This bug was not detected because it is hard to write tests that expect a
program abort to happen, hence no tests for this API feature exist.
Related: OS#4152
Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417
---
M TODO-RELEASE
M include/osmocom/core/tdef.h
M src/tdef.c
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 8ccfa49..665ecf7 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+core osmo_tdef_get() change val_if_not_present arg from
unsigned long to long to allow passing -1
diff --git a/include/osmocom/core/tdef.h b/include/osmocom/core/tdef.h
index c8d9053..566f5dd 100644
--- a/include/osmocom/core/tdef.h
+++ b/include/osmocom/core/tdef.h
@@ -95,7 +95,7 @@
void osmo_tdefs_reset(struct osmo_tdef *tdefs);
unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum
osmo_tdef_unit as_unit,
- unsigned long val_if_not_present);
+ long val_if_not_present);
struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T);
/*! Using osmo_tdef for osmo_fsm_inst: array entry for a mapping of state
numbers to timeout definitions.
diff --git a/src/tdef.c b/src/tdef.c
index 3cfb17c..40a9900 100644
--- a/src/tdef.c
+++ b/src/tdef.c
@@ -183,10 +183,11 @@
* \param[in] val_if_not_present Fallback value to return if no timeout is
defined.
* \return Timeout value in the unit given by as_unit, rounded up if
necessary, or val_if_not_present.
*/
-unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum
osmo_tdef_unit as_unit, unsigned long val_if_not_present)
+unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum
osmo_tdef_unit as_unit, long val_if_not_present)
{
const struct osmo_tdef *t = osmo_tdef_get_entry((struct
osmo_tdef*)tdefs, T);
if (!t) {
+ OSMO_ASSERT(val_if_not_present >= 0);
return val_if_not_present;
}
return osmo_tdef_round(t->val, t->unit, as_unit);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15218
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie61c3c85069916336e6dbd91a2c16f7634816417
Gerrit-Change-Number: 15218
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmocore[master]: add vty logp command to echo on all log targets
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14986 ) Change subject: add vty logp command to echo on all log targets .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9 Gerrit-Change-Number: 14986 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 19 Aug 2019 20:09:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: add vty logp command to echo on all log targets
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/14986 )
Change subject: add vty logp command to echo on all log targets
..
add vty logp command to echo on all log targets
When reading SUT logs resulting from TTCN3 runs, it can be hard to figure out
which log section corresponds to which test code. Add a 'logp' command on VIEW
and ENABLE nodes that simply echos an arbitrary message on log output, useful
to set markers / explanations from the TTCN3 code, which then appear in all log
outputs and can make it trivial to figure out which log section is interesting.
logging_vty_test# logp lglobal notice This is the log message
DLGLOBAL NOTICE This is the log message
>From TTCN3, could be used like this, e.g. in BSC_Tests.ttcn:
private function f_logp(charstring log_msg) runs on MSC_ConnHdlr
{
// log on TTCN3 log output
log(log_msg);
// log in stderr log
f_vty_transceive(BSCVTY, "logp lglobal notice " & log_msg);
}
...
f_logp("f_probe_for_handover(" & log_label & "): Ending the test:
Handover Failure stops the procedure.");
Change-Id: Ife5dc8999174c74e0d133729284fe526d6eaf8d9
---
M src/vty/logging_vty.c
M tests/logging/logging_vty_test.vty
2 files changed, 94 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
neels: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index b785be4..243d6eb 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -991,6 +991,44 @@
install_element(CFG_LOG_NODE, cmd);
}
+/* logp () (debug|...|fatal) .LOGMESSAGE*/
+DEFUN(vty_logp,
+ vty_logp_cmd,
+ NULL, /* cmdstr is dynamically set in gen_vty_logp_cmd_strs(). */
+ NULL) /* same thing for helpstr. */
+{
+ int category = log_parse_category(argv[0]);
+ int level = log_parse_level(argv[1]);
+ char *str = argv_concat(argv, argc, 2);
+ LOGP(category, level, "%s\n", str);
+ return CMD_SUCCESS;
+}
+
+static void gen_vty_logp_cmd_strs(struct cmd_element *cmd)
+{
+ char *cmd_str = NULL;
+ char *doc_str = NULL;
+
+ assert_loginfo(__func__);
+
+ OSMO_ASSERT(cmd->string == NULL);
+ OSMO_ASSERT(cmd->doc == NULL);
+
+ osmo_talloc_asprintf(tall_log_ctx, cmd_str, "logp (");
+ osmo_talloc_asprintf(tall_log_ctx, doc_str,
+"Print a message on all log outputs; useful for
placing markers in test logs\n");
+ add_category_strings(&cmd_str, &doc_str, osmo_log_info);
+ osmo_talloc_asprintf(tall_log_ctx, cmd_str, ") %s", LOG_LEVEL_ARGS);
+ osmo_talloc_asprintf(tall_log_ctx, doc_str, "%s", LOG_LEVEL_STRS);
+
+ osmo_talloc_asprintf(tall_log_ctx, cmd_str, " .LOGMESSAGE");
+ osmo_talloc_asprintf(tall_log_ctx, doc_str,
+"Arbitrary message to log on given category and
log level\n");
+
+ cmd->string = cmd_str;
+ cmd->doc = doc_str;
+}
+
/*! Register logging related commands to the VTY. Call this once from
* your application if you want to support those commands. */
void logging_vty_add_cmds()
@@ -1026,6 +1064,9 @@
install_element_ve(&show_logging_vty_cmd);
install_element_ve(&show_alarms_cmd);
+ gen_vty_logp_cmd_strs(&vty_logp_cmd);
+ install_element_ve(&vty_logp_cmd);
+
install_node(&cfg_log_node, config_write_log);
install_element(CFG_LOG_NODE, &logging_fltr_all_cmd);
install_element(CFG_LOG_NODE, &logging_use_clr_cmd);
diff --git a/tests/logging/logging_vty_test.vty
b/tests/logging/logging_vty_test.vty
index 895d2bc..d77f8ce 100644
--- a/tests/logging/logging_vty_test.vty
+++ b/tests/logging/logging_vty_test.vty
@@ -468,3 +468,56 @@
D ERROR Log message for D on level LOGL_ERROR
D FATAL Log message for D on level LOGL_FATAL
DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# list
+...
+ logp
(aa|bb|ccc||eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro)
(debug|info|notice|error|fatal) .LOGMESSAGE
+...
+
+logging_vty_test# logp?
+ logp Print a message on all log outputs; useful for placing markers in test
logs
+
+logging_vty_test# logp ?
+ aa Antropomorphic Armadillos (AA)
+ bb Bidirectional Breadspread (BB)
+ ccc Chaos Communication Congress (CCC)
+ Dehydrated Dribbling Duck Dunkers ()
+ eee Exhaustive Entropy Extraction (EEE)
+ lglobal Library-internal global log family
+ llapdLAPD in libosmogsm
+ linp A-bis Intput Subsystem
+ lmux A-bis B-Subchannel TRAU Frame Multiplex
+ lmi A-bis Input Driver for Signalling
+ lmi
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: [ 439s] ar: `u' modifier ignored since `D' is the default (see `U') [ 439s] libtool: link: ranlib .libs/libtransceiver_common.a [ 439s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 439s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -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 -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 439s] libtool: link: g++ -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 -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 439s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 439s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 439s] collect2: error: ld returned 1 exit status [ 439s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 439s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 439s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 439s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 439s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 439s] make[1]: *** [Makefile:444: all] Error 2 [ 439s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 439s] dh_auto_build: make -j1 returned exit code 2 [ 439s] make: *** [debian/rules:6: build] Error 255 [ 439s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 439s] [ 439s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:00:41 UTC 2019. [ 439s] [ 439s] ### VM INTERACTION START ### [ 443s] [ 422.767149] sysrq: SysRq : Power Off [ 443s] [ 422.771795] reboot: Power down [ 443s] ### VM INTERACTION END ### [ 443s] [ 443s] lamb27 failed "build osmo-trx_1.1.1.dsc" at Mon Aug 19 20:00:45 UTC 2019. [ 443s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-sgsn[master]: gprs_gmm.c: Fix typo in log message
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 ) Change subject: gprs_gmm.c: Fix typo in log message .. gprs_gmm.c: Fix typo in log message Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a --- M src/gprs/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c index e1bed0d..95a1842 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/gprs/gprs_gmm.c @@ -2122,7 +2122,7 @@ case GSM48_MT_GMM_PTMSI_REALL_COMPL: if (!mmctx) goto null_mmctx; - LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLLICATION COMPLETE\n"); + LOGMMCTXP(LOGL_INFO, mmctx, "-> PTMSI REALLOCATION COMPLETE\n"); mmctx_timer_stop(mmctx, 3350); mmctx->t3350_mode = GMM_T3350_MODE_NONE; mmctx->p_tmsi_old = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15189 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I357f0af89f5d14d304c3e889a49a5f6c23b7fb7a Gerrit-Change-Number: 15189 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...docker-playground[master]: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15241 Change subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux .. ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux Last releases of osmo-bsc and osmo-bsc already support Osmux, so we can drop those lines as indicated. Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de --- M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-msc-test/jenkins.sh 3 files changed, 0 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/41/15241/1 diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ed8ffc3..0a2ff8b 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -14,9 +14,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 453fcf0..af5c965 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -12,10 +12,6 @@ mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ -# osmux must be disabled until release AFTER osmo-bsc 1.4.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index ca2936a..a0a5f87 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,10 +14,6 @@ mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ -# osmux must be disabled until release AFTER osmo-msc 1.3.1 is tagged -if [ "$IMAGE_SUFFIX" = "latest" ]; then - sed "s/MSC_Tests.mp_enable_osmux_test := true;/MSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/msc-tester/MSC_Tests.cfg -fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de Gerrit-Change-Number: 15241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override)
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 ) Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) .. Fix ttcn3-sgsn-latest (cs7 instance override) Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 621ad2e..462c5b2 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,6 +16,12 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from +# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines +# below can be dropped: +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg +fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 ) Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 17:19:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 to look at the new patch set (#2). Change subject: vty: Introduce cs7-instance-iu .. vty: Introduce cs7-instance-iu Similar to what we already have in osmo-msc. Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 --- M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg M doc/manuals/vty/sgsn_vty_reference.xml M include/osmocom/sgsn/sgsn.h M src/gprs/sgsn_main.c M src/gprs/sgsn_vty.c 5 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/15239/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 Gerrit-Change-Number: 15239 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...docker-playground[master]: Fix ttcn3-sgsn-latest (cs7 instance override)
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15240 Change subject: Fix ttcn3-sgsn-latest (cs7 instance override) .. Fix ttcn3-sgsn-latest (cs7 instance override) Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 --- M ttcn3-sgsn-test/jenkins.sh 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/15240/1 diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 621ad2e..462c5b2 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -16,6 +16,12 @@ mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ +# Latest release of osmo-sgsn (1.5.0) uses harcoded default ss7 id 1 from +# libosmo-sccp (1.1.0). when new osmo-sgsn release is available, these lines +# below can be dropped: +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/cs7 instance 0/cs7 instance 1/g" -i $VOL_BASE_DIR/sgsn/osmo-sgsn.cfg +fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie45fa7875b409c3955c26d333110c36453c276f9 Gerrit-Change-Number: 15240 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: vty: Introduce cs7-instance-iu
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15239
Change subject: vty: Introduce cs7-instance-iu
..
vty: Introduce cs7-instance-iu
Similar to what we already have in osmo-msc.
Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904
---
M doc/manuals/vty/sgsn_vty_reference.xml
M include/osmocom/sgsn/sgsn.h
M src/gprs/sgsn_main.c
M src/gprs/sgsn_vty.c
4 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/15239/1
diff --git a/doc/manuals/vty/sgsn_vty_reference.xml
b/doc/manuals/vty/sgsn_vty_reference.xml
index c3f91cf..38e21c2 100644
--- a/doc/manuals/vty/sgsn_vty_reference.xml
+++ b/doc/manuals/vty/sgsn_vty_reference.xml
@@ -2502,6 +2502,12 @@
+
+
+
+
+
+
diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h
index 0a6ea29..f940a1c 100644
--- a/include/osmocom/sgsn/sgsn.h
+++ b/include/osmocom/sgsn/sgsn.h
@@ -124,6 +124,7 @@
#if BUILD_IU
struct {
enum ranap_nsap_addr_enc rab_assign_addr_enc;
+ uint32_t cs7_instance;
} iu;
#endif
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index 5979886..4232e23 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -500,7 +500,9 @@
#if BUILD_IU
/* Note that these are mostly defaults and can be overriden from the
VTY */
- sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN",
+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx,
+sgsn->cfg.iu.cs7_instance,
+"OsmoSGSN",
(23 << 3) + 4,
OSMO_SS7_ASP_PROT_M3UA,
0, NULL,
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index d1d53e6..13bc432 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -295,6 +295,8 @@
vty_out(vty, " no compression v42bis%s", VTY_NEWLINE);
#ifdef BUILD_IU
+ vty_out(vty, " cs7-instance-iu %u%s", g_cfg->iu.cs7_instance,
+ VTY_NEWLINE);
ranap_iu_vty_config_write(vty, " ");
#endif
@@ -1384,6 +1386,21 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_sgsn_cs7_instance_iu,
+ cfg_sgsn_cs7_instance_iu_cmd,
+ "cs7-instance-iu <0-15>",
+ "Set SS7 to be used by the Iu-Interface.\n" "SS7 instance reference
number (default: 0)\n")
+{
+#if BUILD_IU
+ g_cfg->iu.cs7_instance = atoi(argv[0]);
+ return CMD_SUCCESS;
+#else
+ vty_out(vty, "WARNING: 'cs7-instance-iu' without effect: built without
Iu support%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+#endif
+}
+
int sgsn_vty_init(struct sgsn_config *cfg)
{
g_cfg = cfg;
@@ -1454,6 +1471,7 @@
install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd);
#ifdef BUILD_IU
+ install_element(SGSN_NODE, &cfg_sgsn_cs7_instance_iu_cmd);
ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc);
#endif
return 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15239
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904
Gerrit-Change-Number: 15239
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: examples: Add osmo-sgsn_custom-sccp.cfg
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 Change subject: examples: Add osmo-sgsn_custom-sccp.cfg .. examples: Add osmo-sgsn_custom-sccp.cfg Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d --- A doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/38/15238/1 diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg new file mode 100644 index 000..a18d76a --- /dev/null +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -0,0 +1,38 @@ +! +! Osmocom SGSN configuration +! +! +line vty + no login +! +cs7 instance 0 + point-code 0.23.4 + asp asp-clnt-OsmoSGSN-A 2905 0 m3ua + remote-ip 172.18.8.200 ! where to reach the STP + as as-clnt-OsmoSGSN-A m3ua + asp asp-clnt-OsmoSGSN-A + routing-key 3 0.23.4 +sgsn + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 + ggsn 0 gtp-version 1 + ggsn 0 echo-interval 60 + authentication required + auth-policy remote + gsup remote-ip 127.0.0.1 + gsup remote-port 4222 +! +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + encapsulation udp local-ip 127.0.0.1 + encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 0 +! +bssgp +! -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id3a3ccbf168fbbc28153cbf7f0249294eee34d3d Gerrit-Change-Number: 15238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests .. ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests Previous commit was merged without dependent tests from osmo-ttcn3-hacks being yet present. Let's disable them until they are present. Fixes: ca2ef842522a9ac7c840dc3725cc2d8f8a5cd527 Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index f7d6d9a..55ea817 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -39,4 +39,4 @@ [EXECUTE] SGSN_Tests.control -SGSN_Tests_Iu.control +#SGSN_Tests_Iu.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:23:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 ) Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:10:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 )
Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
..
sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
Implementation of osmo_sccp_simple_client() API internally uses ss7 id
1, which is confusing since there's no 0 in use in osmo-sgsn. Let's
explicitly use the 0 one so it is configured by "cs7 instance 0" in the
VTY.
Related: OS#4157
Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe
---
M src/gprs/sgsn_main.c
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index ecfb79b..5979886 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -500,11 +500,11 @@
#if BUILD_IU
/* Note that these are mostly defaults and can be overriden from the
VTY */
- sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN",
- (23 << 3) + 4,
- OSMO_SS7_ASP_PROT_M3UA,
- 0, NULL,
- 0, "127.0.0.1");
+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN",
+(23 << 3) + 4,
+OSMO_SS7_ASP_PROT_M3UA,
+0, NULL,
+0, "127.0.0.1");
if (!sccp) {
printf("Setting up SCCP client failed.\n");
return 8;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe
Gerrit-Change-Number: 15236
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 ) Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 .. Patch Set 1: Merging now since it fixes TTCN3 sgsn tests failing (no reset ack answered). Feel free to revert if it's not the correct fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:10:11 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 ) Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe Gerrit-Change-Number: 15236 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 16:09:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15237 Change subject: ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests .. ttcn3-sgsn: Disable not-yet available SGSN_Tests_Iu tests Previous commit was merged without dependent tests from osmo-ttcn3-hacks being yet present. Let's disable them until they are present. Fixes: ca2ef842522a9ac7c840dc3725cc2d8f8a5cd527 Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/15237/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index f7d6d9a..55ea817 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -39,4 +39,4 @@ [EXECUTE] SGSN_Tests.control -SGSN_Tests_Iu.control +#SGSN_Tests_Iu.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Icd7a3885bac7f8189272981d4fdac3f269e6adef Gerrit-Change-Number: 15237 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/15236
Change subject: sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
..
sgsn: use sccp_simple_client API to setup ss7 id 0 instead of 1
Implementation of osmo_sccp_simple_client() API internally uses ss7 id
1, which is confusing since there's no 0 in use in osmo-sgsn. Let's
explicitly use the 0 one so it is configured by "cs7 instance 0" in the
VTY.
Related: OS#4157
Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe
---
M src/gprs/sgsn_main.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/36/15236/1
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index ecfb79b..5979886 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -500,11 +500,11 @@
#if BUILD_IU
/* Note that these are mostly defaults and can be overriden from the
VTY */
- sccp = osmo_sccp_simple_client(tall_sgsn_ctx, "OsmoSGSN",
- (23 << 3) + 4,
- OSMO_SS7_ASP_PROT_M3UA,
- 0, NULL,
- 0, "127.0.0.1");
+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN",
+(23 << 3) + 4,
+OSMO_SS7_ASP_PROT_M3UA,
+0, NULL,
+0, "127.0.0.1");
if (!sccp) {
printf("Setting up SCCP client failed.\n");
return 8;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15236
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I0e23a6a76ebcba0b1b424e3d3b20d06c1da44cbe
Gerrit-Change-Number: 15236
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 15:09:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/docker-playground/+/15155 )
Change subject: ttcn3-sgsn-master: add support for Iu
..
ttcn3-sgsn-master: add support for Iu
To support Iu tests, start osmo-stp when testing.
Depends-on: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 (osmo-ttcn3-hacks)
Change-Id: I4d6aef98832202652c5fe254105728430ba77119
---
M ttcn3-sgsn-test/SGSN_Tests.cfg
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sgsn-test/osmo-sgsn.cfg
A ttcn3-sgsn-test/osmo-stp.cfg
4 files changed, 74 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
lynxis lazus: Verified
diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg
index 5ad5f7d..f7d6d9a 100644
--- a/ttcn3-sgsn-test/SGSN_Tests.cfg
+++ b/ttcn3-sgsn-test/SGSN_Tests.cfg
@@ -26,6 +26,11 @@
remote_ip := "172.18.8.10"
}
}
+SGSN_Tests.mp_ranap_cfg := {
+ {
+ sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" }
+ }
+}
SGSN_Tests.mp_hlr_ip := "172.18.8.103"
SGSN_Tests.mp_ggsn_ip := "172.18.8.103"
@@ -34,3 +39,4 @@
[EXECUTE]
SGSN_Tests.control
+SGSN_Tests_Iu.control
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 9505624..621ad2e 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -4,6 +4,7 @@
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
docker_images_require \
"debian-stretch-build" \
+ "osmo-stp-$IMAGE_SUFFIX" \
"osmo-sgsn-$IMAGE_SUFFIX" \
"debian-stretch-titan" \
"ttcn3-sgsn-test"
@@ -16,8 +17,18 @@
mkdir $VOL_BASE_DIR/sgsn
cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/
+mkdir $VOL_BASE_DIR/stp
+cp osmo-stp.cfg $VOL_BASE_DIR/stp/
+
mkdir $VOL_BASE_DIR/unix
+echo Starting container with STP
+docker run --rm \
+ --network $NET_NAME --ip 172.18.8.200 \
+ -v $VOL_BASE_DIR/stp:/data \
+ --name ${BUILD_TAG}-stp -d \
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
+
echo Starting container with SGSN
docker run --rm \
--network $NET_NAME --ip 172.18.8.10 \
@@ -45,6 +56,7 @@
echo Stopping containers
docker container kill ${BUILD_TAG}-sgsn
+docker container kill ${BUILD_TAG}-stp
network_remove
collect_logs
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 38b9945..0ca1a1d 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -52,6 +52,13 @@
ctrl
bind 0.0.0.0
!
+cs7 instance 0
+ point-code 0.23.4
+ asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
+ remote-ip 172.18.8.200
+ as as-clnt-OsmoSGSN-A m3ua
+ asp asp-clnt-OsmoSGSN-A
+ routing-key 3 0.23.4
ns
timer tns-block 3
timer tns-block-retries 3
diff --git a/ttcn3-sgsn-test/osmo-stp.cfg b/ttcn3-sgsn-test/osmo-stp.cfg
new file mode 100644
index 000..1871358
--- /dev/null
+++ b/ttcn3-sgsn-test/osmo-stp.cfg
@@ -0,0 +1,49 @@
+!
+! OsmoSTP (0.8.1) configuration saved from vty
+!!
+!
+log gsmtap 172.18.1.103
+ logging level set-all debug
+!
+log file /data/osmo-stp.log
+ logging filter all 1
+ logging color 0
+ logging print category 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging level all everything
+ logging level lglobal notice
+ logging level llapd notice
+ logging level linp notice
+ logging level lmux notice
+ logging level lmi notice
+ logging level lmib notice
+ logging level lsms notice
+ logging level lctrl notice
+ logging level lgtp notice
+ logging level lstats notice
+ logging level lgsup notice
+ logging level loap notice
+ logging level lss7 debug
+ logging level lsccp debug
+ logging level lsua debug
+ logging level lm3ua debug
+ logging level lmgcp notice
+!
+line vty
+ no login
+!
+cs7 instance 0
+ xua rkm routing-key-allocation dynamic-permitted
+ asp virt-rnc0-0 23908 2905 m3ua
+ local-ip 172.18.8.200
+ remote-ip 172.18.8.103
+ as virt-rnc0 m3ua
+ asp virt-rnc0-0
+ routing-key 2 0.24.3
+ route-table system
+ update route 0.24.3 7.255.7 linkset virt-rnc0
+ listen m3ua 2905
+ accept-asp-connections dynamic-permitted
+ listen ipa 5000
+ accept-asp-connections dynamic-permitted
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119
Gerrit-Change-Number: 15155
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...docker-playground[master]: ttcn3-sgsn-master: add support for Iu
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15155 ) Change subject: ttcn3-sgsn-master: add support for Iu .. Patch Set 2: Code-Review+2 Merging as without it all SGSN tests fail. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4d6aef98832202652c5fe254105728430ba77119 Gerrit-Change-Number: 15155 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 14:52:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 ) Change subject: BSC_Tests: update number-of-bts to 4 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 12:56:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 ) Change subject: sccplite/osmo-bsc.cfg: add bts 3 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 19 Aug 2019 12:56:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BSC_Tests: update number-of-bts to 4
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 Change subject: BSC_Tests: update number-of-bts to 4 .. BSC_Tests: update number-of-bts to 4 Fix failing TC_ctrl test for ttcn3-bsc-test and -latest. Depends: I00547dccf8908d46df4730cb513fe577956d7683 (docker-playground) Related: OS#4156 Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/15234/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 327326d..2bc1c62 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1188,7 +1188,7 @@ f_ctrl_get_exp(IPA_CTRL, "mcc", "001"); f_ctrl_get_exp(IPA_CTRL, "mnc", "01"); - f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "3"); + f_ctrl_get_exp(IPA_CTRL, "number-of-bts", "4"); var integer bts_nr := 0; f_ctrl_get_exp_bts(IPA_CTRL, bts_nr, "location-area-code", "1"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba Gerrit-Change-Number: 15234 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in ...docker-playground[master]: sccplite/osmo-bsc.cfg: add bts 3
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/15235 Change subject: sccplite/osmo-bsc.cfg: add bts 3 .. sccplite/osmo-bsc.cfg: add bts 3 Have the same amount of bts like in the regular (non-sccplite) osmo-bsc.cfg, so we can make BSC_Tests.TC_ctrl pass for regular and sccplite again. Related: I1c57a04747f5ec004ccf4657954dcb0b003c24fc Related: Ie2c664ba0f845da644e20e2c919c12d8fc2af6ba (osmo-ttcn3-hacks) Related: OS#4156 Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/35/15235/1 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index f7d640c..1cbd0c8 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -352,6 +352,35 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 + bts 3 + type sysmobts + band DCS1800 + cell_identity 3 + location_area_code 3 + # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config) + base_station_id_code 12 + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 +phys_chan_config CCCH+SDCCH4 + timeslot 1 +phys_chan_config TCH/F + timeslot 2 +phys_chan_config TCH/F + timeslot 3 +phys_chan_config TCH/F + timeslot 4 +phys_chan_config TCH/F + timeslot 5 +phys_chan_config TCH/H + timeslot 6 +phys_chan_config PDCH + timeslot 7 +phys_chan_config PDCH msc 0 ip.access rtp-base 4000 no bsc-welcome-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/15235 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I00547dccf8908d46df4730cb513fe577956d7683 Gerrit-Change-Number: 15235 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: invert check for RAN_ops == omit
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 ) Change subject: RAN_Adapter: invert check for RAN_ops == omit .. Patch Set 2: Unfortunately this patch broke the bsc tests. Reverted: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I639ab6d0586174c0f20b93a53169f0aa254970fa Gerrit-Change-Number: 15157 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: osmith Gerrit-Comment-Date: Mon, 19 Aug 2019 11:51:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit"
osmith has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 )
Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit"
..
Revert "RAN_Adapter: invert check for RAN_ops == omit"
This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused
a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest,
ttcn3-bsc-test-sccplite and ttcn3-bsc-test-sccplite-latest testsuites to
fail with:
RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an
unbound optional value.
Related: OS#4156
Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826
---
M library/RAN_Adapter.ttcnpp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 8e19241..e995e8d 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -90,7 +90,7 @@
/* create components */
ba.vc_SCCP := SCCP_CT.create(id & "-SCCP");
- if (not istemplatekind(ops, "omit")) {
+ if (isvalue(ops)) {
ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN");
}
select (cfg.transport) {
@@ -142,7 +142,7 @@
}
}
- if (not istemplatekind(ops, "omit")) {
+ if (isvalue(ops)) {
timer T := 5.0;
T.start;
//T.timeout;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826
Gerrit-Change-Number: 15233
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit"
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 ) Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" .. Patch Set 2: Code-Review+2 Tested locally, that it fixes the tests that were failing for this reason. Giving this a +2 myself, because it is a revert of something that is clearly broken. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 19 Aug 2019 11:50:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit"
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 to look at the new patch set (#2). Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit" .. Revert "RAN_Adapter: invert check for RAN_ops == omit" This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest, ttcn3-bsc-test-sccplite and ttcn3-bsc-test-sccplite-latest testsuites to fail with: RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an unbound optional value. Related: OS#4156 Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 --- M library/RAN_Adapter.ttcnpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/15233/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826 Gerrit-Change-Number: 15233 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: Revert "RAN_Adapter: invert check for RAN_ops == omit"
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233
Change subject: Revert "RAN_Adapter: invert check for RAN_ops == omit"
..
Revert "RAN_Adapter: invert check for RAN_ops == omit"
This reverts commit 5932cd3463d04c45404c538daff6d25bc3f3d002. It caused
a lot of tests in the ttcn3-bsc-test, ttcn3-bsc-test-latest and
ttcn3-bsc-test-sccplite-latest testsuites to fail with:
RAN_Adapter.ttcnpp:179 Dynamic test case error: Text encoder: Encoding an
unbound optional value.
Related: OS#4156
Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826
---
M library/RAN_Adapter.ttcnpp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/33/15233/1
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 8e19241..e995e8d 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -90,7 +90,7 @@
/* create components */
ba.vc_SCCP := SCCP_CT.create(id & "-SCCP");
- if (not istemplatekind(ops, "omit")) {
+ if (isvalue(ops)) {
ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN");
}
select (cfg.transport) {
@@ -142,7 +142,7 @@
}
}
- if (not istemplatekind(ops, "omit")) {
+ if (isvalue(ops)) {
timer T := 5.0;
T.start;
//T.timeout;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15233
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I441c701553eef8e9e018d11923359eb3f3b26826
Gerrit-Change-Number: 15233
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared
dexter has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-msc/+/15222 ) Change subject: msc_a: switch RAN type back to SGs when a CSFB-Call is cleared .. msc_a: switch RAN type back to SGs when a CSFB-Call is cleared When a CSFB call is over the MS changes back to LTE after the call is cleared. However, at the moment the MSC does not change the cs.attached_via_ran flag. This may cause problems with the next call. Lets make sure that if there is an SGs association present, the ran type is set back to SGs when the call is cleared. Related: SYS#4624 Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 --- M src/libmsc/msc_a.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bd69eed..553761f 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -754,6 +754,11 @@ }; msc_a_get(msc_a, MSC_A_USE_WAIT_CLEAR_COMPLETE); msc_a_ran_down(msc_a, MSC_ROLE_I, &msg); + + /* The connection is cleared. The MS will now go back to 4G, + Switch the RAN type back to SGS. */ + if (vsub && vsub->sgs_fsm->state == SGS_UE_ST_ASSOCIATED) + vsub->cs.attached_via_ran = OSMO_RAT_EUTRAN_SGS; } if (vsub) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/15222 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I104adecb0645b81b90ee230c57bf8b463c9e7045 Gerrit-Change-Number: 15222 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
