Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 364s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 364s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 364s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 364s] make[4]: Nothing to be done for 'install-exec-am'. [ 364s] make[4]: Nothing to be done for 'install-data-am'. [ 364s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 364s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 364s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 364s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 364s]dh_install [ 364s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 364s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 364s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 364s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 364s] dh_install: missing files, aborting [ 364s] debian/rules:45: recipe for target 'binary' failed [ 364s] make: *** [binary] Error 2 [ 364s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 364s] [ 364s] armbuild15 failed "build osmo-bsc_1.1.2.20180318.dsc" at Mon Mar 19 00:47:09 UTC 2018. [ 364s] [ 364s] ### VM INTERACTION START ### [ 367s] [ 328.940659] sysrq: SysRq : Power Off [ 367s] [ 328.942813] reboot: Power down [ 367s] qemu-system-arm: Failed to unlink socket /var/cache/obs/worker/root_3/root.monitor: Permission denied [ 367s] ### VM INTERACTION END ### [ 367s] [ 367s] armbuild15 failed "build osmo-bsc_1.1.2.20180318.dsc" at Mon Mar 19 00:47:12 UTC 2018. [ 367s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[PATCH] osmo-bsc[master]: Provide ipaccess-config and bs11_config again
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7381 to look at the new patch set (#2). Provide ipaccess-config and bs11_config again In 3561bd48976d both binaries were disabled. Enable the compilation. To reduce dependencies down to one function call, move bsc_subscr_conn_fsm.c out of libbsc. Fixes: 3561bd48976d ("introduce an osmo_fsm for gsm_subscriber_connection") Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e --- M src/ipaccess/Makefile.am M src/ipaccess/ipaccess-config.c M src/libbsc/Makefile.am M src/osmo-bsc/Makefile.am R src/osmo-bsc/bsc_subscr_conn_fsm.c M src/utils/Makefile.am M src/utils/bs11_config.c M tests/handover/Makefile.am 8 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/7381/2 diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 9b2a83e..a6195b9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -24,6 +24,7 @@ bin_PROGRAMS = \ abisip-find \ + ipaccess-config \ ipaccess-proxy \ $(NULL) diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 7b9bd02..3d96c11 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -875,6 +875,10 @@ extern void bts_model_nanobts_init(); +struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { + OSMO_ASSERT(0); +} + static const struct log_info_cat log_categories[] = { [DNM] = { .name = "DNM", diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 8956363..a708eae 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -63,6 +63,5 @@ handover_cfg.c \ penalty_timers.c \ handover_decision_2.c \ - bsc_subscr_conn_fsm.c \ $(NULL) diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index cc96743..b67061c 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -36,6 +36,7 @@ osmo_bsc_bssap.c \ osmo_bsc_audio.c \ osmo_bsc_ctrl.c \ + bsc_subscr_conn_fsm.c \ $(NULL) osmo_bsc_LDADD = \ diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c similarity index 100% rename from src/libbsc/bsc_subscr_conn_fsm.c rename to src/osmo-bsc/bsc_subscr_conn_fsm.c diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 0c681a5..983a3bb 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -22,6 +22,7 @@ $(NULL) bin_PROGRAMS = \ + bs11_config \ isdnsync \ meas_json \ $(NULL) diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index bc0f488..9c08c20 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -902,6 +902,10 @@ extern void *tall_fle_ctx; +struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { + OSMO_ASSERT(0); +} + int main(int argc, char **argv) { struct gsm_network *gsmnet; diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 957bbee..644e46b 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -27,6 +27,7 @@ handover_test_SOURCES = \ handover_test.c \ + $(top_srcdir)/src/osmo-bsc/bsc_subscr_conn_fsm.c $(NULL) handover_test_LDFLAGS =\ -- To view, visit https://gerrit.osmocom.org/7381 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e Gerrit-PatchSet: 2 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: lynxis lazusGerrit-Reviewer: Jenkins Builder
[PATCH] osmo-bsc[master]: Provide ipaccess-config and bs11_config again
Review at https://gerrit.osmocom.org/7381 Provide ipaccess-config and bs11_config again In 3561bd48976d both binaries were disabled. Enable the compilation. To reduce dependencies down to one function call, move bsc_subscr_conn_fsm.c out of libbsc. Fixes: 3561bd48976d ("introduce an osmo_fsm for gsm_subscriber_connection") Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e --- M src/ipaccess/Makefile.am M src/ipaccess/ipaccess-config.c M src/libbsc/Makefile.am M src/osmo-bsc/Makefile.am R src/osmo-bsc/bsc_subscr_conn_fsm.c M src/utils/Makefile.am M src/utils/bs11_config.c 7 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/7381/1 diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am index 9b2a83e..a6195b9 100644 --- a/src/ipaccess/Makefile.am +++ b/src/ipaccess/Makefile.am @@ -24,6 +24,7 @@ bin_PROGRAMS = \ abisip-find \ + ipaccess-config \ ipaccess-proxy \ $(NULL) diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 7b9bd02..3d96c11 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -875,6 +875,10 @@ extern void bts_model_nanobts_init(); +struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { + OSMO_ASSERT(0); +} + static const struct log_info_cat log_categories[] = { [DNM] = { .name = "DNM", diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am index 8956363..a708eae 100644 --- a/src/libbsc/Makefile.am +++ b/src/libbsc/Makefile.am @@ -63,6 +63,5 @@ handover_cfg.c \ penalty_timers.c \ handover_decision_2.c \ - bsc_subscr_conn_fsm.c \ $(NULL) diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index cc96743..b67061c 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -36,6 +36,7 @@ osmo_bsc_bssap.c \ osmo_bsc_audio.c \ osmo_bsc_ctrl.c \ + bsc_subscr_conn_fsm.c \ $(NULL) osmo_bsc_LDADD = \ diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c similarity index 100% rename from src/libbsc/bsc_subscr_conn_fsm.c rename to src/osmo-bsc/bsc_subscr_conn_fsm.c diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 0c681a5..983a3bb 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -22,6 +22,7 @@ $(NULL) bin_PROGRAMS = \ + bs11_config \ isdnsync \ meas_json \ $(NULL) diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index bc0f488..9c08c20 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -902,6 +902,10 @@ extern void *tall_fle_ctx; +struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { + OSMO_ASSERT(0); +} + int main(int argc, char **argv) { struct gsm_network *gsmnet; -- To view, visit https://gerrit.osmocom.org/7381 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e Gerrit-PatchSet: 1 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: lynxis lazus
[MERGED] osmo-ttcn3-hacks[master]: msc: wait for clear-command/complete/sccp-release
Harald Welte has submitted this change and it was merged. Change subject: msc: wait for clear-command/complete/sccp-release .. msc: wait for clear-command/complete/sccp-release Not all tests were waiting/expecting the complete connection shutdown, which results in the possibility for CLEAR CMD to arrive during shutdown of the TITAN components and cause related errors. Change-Id: I3a6c2e1f78b58f86ef84d4e323f432016a9afa7e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 38 insertions(+), 51 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 561cf19..4ba84f8 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -705,35 +705,33 @@ setverdict(pass); } /* expect a clear command */ +altstep as_clear_cmd_compl_disc(float t := 5.0) runs on BSC_ConnHdlr { + [] BSSAP.receive(tr_BSSMAP_ClearCommand) { + BSSAP.send(ts_BSSMAP_ClearComplete); + alt { + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unexpected BSSMAP while waiting for SCCP Release"); + self.stop; + } + } + } + [] BSSAP.receive { + setverdict(fail, "Unexpected BSSMAP while waiting for ClearCommand"); + self.stop; + } +} + function f_expect_clear(float t := 5.0) runs on BSC_ConnHdlr { timer T := t; T.start; alt { - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { } - [] BSSAP.receive { - setverdict(fail, "Unexpected BSSMAP while waiting for ClearCommand"); - self.stop; - } + [] as_clear_cmd_compl_disc(t) { } [] T.timeout { - setverdict(fail, "Timeout waiting for ClearCommand"); - self.stop; - } - } - - BSSAP.send(ts_BSSMAP_ClearComplete); - - T.start; - alt { - [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { - setverdict(pass); - } - [] BSSAP.receive { - setverdict(fail, "Unexpected BSSMAP while waiting for SCCP Release"); - self.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for SCCP Release"); + setverdict(fail, "Timeout waiting for ClearCommand/Release"); self.stop; } } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 156bdd9..698b341 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -457,7 +457,9 @@ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 23)); alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(int2oct(23,1 { } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(int2oct(23,1 { + f_expect_clear(); + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) { setverdict(fail, "Expecting LU REJ, but got ACCEPT"); self.stop; @@ -484,7 +486,9 @@ /* Normally the HLR would need to respond here, but we decide to force a timeout here */ alt { /* FIXME: Expect specific reject cause */ - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + f_expect_clear(); + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) { setverdict(fail, "Expecting LU REJ, but got ACCEPT"); self.stop; @@ -1042,12 +1046,9 @@ alt { [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} /* Expect LU REJECT with Cause == Illegal MS */ - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { - BSSAP.send(ts_BSSMAP_ClearComplete); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); - } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } + [] as_clear_cmd_compl_disc(); [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; @@ -1079,13 +1080,9 @@ alt { /* Immediate disconnect */ [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} - /* Expect LU REJECT with Cause == Illegal MS */ - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { -
osmo-msc[master]: a_iface: If L3/DTAP returns error in COMPL L3, close SCCP co...
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7374 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iec693d8012a7816d1ded8206c2d979ac0546fb6e Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: msc: wait for clear-command/complete/sccp-release
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7380 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3a6c2e1f78b58f86ef84d4e323f432016a9afa7e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-msc[master]: a_iface: If L3/DTAP returns error in COMPL L3, close SCCP co...
Harald Welte has submitted this change and it was merged. Change subject: a_iface: If L3/DTAP returns error in COMPL L3, close SCCP connection .. a_iface: If L3/DTAP returns error in COMPL L3, close SCCP connection It's pretty amazing that we print error messages anrd return error codes, but nobody ever looks at the error code and/or closes the connection. Let's change that. Change-Id: Iec693d8012a7816d1ded8206c2d979ac0546fb6e --- M src/libmsc/a_iface.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index fa8c5c3..2b1baf0 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -535,9 +535,19 @@ LOGP(DBSSAP, LOGL_DEBUG, "N-CONNECT.ind(%u, %s)\n", scu_prim->u.connect.conn_id, msgb_hexdump_l2(oph->msg)); rc = a_sccp_rx_dt(scu, _conn_info, oph->msg); - } else + } else { LOGP(DBSSAP, LOGL_DEBUG, "N-CONNECT.ind(%u)\n", scu_prim->u.connect.conn_id); - record_bsc_con(scu, a_conn_info.bsc, scu_prim->u.connect.conn_id); + rc = -ENODATA; + } + + if (rc < 0) { + /* initial message (COMPL L3) caused some error, we didn't allocate +* a subscriber_conn and must close the connection again */ + rc = osmo_sccp_tx_disconn(scu, a_conn_info.conn_id, + _conn_info.bsc->msc_addr, + SCCP_RETURN_CAUSE_UNQUALIFIED); + } else + record_bsc_con(scu, a_conn_info.bsc, scu_prim->u.connect.conn_id); } break; -- To view, visit https://gerrit.osmocom.org/7374 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec693d8012a7816d1ded8206c2d979ac0546fb6e Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: msc: wait for clear-command/complete/sccp-release
Review at https://gerrit.osmocom.org/7380 msc: wait for clear-command/complete/sccp-release Not all tests were waiting/expecting the complete connection shutdown, which results in the possibility for CLEAR CMD to arrive during shutdown of the TITAN components and cause related errors. Change-Id: I3a6c2e1f78b58f86ef84d4e323f432016a9afa7e --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 38 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/7380/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 561cf19..4ba84f8 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -705,35 +705,33 @@ setverdict(pass); } /* expect a clear command */ +altstep as_clear_cmd_compl_disc(float t := 5.0) runs on BSC_ConnHdlr { + [] BSSAP.receive(tr_BSSMAP_ClearCommand) { + BSSAP.send(ts_BSSMAP_ClearComplete); + alt { + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + setverdict(pass); + } + [] BSSAP.receive { + setverdict(fail, "Unexpected BSSMAP while waiting for SCCP Release"); + self.stop; + } + } + } + [] BSSAP.receive { + setverdict(fail, "Unexpected BSSMAP while waiting for ClearCommand"); + self.stop; + } +} + function f_expect_clear(float t := 5.0) runs on BSC_ConnHdlr { timer T := t; T.start; alt { - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { } - [] BSSAP.receive { - setverdict(fail, "Unexpected BSSMAP while waiting for ClearCommand"); - self.stop; - } + [] as_clear_cmd_compl_disc(t) { } [] T.timeout { - setverdict(fail, "Timeout waiting for ClearCommand"); - self.stop; - } - } - - BSSAP.send(ts_BSSMAP_ClearComplete); - - T.start; - alt { - [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { - setverdict(pass); - } - [] BSSAP.receive { - setverdict(fail, "Unexpected BSSMAP while waiting for SCCP Release"); - self.stop; - } - [] T.timeout { - setverdict(fail, "Timeout waiting for SCCP Release"); + setverdict(fail, "Timeout waiting for ClearCommand/Release"); self.stop; } } diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 156bdd9..698b341 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -457,7 +457,9 @@ GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)); GSUP.send(ts_GSUP_UL_ERR(g_pars.imsi, 23)); alt { - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(int2oct(23,1 { } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej(int2oct(23,1 { + f_expect_clear(); + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) { setverdict(fail, "Expecting LU REJ, but got ACCEPT"); self.stop; @@ -484,7 +486,9 @@ /* Normally the HLR would need to respond here, but we decide to force a timeout here */ alt { /* FIXME: Expect specific reject cause */ - [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { } + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) { + f_expect_clear(); + } [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Acc)) { setverdict(fail, "Expecting LU REJ, but got ACCEPT"); self.stop; @@ -1042,12 +1046,9 @@ alt { [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} /* Expect LU REJECT with Cause == Illegal MS */ - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { - BSSAP.send(ts_BSSMAP_ClearComplete); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); - } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } + [] as_clear_cmd_compl_disc(); [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; @@ -1079,13 +1080,9 @@ alt { /* Immediate disconnect */ [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} - /* Expect LU REJECT with Cause == Illegal MS */ - [] BSSAP.receive(tr_BSSMAP_ClearCommand) { - BSSAP.send(ts_BSSMAP_ClearComplete); - BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); - } []
[MERGED] osmo-ttcn3-hacks[master]: fix regression in start-testsuite.sh (false shellcheck advice)
Harald Welte has submitted this change and it was merged. Change subject: fix regression in start-testsuite.sh (false shellcheck advice) .. fix regression in start-testsuite.sh (false shellcheck advice) Change-Id: If05d13c0dedfedf517005e5418acc677ddc5e75f --- M start-testsuite.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 61bf771..8affdba 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -19,4 +19,4 @@ TEST=$3 fi -LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start "$SUITE" "$CFG" "$TEST" +LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start $SUITE $CFG $TEST -- To view, visit https://gerrit.osmocom.org/7379 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If05d13c0dedfedf517005e5418acc677ddc5e75f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-ttcn3-hacks[master]: msc: Fix TC_cl3_{no,rnd}_payload
Harald Welte has submitted this change and it was merged. Change subject: msc: Fix TC_cl3_{no,rnd}_payload .. msc: Fix TC_cl3_{no,rnd}_payload It may very well be that the MSC is first accepting the SCCP connection and possibly sending a L3 (error) message before clearing/closing the SCCP connection in case of errors in the COMPL L3 info. Change-Id: I4cf08608413e9e1fb54848849baed79204f5dcd1 --- M msc/MSC_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 10f772e..156bdd9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1046,6 +1046,8 @@ BSSAP.send(ts_BSSMAP_ClearComplete); BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); } + [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; @@ -1083,6 +1085,7 @@ BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; -- To view, visit https://gerrit.osmocom.org/7377 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cf08608413e9e1fb54848849baed79204f5dcd1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: msc: Fix TC_cl3_{no,rnd}_payload
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7377 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4cf08608413e9e1fb54848849baed79204f5dcd1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: fix regression in start-testsuite.sh (false shellcheck advice)
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7379 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If05d13c0dedfedf517005e5418acc677ddc5e75f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Less logging verbosity
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7378 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I32d13b6f97f76ab6057cc213c1698c1eb97b9d90 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-ttcn3-hacks[master]: fix regression in start-testsuite.sh (false shellcheck advice)
Review at https://gerrit.osmocom.org/7379 fix regression in start-testsuite.sh (false shellcheck advice) Change-Id: If05d13c0dedfedf517005e5418acc677ddc5e75f --- M start-testsuite.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/7379/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 61bf771..8affdba 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -19,4 +19,4 @@ TEST=$3 fi -LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start "$SUITE" "$CFG" "$TEST" +LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start $SUITE $CFG $TEST -- To view, visit https://gerrit.osmocom.org/7379 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If05d13c0dedfedf517005e5418acc677ddc5e75f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[MERGED] osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Less logging verbosity
Harald Welte has submitted this change and it was merged. Change subject: Osmocom_VTY_Functions: Less logging verbosity .. Osmocom_VTY_Functions: Less logging verbosity We don't need to print all prompts at start of every test case Change-Id: I32d13b6f97f76ab6057cc213c1698c1eb97b9d90 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index a375df6..ccea0f2 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -39,7 +39,6 @@ * in the config file due to syntactic restrictions (Who invents config * files that don't permit regular expressions? */ for (var integer i := 0; i < sizeof(vty_prompt); i:= i + 1) { - log(vty_prompt[i]); pt.send(vty_prompt[i]); } } -- To view, visit https://gerrit.osmocom.org/7378 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32d13b6f97f76ab6057cc213c1698c1eb97b9d90 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: a_iface_bssap: Treat inbound RESET as implicit RESET ACK
Harald Welte has submitted this change and it was merged. Change subject: a_iface_bssap: Treat inbound RESET as implicit RESET ACK .. a_iface_bssap: Treat inbound RESET as implicit RESET ACK If both sides are sending RESET at the same time, they are not aware of each other. This leads to synchronization problems in wich the remote side is transmitting e.g. a COMPL L3 INFO after receiving a RESET ACK, but before even receiving or processing the RESET in the inverse direction. So let's treat receiving a RESET as an implicit RESET ACK to any RESET we may have sent. Change-Id: I0ae34fbb3735592bb7cffa5aaf421b14a8acc90e --- M src/libmsc/a_iface_bssap.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index f131eca..2be9afa 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -121,6 +121,10 @@ if (!a_conn_info->bsc->reset) a_start_reset(a_conn_info->bsc, true); + + /* Treat an incoming RESET like an ACK to any RESET request we may have just sent. +* After all, what we wanted is the A interface to be reset, which we now know has happened. */ + a_reset_ack_confirm(a_conn_info->bsc->reset); } /* Endpoint to handle BSSMAP reset acknowlegement */ -- To view, visit https://gerrit.osmocom.org/7375 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ae34fbb3735592bb7cffa5aaf421b14a8acc90e Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-msc[master]: BSSAP: Return error code if COMPL L3 with no or too short L3...
Harald Welte has submitted this change and it was merged. Change subject: BSSAP: Return error code if COMPL L3 with no or too short L3 payload .. BSSAP: Return error code if COMPL L3 with no or too short L3 payload Change-Id: Ie3bf1351ed11a9eb261737c2da0361e632e7b6e5 --- M src/libmsc/a_iface_bssap.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 7e9eae8..f131eca 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -337,6 +337,12 @@ msg->l3h = (uint8_t*)TLVP_VAL(tp, GSM0808_IE_LAYER_3_INFORMATION); msgb_l3trim(msg, TLVP_LEN(tp, GSM0808_IE_LAYER_3_INFORMATION)); + if (msgb_l3len(msg) < sizeof(struct gsm48_hdr)) { + LOGP(DBSSAP, LOGL_ERROR, "COMPL_L3 with too short L3 (%d) -- discarding\n", +msgb_l3len(msg)); + return -ENODATA; + } + /* Create new subscriber context */ conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); -- To view, visit https://gerrit.osmocom.org/7373 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3bf1351ed11a9eb261737c2da0361e632e7b6e5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: msc: Fix TC_cl3_{no,rnd}_payload
Review at https://gerrit.osmocom.org/7377 msc: Fix TC_cl3_{no,rnd}_payload It may very well be that the MSC is first accepting the SCCP connection and possibly sending a L3 (error) message before clearing/closing the SCCP connection in case of errors in the COMPL L3 info. Change-Id: I4cf08608413e9e1fb54848849baed79204f5dcd1 --- M msc/MSC_Tests.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/7377/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 10f772e..156bdd9 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -1046,6 +1046,8 @@ BSSAP.send(ts_BSSMAP_ClearComplete); BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); } + [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; @@ -1083,6 +1085,7 @@ BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND); } [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } + [] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); self.stop; -- To view, visit https://gerrit.osmocom.org/7377 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cf08608413e9e1fb54848849baed79204f5dcd1 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-msc[master]: a_iface_bssap: Treat inbound RESET as implicit RESET ACK
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7375 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0ae34fbb3735592bb7cffa5aaf421b14a8acc90e Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-msc[master]: BSSAP: Return error code if COMPL L3 with no or too short L3...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7373 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3bf1351ed11a9eb261737c2da0361e632e7b6e5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-ttcn3-hacks[master]: Osmocom_VTY_Functions: Less logging verbosity
Review at https://gerrit.osmocom.org/7378 Osmocom_VTY_Functions: Less logging verbosity We don't need to print all prompts at start of every test case Change-Id: I32d13b6f97f76ab6057cc213c1698c1eb97b9d90 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/7378/1 diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn index a375df6..ccea0f2 100644 --- a/library/Osmocom_VTY_Functions.ttcn +++ b/library/Osmocom_VTY_Functions.ttcn @@ -39,7 +39,6 @@ * in the config file due to syntactic restrictions (Who invents config * files that don't permit regular expressions? */ for (var integer i := 0; i < sizeof(vty_prompt); i:= i + 1) { - log(vty_prompt[i]); pt.send(vty_prompt[i]); } } -- To view, visit https://gerrit.osmocom.org/7378 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32d13b6f97f76ab6057cc213c1698c1eb97b9d90 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-ttcn3-hacks[master]: BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_i...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7372 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5666911d67388347d04724635cf6f56e164a82f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_i...
Harald Welte has submitted this change and it was merged. Change subject: BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_is_rr() .. BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_is_rr() Change-Id: I5666911d67388347d04724635cf6f56e164a82f8 --- M library/BSSMAP_Emulation.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn index 5f8fe4f..2d9effc 100644 --- a/library/BSSMAP_Emulation.ttcn +++ b/library/BSSMAP_Emulation.ttcn @@ -464,6 +464,9 @@ return false; } var octetstring l3v := valueof(l3); + if (lengthof(l3v) < 1) { + return false; + } /* lower 4 bits of first octet are protocol discriminator */ if ((oct2bit(l3v[0]) and4b ''B) == '0110'B) { return true; -- To view, visit https://gerrit.osmocom.org/7372 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5666911d67388347d04724635cf6f56e164a82f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-msc[master]: gsm_04_08: Ensure we close the SCCP connection on errors
Review at https://gerrit.osmocom.org/7376 gsm_04_08: Ensure we close the SCCP connection on errors If we don't yet have a connection FSM (most likely processing the first L3 message), we must make sure to close the SCCP connection in case there's any error in processing the L3 message. Change-Id: I6b295cea301427de7a2cd1769a3604c545ca7d68 --- M src/libmsc/gsm_04_08.c 1 file changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/76/7376/1 diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 437cb59..e44b8da 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -3448,12 +3448,6 @@ gh = msgb_l3(msg); pdisc = gsm48_hdr_pdisc(gh); - if (gsm0407_is_duplicate(conn, msg)) { - LOGP(DRLL, LOGL_NOTICE, "%s: Discarding duplicate L3 message\n", - (conn && conn->vsub) ? vlr_subscr_name(conn->vsub) : "UNKNOWN"); - return 0; - } - LOGP(DRLL, LOGL_DEBUG, "Dispatching 04.08 message %s (0x%x:0x%x)\n", gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh)), pdisc, gsm48_hdr_msg_type(gh)); @@ -3464,7 +3458,8 @@ "subscr %s: Message not permitted for initial conn: %s\n", vlr_subscr_name(conn->vsub), gsm48_pdisc_msgtype_name(pdisc, gsm48_hdr_msg_type(gh))); - return -EACCES; + msc_subscr_conn_close(conn, 0); + return 0; } if (conn->vsub && conn->vsub->cs.attached_via_ran != conn->via_ran) { @@ -3474,7 +3469,14 @@ vlr_subscr_name(conn->vsub), ran_type_name(conn->vsub->cs.attached_via_ran), ran_type_name(conn->via_ran)); - return -EACCES; + msc_subscr_conn_close(conn, 0); + return 0; + } + + if (gsm0407_is_duplicate(conn, msg)) { + LOGP(DRLL, LOGL_NOTICE, "%s: Discarding duplicate L3 message\n", + (conn && conn->vsub) ? vlr_subscr_name(conn->vsub) : "UNKNOWN"); + return 0; } #if 0 -- To view, visit https://gerrit.osmocom.org/7376 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b295cea301427de7a2cd1769a3604c545ca7d68 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-msc[master]: a_iface: If L3/DTAP returns error in COMPL L3, close SCCP co...
Review at https://gerrit.osmocom.org/7374 a_iface: If L3/DTAP returns error in COMPL L3, close SCCP connection It's pretty amazing that we print error messages anrd return error codes, but nobody ever looks at the error code and/or closes the connection. Let's change that. Change-Id: Iec693d8012a7816d1ded8206c2d979ac0546fb6e --- M src/libmsc/a_iface.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/74/7374/1 diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index fa8c5c3..2b1baf0 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -535,9 +535,19 @@ LOGP(DBSSAP, LOGL_DEBUG, "N-CONNECT.ind(%u, %s)\n", scu_prim->u.connect.conn_id, msgb_hexdump_l2(oph->msg)); rc = a_sccp_rx_dt(scu, _conn_info, oph->msg); - } else + } else { LOGP(DBSSAP, LOGL_DEBUG, "N-CONNECT.ind(%u)\n", scu_prim->u.connect.conn_id); - record_bsc_con(scu, a_conn_info.bsc, scu_prim->u.connect.conn_id); + rc = -ENODATA; + } + + if (rc < 0) { + /* initial message (COMPL L3) caused some error, we didn't allocate +* a subscriber_conn and must close the connection again */ + rc = osmo_sccp_tx_disconn(scu, a_conn_info.conn_id, + _conn_info.bsc->msc_addr, + SCCP_RETURN_CAUSE_UNQUALIFIED); + } else + record_bsc_con(scu, a_conn_info.bsc, scu_prim->u.connect.conn_id); } break; -- To view, visit https://gerrit.osmocom.org/7374 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec693d8012a7816d1ded8206c2d979ac0546fb6e Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-msc[master]: a_iface_bssap: Treat inbound RESET as implicit RESET ACK
Review at https://gerrit.osmocom.org/7375 a_iface_bssap: Treat inbound RESET as implicit RESET ACK If both sides are sending RESET at the same time, they are not aware of each other. This leads to synchronization problems in wich the remote side is transmitting e.g. a COMPL L3 INFO after receiving a RESET ACK, but before even receiving or processing the RESET in the inverse direction. So let's treat receiving a RESET as an implicit RESET ACK to any RESET we may have sent. Change-Id: I0ae34fbb3735592bb7cffa5aaf421b14a8acc90e --- M src/libmsc/a_iface_bssap.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/75/7375/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index f131eca..2be9afa 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -121,6 +121,10 @@ if (!a_conn_info->bsc->reset) a_start_reset(a_conn_info->bsc, true); + + /* Treat an incoming RESET like an ACK to any RESET request we may have just sent. +* After all, what we wanted is the A interface to be reset, which we now know has happened. */ + a_reset_ack_confirm(a_conn_info->bsc->reset); } /* Endpoint to handle BSSMAP reset acknowlegement */ -- To view, visit https://gerrit.osmocom.org/7375 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ae34fbb3735592bb7cffa5aaf421b14a8acc90e Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-msc[master]: BSSAP: Return error code if COMPL L3 with no or too short L3...
Review at https://gerrit.osmocom.org/7373 BSSAP: Return error code if COMPL L3 with no or too short L3 payload Change-Id: Ie3bf1351ed11a9eb261737c2da0361e632e7b6e5 --- M src/libmsc/a_iface_bssap.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/7373/1 diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 7e9eae8..f131eca 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -337,6 +337,12 @@ msg->l3h = (uint8_t*)TLVP_VAL(tp, GSM0808_IE_LAYER_3_INFORMATION); msgb_l3trim(msg, TLVP_LEN(tp, GSM0808_IE_LAYER_3_INFORMATION)); + if (msgb_l3len(msg) < sizeof(struct gsm48_hdr)) { + LOGP(DBSSAP, LOGL_ERROR, "COMPL_L3 with too short L3 (%d) -- discarding\n", +msgb_l3len(msg)); + return -ENODATA; + } + /* Create new subscriber context */ conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, a_conn_info->conn_id); -- To view, visit https://gerrit.osmocom.org/7373 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3bf1351ed11a9eb261737c2da0361e632e7b6e5 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_i...
Review at https://gerrit.osmocom.org/7372 BSSMAP_Emulation: handle zero-length L3 Info in f_bssap_l3_is_rr() Change-Id: I5666911d67388347d04724635cf6f56e164a82f8 --- M library/BSSMAP_Emulation.ttcn 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/7372/1 diff --git a/library/BSSMAP_Emulation.ttcn b/library/BSSMAP_Emulation.ttcn index 5f8fe4f..2d9effc 100644 --- a/library/BSSMAP_Emulation.ttcn +++ b/library/BSSMAP_Emulation.ttcn @@ -464,6 +464,9 @@ return false; } var octetstring l3v := valueof(l3); + if (lengthof(l3v) < 1) { + return false; + } /* lower 4 bits of first octet are protocol discriminator */ if ((oct2bit(l3v[0]) and4b ''B) == '0110'B) { return true; -- To view, visit https://gerrit.osmocom.org/7372 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5666911d67388347d04724635cf6f56e164a82f8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/aarch64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 378s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 378s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 378s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 378s] make[4]: Nothing to be done for 'install-exec-am'. [ 378s] make[4]: Nothing to be done for 'install-data-am'. [ 378s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 378s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 378s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 378s]dh_install [ 378s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 378s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 378s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 378s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 378s] dh_install: missing files, aborting [ 378s] debian/rules:45: recipe for target 'binary' failed [ 378s] make: *** [binary] Error 2 [ 378s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 378s] [ 378s] obs-arm-4 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:24:19 UTC 2018. [ 378s] [ 378s] ### VM INTERACTION START ### [ 381s] [ 349.510107] sysrq: SysRq : Power Off [ 381s] [ 349.513491] reboot: Power down [ 381s] qemu-system-aarch64: Failed to unlink socket /var/cache/obs/worker/root_9/root.monitor: Permission denied [ 381s] ### VM INTERACTION END ### [ 381s] [ 381s] obs-arm-4 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:24:22 UTC 2018. [ 381s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 203s] make[5]: Nothing to be done for 'install-data-am'. [ 203s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 203s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 203s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 203s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 203s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 203s] make[4]: Nothing to be done for 'install-exec-am'. [ 203s] make[4]: Nothing to be done for 'install-data-am'. [ 203s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 203s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 203s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 203s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 203s]dh_install [ 203s] cp: cannot stat 'debian/tmp/usr/bin/ipaccess-config': No such file or directory [ 203s] dh_install: cp -a debian/tmp/usr/bin/ipaccess-config debian/osmo-bsc-ipaccess-utils//usr/bin/ returned exit code 1 [ 203s] debian/rules:45: recipe for target 'binary' failed [ 203s] make: *** [binary] Error 2 [ 203s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 203s] [ 203s] cloud108 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:10:07 UTC 2018. [ 203s] [ 203s] ### VM INTERACTION START ### [ 204s] Powering off. [ 204s] [ 188.940060] reboot: Power down [ 206s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_3/root.monitor: Permission denied [ 206s] ### VM INTERACTION END ### [ 206s] [ 206s] cloud108 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:10:10 UTC 2018. [ 206s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.10/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 113s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 113s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 113s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 113s] make[4]: Nothing to be done for 'install-exec-am'. [ 113s] make[4]: Nothing to be done for 'install-data-am'. [ 113s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 113s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 113s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 113s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 113s]dh_install [ 113s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 113s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 113s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 113s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 113s] dh_install: missing files, aborting [ 113s] debian/rules:45: recipe for target 'binary' failed [ 113s] make: *** [binary] Error 2 [ 113s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 113s] [ 113s] lamb69 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:05:59 UTC 2018. [ 113s] [ 113s] ### VM INTERACTION START ### [ 116s] [ 107.545775] reboot: Power down [ 116s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_8/root.monitor: Permission denied [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] lamb69 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:06:02 UTC 2018. [ 116s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 140s] make[5]: Nothing to be done for 'install-data-am'. [ 140s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 140s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 140s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 140s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 140s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 140s] make[4]: Nothing to be done for 'install-exec-am'. [ 140s] make[4]: Nothing to be done for 'install-data-am'. [ 140s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 140s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 140s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 140s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 140s]dh_install [ 140s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 140s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 140s] dh_install: missing files, aborting [ 140s] debian/rules:45: recipe for target 'binary' failed [ 140s] make: *** [binary] Error 2 [ 140s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 140s] [ 140s] lamb16 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:04:10 UTC 2018. [ 140s] [ 140s] ### VM INTERACTION START ### [ 143s] [ 136.099967] reboot: Power down [ 143s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_3/root.monitor: Permission denied [ 143s] ### VM INTERACTION END ### [ 143s] [ 143s] lamb16 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:04:13 UTC 2018. [ 143s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 126s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 126s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 126s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 126s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 126s] make[4]: Nothing to be done for 'install-exec-am'. [ 126s] make[4]: Nothing to be done for 'install-data-am'. [ 126s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 126s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 126s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 126s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 126s]dh_install [ 126s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 126s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 126s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 126s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 126s] dh_install: missing files, aborting [ 126s] debian/rules:45: recipe for target 'binary' failed [ 126s] make: *** [binary] Error 2 [ 126s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 126s] [ 126s] lamb05 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:04:12 UTC 2018. [ 126s] [ 126s] ### VM INTERACTION START ### [ 129s] [ 121.810158] reboot: Power down [ 129s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_1/root.monitor: Permission denied [ 129s] ### VM INTERACTION END ### [ 129s] [ 129s] lamb05 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:04:16 UTC 2018. [ 129s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 128s] make[5]: Nothing to be done for 'install-data-am'. [ 128s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 128s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 128s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 128s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 128s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 128s] make[4]: Nothing to be done for 'install-exec-am'. [ 128s] make[4]: Nothing to be done for 'install-data-am'. [ 128s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 128s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 128s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 128s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 128s]dh_install [ 129s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 129s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 129s] dh_install: missing files, aborting [ 129s] debian/rules:45: recipe for target 'binary' failed [ 129s] make: *** [binary] Error 2 [ 129s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 129s] [ 129s] lamb69 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:33 UTC 2018. [ 129s] [ 129s] ### VM INTERACTION START ### [ 132s] [ 124.444549] reboot: Power down [ 132s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_2/root.monitor: Permission denied [ 132s] ### VM INTERACTION END ### [ 132s] [ 132s] lamb69 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:36 UTC 2018. [ 132s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_9.0/i586 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 136s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 136s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 136s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 136s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 136s] make[4]: Nothing to be done for 'install-exec-am'. [ 136s] make[4]: Nothing to be done for 'install-data-am'. [ 136s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 136s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 136s]dh_install [ 136s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 136s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 136s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 136s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 136s] dh_install: missing files, aborting [ 136s] debian/rules:45: recipe for target 'binary' failed [ 136s] make: *** [binary] Error 2 [ 136s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 136s] [ 136s] lamb54 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:19 UTC 2018. [ 136s] [ 136s] ### VM INTERACTION START ### [ 140s] [ 131.643994] reboot: Power down [ 140s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_8/root.monitor: Permission denied [ 140s] ### VM INTERACTION END ### [ 140s] [ 140s] lamb54 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:23 UTC 2018. [ 140s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_8.0/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 153s] make[5]: Nothing to be done for 'install-data-am'. [ 153s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests' [ 153s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 153s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 153s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 153s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 153s] make[4]: Nothing to be done for 'install-exec-am'. [ 153s] make[4]: Nothing to be done for 'install-data-am'. [ 153s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 153s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 153s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 153s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 153s]dh_install [ 153s] cp: cannot stat 'debian/tmp/usr/bin/ipaccess-config': No such file or directory [ 153s] dh_install: cp -a debian/tmp/usr/bin/ipaccess-config debian/osmo-bsc-ipaccess-utils//usr/bin/ returned exit code 1 [ 153s] debian/rules:45: recipe for target 'binary' failed [ 153s] make: *** [binary] Error 2 [ 153s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 153s] [ 153s] build33 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:23 UTC 2018. [ 153s] [ 153s] ### VM INTERACTION START ### [ 154s] Powering off. [ 154s] [ 142.950229] reboot: Power down [ 155s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_2/root.monitor: Permission denied [ 155s] ### VM INTERACTION END ### [ 155s] [ 155s] build33 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:03:25 UTC 2018. [ 155s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_17.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 112s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 112s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 112s] make[4]: Nothing to be done for 'install-exec-am'. [ 112s] make[4]: Nothing to be done for 'install-data-am'. [ 112s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 112s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 112s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s]dh_install [ 112s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in ., debian/tmp) [ 112s] [ 112s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 112s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in ., debian/tmp) [ 112s] [ 112s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 112s] dh_install: missing files, aborting [ 112s] debian/rules:45: recipe for target 'binary' failed [ 112s] make: *** [binary] Error 25 [ 112s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 112s] [ 112s] lamb16 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:21 UTC 2018. [ 112s] [ 112s] ### VM INTERACTION START ### [ 116s] [ 107.447039] reboot: Power down [ 116s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_8/root.monitor: Permission denied [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] lamb16 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:24 UTC 2018. [ 116s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_17.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_17.04/i586 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 125s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 125s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 125s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 125s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 125s] make[4]: Nothing to be done for 'install-exec-am'. [ 125s] make[4]: Nothing to be done for 'install-data-am'. [ 125s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 125s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 125s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 125s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 125s]dh_install [ 125s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 125s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 125s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 125s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 125s] dh_install: missing files, aborting [ 125s] debian/rules:45: recipe for target 'binary' failed [ 125s] make: *** [binary] Error 2 [ 125s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 125s] [ 125s] lamb60 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:15 UTC 2018. [ 125s] [ 125s] ### VM INTERACTION START ### [ 128s] [ 120.203528] reboot: Power down [ 128s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_1/root.monitor: Permission denied [ 128s] ### VM INTERACTION END ### [ 128s] [ 128s] lamb60 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:18 UTC 2018. [ 128s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_16.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_16.10/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_16.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 117s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 117s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 117s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 117s] make[4]: Nothing to be done for 'install-exec-am'. [ 117s] make[4]: Nothing to be done for 'install-data-am'. [ 117s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 117s]dh_install [ 117s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 117s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 117s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 117s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 117s] dh_install: missing files, aborting [ 117s] debian/rules:45: recipe for target 'binary' failed [ 117s] make: *** [binary] Error 2 [ 117s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 117s] [ 117s] lamb52 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:28 UTC 2018. [ 117s] [ 117s] ### VM INTERACTION START ### [ 120s] [ 111.788385] reboot: Power down [ 120s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_4/root.monitor: Permission denied [ 120s] ### VM INTERACTION END ### [ 120s] [ 120s] lamb52 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:02:31 UTC 2018. [ 120s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bsc in xUbuntu_17.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/xUbuntu_17.04/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in xUbuntu_17.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 71s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 71s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 71s] make[3]: Entering directory '/usr/src/packages/BUILD' [ 71s] make[4]: Entering directory '/usr/src/packages/BUILD' [ 71s] make[4]: Nothing to be done for 'install-exec-am'. [ 71s] make[4]: Nothing to be done for 'install-data-am'. [ 71s] make[4]: Leaving directory '/usr/src/packages/BUILD' [ 71s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 71s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 71s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 71s]dh_install [ 71s] dh_install: Cannot find (any matches for) "usr/bin/ipaccess-config" (tried in "." and "debian/tmp") [ 71s] dh_install: osmo-bsc-ipaccess-utils missing files: usr/bin/ipaccess-config [ 71s] dh_install: Cannot find (any matches for) "usr/bin/bs11_config" (tried in "." and "debian/tmp") [ 71s] dh_install: osmo-bsc-bs11-utils missing files: usr/bin/bs11_config [ 71s] dh_install: missing files, aborting [ 71s] debian/rules:45: recipe for target 'binary' failed [ 71s] make: *** [binary] Error 2 [ 71s] dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2 [ 71s] [ 71s] build70 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:01:31 UTC 2018. [ 71s] [ 71s] ### VM INTERACTION START ### [ 74s] [ 68.623586] reboot: Power down [ 74s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_1/root.monitor: Permission denied [ 74s] ### VM INTERACTION END ### [ 74s] [ 74s] build70 failed "build osmo-bsc_1.1.2.20180318.dsc" at Sun Mar 18 20:01:34 UTC 2018. [ 74s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[MERGED] osmo-bsc[master]: contrib: jenkins.sh: Add --enable-werror flag
Pau Espin Pedrol has submitted this change and it was merged. Change subject: contrib: jenkins.sh: Add --enable-werror flag .. contrib: jenkins.sh: Add --enable-werror flag Change-Id: Ife9ca2a5b835dfd6d03c981dcf0e48265eb861eb --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5b57532..0be4fe0 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -40,12 +40,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests +./configure --enable-sanitize --enable-external-tests --enable-werror $MAKE $PARALLEL_MAKE LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || cat-testlogs.sh LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror" \ $MAKE distcheck \ || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/7329 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife9ca2a5b835dfd6d03c981dcf0e48265eb861eb Gerrit-PatchSet: 6 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
[MERGED] osmo-bsc[master]: pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference
Pau Espin Pedrol has submitted this change and it was merged. Change subject: pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference .. pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference Fixes following warning: pcu_sock.c: In function 'pcu_rx_data_req': pcu_sock.c:406:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing] tlli = *((uint32_t *)data_req->data); ^ Change-Id: I5c93487c72d15b061e73ed4f9acbf2e77dec967a --- M src/libbsc/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libbsc/pcu_sock.c b/src/libbsc/pcu_sock.c index caec40d..64422c7 100644 --- a/src/libbsc/pcu_sock.c +++ b/src/libbsc/pcu_sock.c @@ -403,7 +403,7 @@ "invalid/small length %d\n", data_req->len); break; } - tlli = *((uint32_t *)data_req->data); + memcpy(, data_req->data, 4); msg = msgb_alloc(data_req->len - 4, "pcu_agch"); if (!msg) { -- To view, visit https://gerrit.osmocom.org/7333 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c93487c72d15b061e73ed4f9acbf2e77dec967a Gerrit-PatchSet: 5 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
osmo-ttcn3-hacks[master]: MSC_Tests: Fix to use 2-digit MNC
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id02bfd74127cf5551923912934240035106a8a4e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: MSC_Tests: Fix to use 2-digit MNC
Harald Welte has submitted this change and it was merged. Change subject: MSC_Tests: Fix to use 2-digit MNC .. MSC_Tests: Fix to use 2-digit MNC Until recently, OsmoMSC didn't distinguish 2-digit from 3-digit MNC, and the config file states '42' as MNC while the tester used '042' in several locations. This causes almost all MSC_Tests fail with recent osmo-msc. Let's fix the tests to use '42', as they should always have. Change-Id: Id02bfd74127cf5551923912934240035106a8a4e --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e154911..10f772e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -378,7 +378,7 @@ var BSC_ConnHdlrPars pars := { sccp_addr_own := g_bssap.sccp_addr_own, sccp_addr_peer := g_bssap.sccp_addr_peer, - cell_id := valueof(ts_CellId_CGI('262'H, '042'H, 23, 42)), + cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)), imei := f_gen_imei(imsi_suffix), imsi := f_gen_imsi(imsi_suffix), msisdn := f_gen_msisdn(imsi_suffix), @@ -521,7 +521,7 @@ f_init_handler(pars); var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - var BSSMAP_IE_CellIdentifier cell_id := valueof(ts_CellId_CGI('262'H, '042'H, 23, 42)); + var BSSMAP_IE_CellIdentifier cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)); var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); f_create_gsup_expect(hex2str(g_pars.imsi)); -- To view, visit https://gerrit.osmocom.org/7371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id02bfd74127cf5551923912934240035106a8a4e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: MSC_Tests: Fix to use 2-digit MNC
Review at https://gerrit.osmocom.org/7371 MSC_Tests: Fix to use 2-digit MNC Until recently, OsmoMSC didn't distinguish 2-digit from 3-digit MNC, and the config file states '42' as MNC while the tester used '042' in several locations. This causes almost all MSC_Tests fail with recent osmo-msc. Let's fix the tests to use '42', as they should always have. Change-Id: Id02bfd74127cf5551923912934240035106a8a4e --- M msc/MSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/7371/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index e154911..10f772e 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -378,7 +378,7 @@ var BSC_ConnHdlrPars pars := { sccp_addr_own := g_bssap.sccp_addr_own, sccp_addr_peer := g_bssap.sccp_addr_peer, - cell_id := valueof(ts_CellId_CGI('262'H, '042'H, 23, 42)), + cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)), imei := f_gen_imei(imsi_suffix), imsi := f_gen_imsi(imsi_suffix), msisdn := f_gen_msisdn(imsi_suffix), @@ -521,7 +521,7 @@ f_init_handler(pars); var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - var BSSMAP_IE_CellIdentifier cell_id := valueof(ts_CellId_CGI('262'H, '042'H, 23, 42)); + var BSSMAP_IE_CellIdentifier cell_id := valueof(ts_CellId_CGI('262'H, '42'H, 23, 42)); var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); f_create_gsup_expect(hex2str(g_pars.imsi)); -- To view, visit https://gerrit.osmocom.org/7371 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id02bfd74127cf5551923912934240035106a8a4e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[MERGED] osmo-ttcn3-hacks[master]: start-testsuite.sh: Use shellcheck to harden script
Harald Welte has submitted this change and it was merged. Change subject: start-testsuite.sh: Use shellcheck to harden script .. start-testsuite.sh: Use shellcheck to harden script Change-Id: Iaf887da7ad95ba8b1fe93fe6c29f0518961d2fbb --- M start-testsuite.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 83c381e..61bf771 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -10,7 +10,7 @@ fi SUITE=$1 -CFG=`basename $SUITE`.cfg +CFG=$(basename "$SUITE").cfg if [ $# -gt 1 ]; then CFG=$2 fi @@ -19,4 +19,4 @@ TEST=$3 fi -LD_LIBRARY_PATH=`dirname $SUITE`:/usr/lib/titan:/usr/ttcn3/lib ttcn3_start $SUITE $CFG $TEST +LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start "$SUITE" "$CFG" "$TEST" -- To view, visit https://gerrit.osmocom.org/7369 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf887da7ad95ba8b1fe93fe6c29f0518961d2fbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: start-testsuite.sh: Use shellcheck to harden script
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7369 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaf887da7ad95ba8b1fe93fe6c29f0518961d2fbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: log_merge: Fix input filename pattern
Harald Welte has submitted this change and it was merged. Change subject: log_merge: Fix input filename pattern .. log_merge: Fix input filename pattern Change-Id: Iece1063403673a65007f41b6955e384a67acd45f --- M log_merge.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/log_merge.sh b/log_merge.sh index 0a3066e..df52cfe 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -18,8 +18,8 @@ TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` for t in $TEST_CASES; do - PREFIX="$BASE_NAME.$t" - OUTPUT="$PREFIX.merged" + PREFIX="$BASE_NAME-$t" + OUTPUT="$BASE_NAME.$t.merged" ttcn3_logmerge $PREFIX-*.log > $OUTPUT echo "Generated $OUTPUT" done -- To view, visit https://gerrit.osmocom.org/7367 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iece1063403673a65007f41b6955e384a67acd45f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: log_merge: Use shelcheck to harden the script
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7368 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: log_merge: Use shelcheck to harden the script
Harald Welte has submitted this change and it was merged. Change subject: log_merge: Use shelcheck to harden the script .. log_merge: Use shelcheck to harden the script Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 --- M log_merge.sh 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/log_merge.sh b/log_merge.sh index df52cfe..dee9cc2 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -7,7 +7,7 @@ # # the output files will be called "Module-Testcase.merged" -if [ "x$1" == "x" ]; then +if [ "x$1" = "x" ]; then echo "You have to specify the Test Suite prefix" exit 2 fi @@ -15,16 +15,16 @@ BASE_NAME="$1" LOG_FILES="$BASE_NAME*.log" -TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` +TEST_CASES=$(ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq) for t in $TEST_CASES; do PREFIX="$BASE_NAME-$t" OUTPUT="$BASE_NAME.$t.merged" - ttcn3_logmerge $PREFIX-*.log > $OUTPUT + ttcn3_logmerge $PREFIX-*.log > "$OUTPUT" echo "Generated $OUTPUT" done -if [ "$2" == "--rm" ]; then +if [ "$2" = "--rm" ]; then echo "Removing Input log files !!!" - rm $LOG_FILES + rm "$LOG_FILES" fi -- To view, visit https://gerrit.osmocom.org/7368 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: log_merge: Fix input filename pattern
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7367 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iece1063403673a65007f41b6955e384a67acd45f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-ttcn3-hacks[master]: log_merge: Fix input filename pattern
Review at https://gerrit.osmocom.org/7367 log_merge: Fix input filename pattern Change-Id: Iece1063403673a65007f41b6955e384a67acd45f --- M log_merge.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/7367/1 diff --git a/log_merge.sh b/log_merge.sh index 0a3066e..df52cfe 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -18,8 +18,8 @@ TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` for t in $TEST_CASES; do - PREFIX="$BASE_NAME.$t" - OUTPUT="$PREFIX.merged" + PREFIX="$BASE_NAME-$t" + OUTPUT="$BASE_NAME.$t.merged" ttcn3_logmerge $PREFIX-*.log > $OUTPUT echo "Generated $OUTPUT" done -- To view, visit https://gerrit.osmocom.org/7367 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iece1063403673a65007f41b6955e384a67acd45f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: start-testsuite.sh: Use shellcheck to harden script
Review at https://gerrit.osmocom.org/7369 start-testsuite.sh: Use shellcheck to harden script Change-Id: Iaf887da7ad95ba8b1fe93fe6c29f0518961d2fbb --- M start-testsuite.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/7369/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 83c381e..61bf771 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -10,7 +10,7 @@ fi SUITE=$1 -CFG=`basename $SUITE`.cfg +CFG=$(basename "$SUITE").cfg if [ $# -gt 1 ]; then CFG=$2 fi @@ -19,4 +19,4 @@ TEST=$3 fi -LD_LIBRARY_PATH=`dirname $SUITE`:/usr/lib/titan:/usr/ttcn3/lib ttcn3_start $SUITE $CFG $TEST +LD_LIBRARY_PATH=$(dirname "$SUITE"):/usr/lib/titan:/usr/ttcn3/lib ttcn3_start "$SUITE" "$CFG" "$TEST" -- To view, visit https://gerrit.osmocom.org/7369 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf887da7ad95ba8b1fe93fe6c29f0518961d2fbb Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: log_merge: Use shelcheck to harden the script
Review at https://gerrit.osmocom.org/7368 log_merge: Use shelcheck to harden the script Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 --- M log_merge.sh 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/7368/1 diff --git a/log_merge.sh b/log_merge.sh index df52cfe..dee9cc2 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -7,7 +7,7 @@ # # the output files will be called "Module-Testcase.merged" -if [ "x$1" == "x" ]; then +if [ "x$1" = "x" ]; then echo "You have to specify the Test Suite prefix" exit 2 fi @@ -15,16 +15,16 @@ BASE_NAME="$1" LOG_FILES="$BASE_NAME*.log" -TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` +TEST_CASES=$(ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq) for t in $TEST_CASES; do PREFIX="$BASE_NAME-$t" OUTPUT="$BASE_NAME.$t.merged" - ttcn3_logmerge $PREFIX-*.log > $OUTPUT + ttcn3_logmerge $PREFIX-*.log > "$OUTPUT" echo "Generated $OUTPUT" done -if [ "$2" == "--rm" ]; then +if [ "$2" = "--rm" ]; then echo "Removing Input log files !!!" - rm $LOG_FILES + rm "$LOG_FILES" fi -- To view, visit https://gerrit.osmocom.org/7368 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b3a35b5f7ada2dbb0401a5d90a77a53979e1183 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-ttcn3-hacks[master]: log_merge.sh: Use Module.Testcase like the pcap files
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7366 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I900ae41c3586bad41451bbcf481963384c6db061 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: log_merge.sh: Use Module.Testcase like the pcap files
Harald Welte has submitted this change and it was merged. Change subject: log_merge.sh: Use Module.Testcase like the pcap files .. log_merge.sh: Use Module.Testcase like the pcap files So far, pcap files used Module.Testcase.pcap while log files used Module-Testcase.merged - let's unify this a bit. Change-Id: I900ae41c3586bad41451bbcf481963384c6db061 --- M log_merge.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/log_merge.sh b/log_merge.sh index d57ab99..0a3066e 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -18,7 +18,7 @@ TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` for t in $TEST_CASES; do - PREFIX="$BASE_NAME-$t" + PREFIX="$BASE_NAME.$t" OUTPUT="$PREFIX.merged" ttcn3_logmerge $PREFIX-*.log > $OUTPUT echo "Generated $OUTPUT" -- To view, visit https://gerrit.osmocom.org/7366 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I900ae41c3586bad41451bbcf481963384c6db061 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: log_merge.sh: Use Module.Testcase like the pcap files
Review at https://gerrit.osmocom.org/7366 log_merge.sh: Use Module.Testcase like the pcap files So far, pcap files used Module.Testcase.pcap while log files used Module-Testcase.merged - let's unify this a bit. Change-Id: I900ae41c3586bad41451bbcf481963384c6db061 --- M log_merge.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/7366/1 diff --git a/log_merge.sh b/log_merge.sh index d57ab99..0a3066e 100755 --- a/log_merge.sh +++ b/log_merge.sh @@ -18,7 +18,7 @@ TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` for t in $TEST_CASES; do - PREFIX="$BASE_NAME-$t" + PREFIX="$BASE_NAME.$t" OUTPUT="$PREFIX.merged" ttcn3_logmerge $PREFIX-*.log > $OUTPUT echo "Generated $OUTPUT" -- To view, visit https://gerrit.osmocom.org/7366 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I900ae41c3586bad41451bbcf481963384c6db061 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[MERGED] osmo-ttcn3-hacks[master]: Make Console Loggign a bit more verbose: add all USER "log()"
Harald Welte has submitted this change and it was merged. Change subject: Make Console Loggign a bit more verbose: add all USER "log()" .. Make Console Loggign a bit more verbose: add all USER "log()" Change-Id: Ib5a78079dd31def39fb649a4e7dc027c53692abc --- M Common.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Common.cfg b/Common.cfg index 96f0687..bf0a752 100644 --- a/Common.cfg +++ b/Common.cfg @@ -12,7 +12,7 @@ LogSourceInfo := Yes; LoggerPlugins := { JUnitLogger := "libjunitlogger2" } FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; -#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC +ConsoleMask := ERROR | WARNING | TESTCASE | USER; [EXTERNAL_COMMANDS] BeginTestCase := $TCPDUMP_START -- To view, visit https://gerrit.osmocom.org/7365 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5a78079dd31def39fb649a4e7dc027c53692abc Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: Make Console Loggign a bit more verbose: add all USER "log()"
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7365 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib5a78079dd31def39fb649a4e7dc027c53692abc Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: add log_merge.sh script to generate per-testcase merged logs
Harald Welte has submitted this change and it was merged. Change subject: add log_merge.sh script to generate per-testcase merged logs .. add log_merge.sh script to generate per-testcase merged logs Change-Id: Ife6153d2cc10f85e79e8df7a0e34a44648618976 --- M Common.cfg A log_merge.sh 2 files changed, 32 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Common.cfg b/Common.cfg index 38beb5a..96f0687 100644 --- a/Common.cfg +++ b/Common.cfg @@ -6,6 +6,8 @@ TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-tcpdump-stop.sh" [LOGGING] +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; SourceInfoFormat := Single; LogSourceInfo := Yes; LoggerPlugins := { JUnitLogger := "libjunitlogger2" } diff --git a/log_merge.sh b/log_merge.sh new file mode 100755 index 000..d57ab99 --- /dev/null +++ b/log_merge.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# This script generates per-testcase merged logs. +# In order to work, you need to set the following test config: +# [LOGGING] +# LogFile := "%e-%c-%h-%r.%s" +# +# the output files will be called "Module-Testcase.merged" + +if [ "x$1" == "x" ]; then + echo "You have to specify the Test Suite prefix" + exit 2 +fi + +BASE_NAME="$1" +LOG_FILES="$BASE_NAME*.log" + +TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` + +for t in $TEST_CASES; do + PREFIX="$BASE_NAME-$t" + OUTPUT="$PREFIX.merged" + ttcn3_logmerge $PREFIX-*.log > $OUTPUT + echo "Generated $OUTPUT" +done + +if [ "$2" == "--rm" ]; then + echo "Removing Input log files !!!" + rm $LOG_FILES +fi -- To view, visit https://gerrit.osmocom.org/7364 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6153d2cc10f85e79e8df7a0e34a44648618976 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: add log_merge.sh script to generate per-testcase merged logs
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7364 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ife6153d2cc10f85e79e8df7a0e34a44648618976 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-ttcn3-hacks[master]: Make Console Loggign a bit more verbose: add all USER "log()"
Review at https://gerrit.osmocom.org/7365 Make Console Loggign a bit more verbose: add all USER "log()" Change-Id: Ib5a78079dd31def39fb649a4e7dc027c53692abc --- M Common.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/7365/1 diff --git a/Common.cfg b/Common.cfg index 96f0687..bf0a752 100644 --- a/Common.cfg +++ b/Common.cfg @@ -12,7 +12,7 @@ LogSourceInfo := Yes; LoggerPlugins := { JUnitLogger := "libjunitlogger2" } FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; -#ConsoleMask := ERROR | WARNING | TESTCASE | TTCN_MATCHING | DEBUG_ENCDEC +ConsoleMask := ERROR | WARNING | TESTCASE | USER; [EXTERNAL_COMMANDS] BeginTestCase := $TCPDUMP_START -- To view, visit https://gerrit.osmocom.org/7365 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5a78079dd31def39fb649a4e7dc027c53692abc Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: add log_merge.sh script to generate per-testcase merged logs
Review at https://gerrit.osmocom.org/7364 add log_merge.sh script to generate per-testcase merged logs Change-Id: Ife6153d2cc10f85e79e8df7a0e34a44648618976 --- M Common.cfg A log_merge.sh 2 files changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/7364/1 diff --git a/Common.cfg b/Common.cfg index 38beb5a..96f0687 100644 --- a/Common.cfg +++ b/Common.cfg @@ -6,6 +6,8 @@ TCPDUMP_STOP := $TTCN3_HACKS_PATH"/ttcn3-tcpdump-stop.sh" [LOGGING] +LogFile := "%e-%c-%h-%r.%s" +AppendFile := Yes; SourceInfoFormat := Single; LogSourceInfo := Yes; LoggerPlugins := { JUnitLogger := "libjunitlogger2" } diff --git a/log_merge.sh b/log_merge.sh new file mode 100755 index 000..d57ab99 --- /dev/null +++ b/log_merge.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# This script generates per-testcase merged logs. +# In order to work, you need to set the following test config: +# [LOGGING] +# LogFile := "%e-%c-%h-%r.%s" +# +# the output files will be called "Module-Testcase.merged" + +if [ "x$1" == "x" ]; then + echo "You have to specify the Test Suite prefix" + exit 2 +fi + +BASE_NAME="$1" +LOG_FILES="$BASE_NAME*.log" + +TEST_CASES=`ls -1 $LOG_FILES | awk 'BEGIN { FS = "-" } { print $2 }' | sort | uniq` + +for t in $TEST_CASES; do + PREFIX="$BASE_NAME-$t" + OUTPUT="$PREFIX.merged" + ttcn3_logmerge $PREFIX-*.log > $OUTPUT + echo "Generated $OUTPUT" +done + +if [ "$2" == "--rm" ]; then + echo "Removing Input log files !!!" + rm $LOG_FILES +fi -- To view, visit https://gerrit.osmocom.org/7364 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife6153d2cc10f85e79e8df7a0e34a44648618976 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-bsc[master]: pcu_sock.c: Avoid breaking strict-aliasing on ptr derreference
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7333 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5c93487c72d15b061e73ed4f9acbf2e77dec967a Gerrit-PatchSet: 4 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: selftest: Remove unneeded broken symlink
Harald Welte has submitted this change and it was merged. Change subject: selftest: Remove unneeded broken symlink .. selftest: Remove unneeded broken symlink Change-Id: I41f062e7658665e13d7ccbfecd6c5788d9b37a75 --- M selftest/gen_links.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 1b6171c..73b812d 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -9,7 +9,7 @@ #gen_links $DIR $FILES DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src -- To view, visit https://gerrit.osmocom.org/7363 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41f062e7658665e13d7ccbfecd6c5788d9b37a75 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: selftest: Remove unneeded broken symlink
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7363 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I41f062e7658665e13d7ccbfecd6c5788d9b37a75 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos
Harald Welte has submitted this change and it was merged. Change subject: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos .. Remove M3UA/MTP3/SCCP code from this repo, use upstream repos Originally, this code was not yet in an official upstream git repo. However, it has been for many months, so let's remove our local copy and use upstream git repositories like for all the other modules. Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b --- D M3UA_CNL113536/M3UA_CNL113536.tpd D M3UA_CNL113536/doc/documentation_note.txt D M3UA_CNL113536/src/M3UA_Types.ttcn D M3UA_CNL113537/demo/Abstract_Socket.cc D M3UA_CNL113537/demo/Abstract_Socket.hh D M3UA_CNL113537/demo/BICC_EncDec.cc D M3UA_CNL113537/demo/BICC_Types.ttcn D M3UA_CNL113537/demo/General_Types.ttcn D M3UA_CNL113537/demo/M3UA_Emulation.ttcn D M3UA_CNL113537/demo/M3UA_Emulation_Test.ttcn D M3UA_CNL113537/demo/M3UA_Types.ttcn D M3UA_CNL113537/demo/MTP3asp_EncDec.cc D M3UA_CNL113537/demo/MTP3asp_Types.ttcn D M3UA_CNL113537/demo/Makefile D M3UA_CNL113537/demo/SCTPasp_PT.cc D M3UA_CNL113537/demo/SCTPasp_PT.hh D M3UA_CNL113537/demo/SCTPasp_PortType.ttcn D M3UA_CNL113537/demo/SCTPasp_Types.ttcn D M3UA_CNL113537/demo/m3ua_emu.cfg D M3UA_CNL113537/src/M3UA_Emulation.ttcn D MTP3asp_CNL113337/MTP3asp_CNL113337.tpd D MTP3asp_CNL113337/demo/MTP3asp_PT.cc D MTP3asp_CNL113337/demo/MTP3asp_PT.hh D MTP3asp_CNL113337/demo/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/demo/MTP3asp_Types.ttcn D MTP3asp_CNL113337/demo/Makefile D MTP3asp_CNL113337/demo/mtp3test.ttcn D MTP3asp_CNL113337/demo/mtp3test_MTP3_ansi2.cfg D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_FS.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_PRI.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_UG.pdf D MTP3asp_CNL113337/src/MTP3asp_EncDec.cc D MTP3asp_CNL113337/src/MTP3asp_PT.cc D MTP3asp_CNL113337/src/MTP3asp_PT.hh D MTP3asp_CNL113337/src/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/src/MTP3asp_Types.ttcn D SCCP_CNL113341/SCCP_CNL113341.tpd D SCCP_CNL113341/demo/General_Types.ttcn D SCCP_CNL113341/demo/MTP3asp_PT.cc D SCCP_CNL113341/demo/MTP3asp_PT.hh D SCCP_CNL113341/demo/MTP3asp_PortType.ttcn D SCCP_CNL113341/demo/MTP3asp_Types.ttcn D SCCP_CNL113341/demo/Makefile.ini D SCCP_CNL113341/demo/N_UNITDATAtest_600longdata_xudt_ansi_log D SCCP_CNL113341/demo/SCCP_Emulation.ttcn D SCCP_CNL113341/demo/SCCP_Mapping.ttcnpp D SCCP_CNL113341/demo/SCCP_Testcases.cfg D SCCP_CNL113341/demo/SCCP_Testcases.ttcn D SCCP_CNL113341/demo/SCCP_Types.ttcn D SCCP_CNL113341/demo/SCCP_selftest.cfg D SCCP_CNL113341/demo/SCCP_selftest.ttcn D SCCP_CNL113341/demo/SCCPasp_Types.ttcn D SCCP_CNL113341/src/SCCP_Emulation.ttcn D SCCP_CNL113341/src/SCCP_EncDec.cc D SCCP_CNL113341/src/SCCP_Mapping.ttcnpp D SCCP_CNL113341/src/SCCP_Types.ttcn D SCCP_CNL113341/src/SCCPasp_Types.ttcn D SCTPasp_CNL113469/SCTPasp_CNL113469.tpd D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_PRI.doc D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_UG.doc D SCTPasp_CNL113469/doc/SCTPasp_FS.pdf D SCTPasp_CNL113469/src/SCTPasp_PT.cc D SCTPasp_CNL113469/src/SCTPasp_PT.hh D SCTPasp_CNL113469/src/SCTPasp_PortType.ttcn D SCTPasp_CNL113469/src/SCTPasp_Types.ttcn M bin/install.script M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/gen_links.sh M bsc/regen_makefile.sh M deps/Makefile M msc/gen_links.sh M msc/regen_makefile.sh M rmlinks.sh M selftest/gen_links.sh M selftest/regen_makefile.sh 76 files changed, 32 insertions(+), 26,133 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/7362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b Gerrit-PatchSet: 4 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: selftest: Remove unneeded broken symlink
Review at https://gerrit.osmocom.org/7363 selftest: Remove unneeded broken symlink Change-Id: I41f062e7658665e13d7ccbfecd6c5788d9b37a75 --- M selftest/gen_links.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/7363/1 diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh index 1b6171c..73b812d 100755 --- a/selftest/gen_links.sh +++ b/selftest/gen_links.sh @@ -9,7 +9,7 @@ #gen_links $DIR $FILES DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src -- To view, visit https://gerrit.osmocom.org/7363 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41f062e7658665e13d7ccbfecd6c5788d9b37a75 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7362 to look at the new patch set (#4). Remove M3UA/MTP3/SCCP code from this repo, use upstream repos Originally, this code was not yet in an official upstream git repo. However, it has been for many months, so let's remove our local copy and use upstream git repositories like for all the other modules. Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b --- D M3UA_CNL113536/M3UA_CNL113536.tpd D M3UA_CNL113536/doc/documentation_note.txt D M3UA_CNL113536/src/M3UA_Types.ttcn D M3UA_CNL113537/demo/Abstract_Socket.cc D M3UA_CNL113537/demo/Abstract_Socket.hh D M3UA_CNL113537/demo/BICC_EncDec.cc D M3UA_CNL113537/demo/BICC_Types.ttcn D M3UA_CNL113537/demo/General_Types.ttcn D M3UA_CNL113537/demo/M3UA_Emulation.ttcn D M3UA_CNL113537/demo/M3UA_Emulation_Test.ttcn D M3UA_CNL113537/demo/M3UA_Types.ttcn D M3UA_CNL113537/demo/MTP3asp_EncDec.cc D M3UA_CNL113537/demo/MTP3asp_Types.ttcn D M3UA_CNL113537/demo/Makefile D M3UA_CNL113537/demo/SCTPasp_PT.cc D M3UA_CNL113537/demo/SCTPasp_PT.hh D M3UA_CNL113537/demo/SCTPasp_PortType.ttcn D M3UA_CNL113537/demo/SCTPasp_Types.ttcn D M3UA_CNL113537/demo/m3ua_emu.cfg D M3UA_CNL113537/src/M3UA_Emulation.ttcn D MTP3asp_CNL113337/MTP3asp_CNL113337.tpd D MTP3asp_CNL113337/demo/MTP3asp_PT.cc D MTP3asp_CNL113337/demo/MTP3asp_PT.hh D MTP3asp_CNL113337/demo/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/demo/MTP3asp_Types.ttcn D MTP3asp_CNL113337/demo/Makefile D MTP3asp_CNL113337/demo/mtp3test.ttcn D MTP3asp_CNL113337/demo/mtp3test_MTP3_ansi2.cfg D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_FS.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_PRI.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_UG.pdf D MTP3asp_CNL113337/src/MTP3asp_EncDec.cc D MTP3asp_CNL113337/src/MTP3asp_PT.cc D MTP3asp_CNL113337/src/MTP3asp_PT.hh D MTP3asp_CNL113337/src/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/src/MTP3asp_Types.ttcn D SCCP_CNL113341/SCCP_CNL113341.tpd D SCCP_CNL113341/demo/General_Types.ttcn D SCCP_CNL113341/demo/MTP3asp_PT.cc D SCCP_CNL113341/demo/MTP3asp_PT.hh D SCCP_CNL113341/demo/MTP3asp_PortType.ttcn D SCCP_CNL113341/demo/MTP3asp_Types.ttcn D SCCP_CNL113341/demo/Makefile.ini D SCCP_CNL113341/demo/N_UNITDATAtest_600longdata_xudt_ansi_log D SCCP_CNL113341/demo/SCCP_Emulation.ttcn D SCCP_CNL113341/demo/SCCP_Mapping.ttcnpp D SCCP_CNL113341/demo/SCCP_Testcases.cfg D SCCP_CNL113341/demo/SCCP_Testcases.ttcn D SCCP_CNL113341/demo/SCCP_Types.ttcn D SCCP_CNL113341/demo/SCCP_selftest.cfg D SCCP_CNL113341/demo/SCCP_selftest.ttcn D SCCP_CNL113341/demo/SCCPasp_Types.ttcn D SCCP_CNL113341/src/SCCP_Emulation.ttcn D SCCP_CNL113341/src/SCCP_EncDec.cc D SCCP_CNL113341/src/SCCP_Mapping.ttcnpp D SCCP_CNL113341/src/SCCP_Types.ttcn D SCCP_CNL113341/src/SCCPasp_Types.ttcn D SCTPasp_CNL113469/SCTPasp_CNL113469.tpd D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_PRI.doc D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_UG.doc D SCTPasp_CNL113469/doc/SCTPasp_FS.pdf D SCTPasp_CNL113469/src/SCTPasp_PT.cc D SCTPasp_CNL113469/src/SCTPasp_PT.hh D SCTPasp_CNL113469/src/SCTPasp_PortType.ttcn D SCTPasp_CNL113469/src/SCTPasp_Types.ttcn M bin/install.script M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/gen_links.sh M bsc/regen_makefile.sh M deps/Makefile M msc/gen_links.sh M msc/regen_makefile.sh M rmlinks.sh M selftest/gen_links.sh M selftest/regen_makefile.sh 76 files changed, 32 insertions(+), 26,133 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/7362/4 -- To view, visit https://gerrit.osmocom.org/7362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b Gerrit-PatchSet: 4 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b Gerrit-PatchSet: 4 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-ttcn3-hacks[master]: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/7362 to look at the new patch set (#3). Remove M3UA/MTP3/SCCP code from this repo, use upstream repos Originally, this code was not yet in an official upstream git repo. However, it has been for many months, so let's remove our local copy and use upstream git repositories like for all the other modules. Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b --- D M3UA_CNL113536/M3UA_CNL113536.tpd D M3UA_CNL113536/doc/documentation_note.txt D M3UA_CNL113536/src/M3UA_Types.ttcn D M3UA_CNL113537/demo/Abstract_Socket.cc D M3UA_CNL113537/demo/Abstract_Socket.hh D M3UA_CNL113537/demo/BICC_EncDec.cc D M3UA_CNL113537/demo/BICC_Types.ttcn D M3UA_CNL113537/demo/General_Types.ttcn D M3UA_CNL113537/demo/M3UA_Emulation.ttcn D M3UA_CNL113537/demo/M3UA_Emulation_Test.ttcn D M3UA_CNL113537/demo/M3UA_Types.ttcn D M3UA_CNL113537/demo/MTP3asp_EncDec.cc D M3UA_CNL113537/demo/MTP3asp_Types.ttcn D M3UA_CNL113537/demo/Makefile D M3UA_CNL113537/demo/SCTPasp_PT.cc D M3UA_CNL113537/demo/SCTPasp_PT.hh D M3UA_CNL113537/demo/SCTPasp_PortType.ttcn D M3UA_CNL113537/demo/SCTPasp_Types.ttcn D M3UA_CNL113537/demo/m3ua_emu.cfg D M3UA_CNL113537/src/M3UA_Emulation.ttcn D MTP3asp_CNL113337/MTP3asp_CNL113337.tpd D MTP3asp_CNL113337/demo/MTP3asp_PT.cc D MTP3asp_CNL113337/demo/MTP3asp_PT.hh D MTP3asp_CNL113337/demo/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/demo/MTP3asp_Types.ttcn D MTP3asp_CNL113337/demo/Makefile D MTP3asp_CNL113337/demo/mtp3test.ttcn D MTP3asp_CNL113337/demo/mtp3test_MTP3_ansi2.cfg D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_FS.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_PRI.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_UG.pdf D MTP3asp_CNL113337/src/MTP3asp_EncDec.cc D MTP3asp_CNL113337/src/MTP3asp_PT.cc D MTP3asp_CNL113337/src/MTP3asp_PT.hh D MTP3asp_CNL113337/src/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/src/MTP3asp_Types.ttcn D SCCP_CNL113341/SCCP_CNL113341.tpd D SCCP_CNL113341/demo/General_Types.ttcn D SCCP_CNL113341/demo/MTP3asp_PT.cc D SCCP_CNL113341/demo/MTP3asp_PT.hh D SCCP_CNL113341/demo/MTP3asp_PortType.ttcn D SCCP_CNL113341/demo/MTP3asp_Types.ttcn D SCCP_CNL113341/demo/Makefile.ini D SCCP_CNL113341/demo/N_UNITDATAtest_600longdata_xudt_ansi_log D SCCP_CNL113341/demo/SCCP_Emulation.ttcn D SCCP_CNL113341/demo/SCCP_Mapping.ttcnpp D SCCP_CNL113341/demo/SCCP_Testcases.cfg D SCCP_CNL113341/demo/SCCP_Testcases.ttcn D SCCP_CNL113341/demo/SCCP_Types.ttcn D SCCP_CNL113341/demo/SCCP_selftest.cfg D SCCP_CNL113341/demo/SCCP_selftest.ttcn D SCCP_CNL113341/demo/SCCPasp_Types.ttcn D SCCP_CNL113341/src/SCCP_Emulation.ttcn D SCCP_CNL113341/src/SCCP_EncDec.cc D SCCP_CNL113341/src/SCCP_Mapping.ttcnpp D SCCP_CNL113341/src/SCCP_Types.ttcn D SCCP_CNL113341/src/SCCPasp_Types.ttcn D SCTPasp_CNL113469/SCTPasp_CNL113469.tpd D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_PRI.doc D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_UG.doc D SCTPasp_CNL113469/doc/SCTPasp_FS.pdf D SCTPasp_CNL113469/src/SCTPasp_PT.cc D SCTPasp_CNL113469/src/SCTPasp_PT.hh D SCTPasp_CNL113469/src/SCTPasp_PortType.ttcn D SCTPasp_CNL113469/src/SCTPasp_Types.ttcn M bin/install.script M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/gen_links.sh M bsc/regen_makefile.sh M deps/Makefile M msc/gen_links.sh M msc/regen_makefile.sh M rmlinks.sh M selftest/gen_links.sh 75 files changed, 31 insertions(+), 26,132 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/7362/3 -- To view, visit https://gerrit.osmocom.org/7362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b Gerrit-PatchSet: 3 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Jenkins Builder
[PATCH] osmo-ttcn3-hacks[master]: Remove M3UA/MTP3/SCCP code from this repo, use upstream repos
Review at https://gerrit.osmocom.org/7362 Remove M3UA/MTP3/SCCP code from this repo, use upstream repos Originally, this code was not yet in an official upstream git repo. However, it has been for many months, so let's remove our local copy and use upstream git repositories like for all the other modules. Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b --- D M3UA_CNL113536/M3UA_CNL113536.tpd D M3UA_CNL113536/doc/documentation_note.txt D M3UA_CNL113536/src/M3UA_Types.ttcn D M3UA_CNL113537/demo/Abstract_Socket.cc D M3UA_CNL113537/demo/Abstract_Socket.hh D M3UA_CNL113537/demo/BICC_EncDec.cc D M3UA_CNL113537/demo/BICC_Types.ttcn D M3UA_CNL113537/demo/General_Types.ttcn D M3UA_CNL113537/demo/M3UA_Emulation.ttcn D M3UA_CNL113537/demo/M3UA_Emulation_Test.ttcn D M3UA_CNL113537/demo/M3UA_Types.ttcn D M3UA_CNL113537/demo/MTP3asp_EncDec.cc D M3UA_CNL113537/demo/MTP3asp_Types.ttcn D M3UA_CNL113537/demo/Makefile D M3UA_CNL113537/demo/SCTPasp_PT.cc D M3UA_CNL113537/demo/SCTPasp_PT.hh D M3UA_CNL113537/demo/SCTPasp_PortType.ttcn D M3UA_CNL113537/demo/SCTPasp_Types.ttcn D M3UA_CNL113537/demo/m3ua_emu.cfg D M3UA_CNL113537/src/M3UA_Emulation.ttcn D MTP3asp_CNL113337/MTP3asp_CNL113337.tpd D MTP3asp_CNL113337/demo/MTP3asp_PT.cc D MTP3asp_CNL113337/demo/MTP3asp_PT.hh D MTP3asp_CNL113337/demo/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/demo/MTP3asp_Types.ttcn D MTP3asp_CNL113337/demo/Makefile D MTP3asp_CNL113337/demo/mtp3test.ttcn D MTP3asp_CNL113337/demo/mtp3test_MTP3_ansi2.cfg D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_FS.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_PRI.pdf D MTP3asp_CNL113337/doc/MTP3asp_CNL113337_UG.pdf D MTP3asp_CNL113337/src/MTP3asp_EncDec.cc D MTP3asp_CNL113337/src/MTP3asp_PT.cc D MTP3asp_CNL113337/src/MTP3asp_PT.hh D MTP3asp_CNL113337/src/MTP3asp_PortType.ttcn D MTP3asp_CNL113337/src/MTP3asp_Types.ttcn D SCCP_CNL113341/SCCP_CNL113341.tpd D SCCP_CNL113341/demo/General_Types.ttcn D SCCP_CNL113341/demo/MTP3asp_PT.cc D SCCP_CNL113341/demo/MTP3asp_PT.hh D SCCP_CNL113341/demo/MTP3asp_PortType.ttcn D SCCP_CNL113341/demo/MTP3asp_Types.ttcn D SCCP_CNL113341/demo/Makefile.ini D SCCP_CNL113341/demo/N_UNITDATAtest_600longdata_xudt_ansi_log D SCCP_CNL113341/demo/SCCP_Emulation.ttcn D SCCP_CNL113341/demo/SCCP_Mapping.ttcnpp D SCCP_CNL113341/demo/SCCP_Testcases.cfg D SCCP_CNL113341/demo/SCCP_Testcases.ttcn D SCCP_CNL113341/demo/SCCP_Types.ttcn D SCCP_CNL113341/demo/SCCP_selftest.cfg D SCCP_CNL113341/demo/SCCP_selftest.ttcn D SCCP_CNL113341/demo/SCCPasp_Types.ttcn D SCCP_CNL113341/src/SCCP_Emulation.ttcn D SCCP_CNL113341/src/SCCP_EncDec.cc D SCCP_CNL113341/src/SCCP_Mapping.ttcnpp D SCCP_CNL113341/src/SCCP_Types.ttcn D SCCP_CNL113341/src/SCCPasp_Types.ttcn D SCTPasp_CNL113469/SCTPasp_CNL113469.tpd D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_PRI.doc D SCTPasp_CNL113469/doc/SCTPasp_CNL113469_UG.doc D SCTPasp_CNL113469/doc/SCTPasp_FS.pdf D SCTPasp_CNL113469/src/SCTPasp_PT.cc D SCTPasp_CNL113469/src/SCTPasp_PT.hh D SCTPasp_CNL113469/src/SCTPasp_PortType.ttcn D SCTPasp_CNL113469/src/SCTPasp_Types.ttcn M bin/install.script M bsc-nat/gen_links.sh M bsc-nat/regen_makefile.sh M bsc/gen_links.sh M bsc/regen_makefile.sh M deps/Makefile M msc/gen_links.sh M msc/regen_makefile.sh M rmlinks.sh M selftest/gen_links.sh 75 files changed, 31 insertions(+), 26,131 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/7362/1 -- To view, visit https://gerrit.osmocom.org/7362 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c616fb865df32cfec323d42e5d0d06de40c497b Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte